Merge pull request cocos2d#27 from dabingnn/mesh3d_work

Huabing.Xu · Huabing.Xu · commit 5da20fd2e750 · 2014-05-16T12:06:53.000-07:00
Mesh3d work
diff --git a/tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp b/tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
@@ -356,8 +356,9 @@ void Effect3DOutline::drawWithSprite(EffectSprite3D* sprite, const Mat4 &transfo
     }
     //draw
     {
+        glEnable(GL_CULL_FACE);
         glCullFace(GL_FRONT);
-        
+        glEnable(GL_DEPTH_TEST);
         Color4F color(sprite->getDisplayedColor());
         color.a = sprite->getDisplayedOpacity() / 255.0f;
         
@@ -368,8 +369,9 @@ void Effect3DOutline::drawWithSprite(EffectSprite3D* sprite, const Mat4 &transfo
         _glProgramState->apply(transform);
         glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, mesh->getIndexBuffer());
         glDrawElements(mesh->getPrimitiveType(), mesh->getIndexCount(), mesh->getIndexFormat(), 0);
-        
+        glDisable(GL_DEPTH_TEST);
         glCullFace(GL_BACK);
+        glDisable(GL_CULL_FACE);
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -356,8 +356,9 @@ void Effect3DOutline::drawWithSprite(EffectSprite3D* sprite, const Mat4 &transfo`
`356`	`356`	`}`
`357`	`357`	`//draw`
`358`	`358`	`{`
	`359`	`+ glEnable(GL_CULL_FACE);`
`359`	`360`	`glCullFace(GL_FRONT);`
`360`		`-`
	`361`	`+ glEnable(GL_DEPTH_TEST);`
`361`	`362`	`Color4F color(sprite->getDisplayedColor());`
`362`	`363`	`color.a = sprite->getDisplayedOpacity() / 255.0f;`
`363`	`364`
`@@ -368,8 +369,9 @@ void Effect3DOutline::drawWithSprite(EffectSprite3D* sprite, const Mat4 &transfo`
`368`	`369`	`_glProgramState->apply(transform);`
`369`	`370`	`glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, mesh->getIndexBuffer());`
`370`	`371`	`glDrawElements(mesh->getPrimitiveType(), mesh->getIndexCount(), mesh->getIndexFormat(), 0);`
`371`		`-`
	`372`	`+ glDisable(GL_DEPTH_TEST);`
`372`	`373`	`glCullFace(GL_BACK);`
	`374`	`+ glDisable(GL_CULL_FACE);`
`373`	`375`	`}`
`374`	`376`	`}`
`375`	`377`