[Igarden-commit] Garden/source/Plugins RenderPlugin.cpp, 1.13.2.1, 1.13.2.2
Status: Beta
Brought to you by:
jlbedell
|
From: Jeffrey B. <jlb...@us...> - 2006-11-02 23:44:36
|
Update of /cvsroot/igarden/Garden/source/Plugins In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv27790 Modified Files: Tag: Release_branch_v1 RenderPlugin.cpp Log Message: Add z-axis Index: RenderPlugin.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/Plugins/RenderPlugin.cpp,v retrieving revision 1.13.2.1 retrieving revision 1.13.2.2 diff -C2 -d -r1.13.2.1 -r1.13.2.2 *** RenderPlugin.cpp 29 Oct 2006 03:31:48 -0000 1.13.2.1 --- RenderPlugin.cpp 2 Nov 2006 23:44:34 -0000 1.13.2.2 *************** *** 480,484 **** err = glGetError(); glPushMatrix(); ! glTranslatef(centerParm.xOffset, centerParm.yOffset, kGraphicsZ); err = glGetError(); gluDisk(quad, 0, (_fullSpread)/2, 64, 16); --- 480,484 ---- err = glGetError(); glPushMatrix(); ! glTranslatef(centerParm.xOffset, centerParm.yOffset, centerParm.zOffset+kGraphicsZ); err = glGetError(); gluDisk(quad, 0, (_fullSpread)/2, 64, 16); *************** *** 494,498 **** ErrorCode ec; ! ec = draw.Draw(spec, centerParm.xOffset, centerParm.yOffset, kGraphicsZ, _xSize, _ySize, _zSize, kMiddleFixed, _forcePastBounds); return (ec == yaaf::KYAAFNoError) ? kCanvasOK : kCanvasNotHandled; } --- 494,498 ---- ErrorCode ec; ! ec = draw.Draw(spec, centerParm.xOffset, centerParm.yOffset, centerParm.zOffset+kGraphicsZ, _xSize, _ySize, _zSize, kMiddleFixed, _forcePastBounds); return (ec == yaaf::KYAAFNoError) ? kCanvasOK : kCanvasNotHandled; } *************** *** 586,591 **** --- 586,593 ---- center.xOffset = _groupBounds.xOffset + (_groupBounds.xSize/2); center.yOffset = _groupBounds.yOffset + (_groupBounds.ySize/2); + center.zOffset = 0.0; corner.xOffset = xpos-(20*12); corner.yOffset = ypos; + corner.zOffset = 0.0; end.xOffset = corner.xOffset + (20*12); end.yOffset = corner.yOffset; *************** *** 751,760 **** if((mtype & kMajorMaterialType) == kMaterialTypePlant) { ! ec = draw.Draw(spec, center.xOffset, center.yOffset, kGraphicsZ, _fullSpread, _fullSpread, 0.0, kMiddleGrow, _forcePastBounds); } else { ! ec = draw.Draw(spec, center.xOffset, center.yOffset, kGraphicsZ, _xSize, _ySize, _zSize, kMiddleFixed, _forcePastBounds); } --- 753,762 ---- if((mtype & kMajorMaterialType) == kMaterialTypePlant) { ! ec = draw.Draw(spec, center.xOffset, center.yOffset, center.zOffset+kGraphicsZ, _fullSpread, _fullSpread, 0.0, kMiddleGrow, _forcePastBounds); } else { ! ec = draw.Draw(spec, center.xOffset, center.yOffset, center.zOffset+kGraphicsZ, _xSize, _ySize, _zSize, kMiddleFixed, _forcePastBounds); } |