[Igarden-commit] Garden/source/PlanTool PlanGeometry.cpp, 1.9.2.1, 1.9.2.2

[Jeffrey B. <jlb...@us...>]

Update of /cvsroot/igarden/Garden/source/PlanTool
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv11435

Modified Files:
      Tag: Release_branch_v1
	PlanGeometry.cpp 
Log Message:
Changes to support MacIntel for 2D

Index: PlanGeometry.cpp
===================================================================
RCS file: /cvsroot/igarden/Garden/source/PlanTool/PlanGeometry.cpp,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -C2 -d -r1.9.2.1 -r1.9.2.2
*** PlanGeometry.cpp	1 Nov 2006 03:18:19 -0000	1.9.2.1
--- PlanGeometry.cpp	29 Nov 2006 12:16:16 -0000	1.9.2.2
***************
*** 234,238 ****
  	GLint viewport[4];
  	GLdouble	objectX, objectY, objectZ;
! 	GLdouble	winX, winY, winZ;
  	bool		done;
  	
--- 234,238 ----
  	GLint viewport[4];
  	GLdouble	objectX, objectY, objectZ;
! 	GLfloat		winX, winY, winZ;
  	bool		done;
  	
***************
*** 240,251 ****
  	glGetDoublev(GL_PROJECTION_MATRIX, projMatrix);
  	glGetIntegerv(GL_VIEWPORT, viewport);
! 	winX = (float)srcPixel.h;
! 	winY = (float)viewport[3] - (float)srcPixel.v;
! 	glReadPixels( (long)winX, (long)winY, 1, 1, GL_DEPTH_COMPONENT, GL_FLOAT, &winZ ); 
  	done = gluUnProject(winX, winY, winZ, modelMatrix, projMatrix, viewport, &objectX, &objectY, &objectZ);
  
! 	destPoint.xOffset = (long)objectX;
! 	destPoint.yOffset = (long)objectY;
! 	destPoint.zOffset = 0.0;
  }
  // ---------------------------------------------------------------------------
--- 240,253 ----
  	glGetDoublev(GL_PROJECTION_MATRIX, projMatrix);
  	glGetIntegerv(GL_VIEWPORT, viewport);
! 	winX = (GLfloat)srcPixel.h;
! 	winY = (GLfloat)viewport[3] - (GLfloat)srcPixel.v;
! 	winZ = 0.0;
! // Causes problems on Macintel, 0.0 OK for 2D
! //	glReadPixels( (long)winX, (long)winY, 1, 1, GL_DEPTH_COMPONENT, GL_FLOAT, &winZ ); 
  	done = gluUnProject(winX, winY, winZ, modelMatrix, projMatrix, viewport, &objectX, &objectY, &objectZ);
  
! 	destPoint.xOffset = objectX;
! 	destPoint.yOffset = objectY;
! 	destPoint.zOffset = objectZ;
  }
  // ---------------------------------------------------------------------------