using glprogramstate work ok

Author: super626

cocos/3d/Mesh.cpp

@@ -315,7 +315,7 @@ void Mesh::addMeshPart(PrimitiveType primitiveType, IndexFormat indexformat,  vo
 
 void* Mesh::getVertexPointer()
 {
-    return &_renderdata._vertexs;
+    return &_renderdata._vertexs[0];
 }
 
 void Mesh::restore()

cocos/3d/Sprite3D.cpp

@@ -237,18 +237,19 @@ void Sprite3D::onDraw(const Matrix &transform, bool transformUpdated)
         for (int i = 0; i < _model->getMeshPartCount(); i++) {
             auto meshPart = _model->getMeshPart(i);
             auto programstate = _programState[i];
-            programstate->setVertexAttribPointer("a_position", 3, GL_FLOAT, GL_FALSE, 8 * sizeof(float), _model->getVertexPointer());
-            programstate->setVertexAttribPointer("a_texCoord", 2, GL_FLOAT, GL_FALSE, 8 * sizeof(float), ((char*)_model->getVertexPointer() + 6 * sizeof(float)));
+            size_t offset = (size_t)_model->getVertexPointer();
+            programstate->setVertexAttribPointer("a_position", 3, GL_FLOAT, GL_FALSE, 8 * sizeof(float), (void*)offset);
+            programstate->setVertexAttribPointer("a_texCoord", 2, GL_FLOAT, GL_FALSE, 8 * sizeof(float), (void*)(offset + 6 * sizeof(float)));
 
-            //programstate->setUniformVec4("u_color", Vector4(color.r, color.g, color.b, color.a));
+            programstate->setUniformVec4("u_color", Vector4(color.r, color.g, color.b, color.a));
             if (_textures.at(i))
             {
                 GL::bindTexture2D(_textures.at(i)->getName());
             }
             programstate->apply(transform);
 
-            //glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, meshPart->getIndexBuffer());
-            glDrawElements(meshPart->getPrimitiveType(), meshPart->getIndexCount(), meshPart->getIndexFormat(), _model->getIndexPointer(i));
+            glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, meshPart->getIndexBuffer());
+            glDrawElements(meshPart->getPrimitiveType(), meshPart->getIndexCount(), meshPart->getIndexFormat(), 0);
         }
     }
 

cocos/3d/Textured.es2.frag.h

@@ -11,6 +11,6 @@ uniform sampler2D CC_Texture0;
 
 void main(void)
 {
-    gl_FragColor = vec4(1, 0, 0, 1);//texture2D(CC_Texture0, TextureCoordOut);
+    gl_FragColor = texture2D(CC_Texture0, TextureCoordOut) * u_color;
 }
 );

tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp

@@ -157,7 +157,7 @@ void Sprite3D1::addNewSpriteWithCoords(Point p)
 //    auto sprite = Sprite3D::create("sprite3dTest/scene01.obj");
 
     //option 2: load obj and assign the texture
-    auto sprite = Sprite3D::create("sprite3dTest/boss.obj");
+    auto sprite = Sprite3D::create("Sprite3DTest/boss.obj");
     sprite->setScale(3.f);
     sprite->setTexture("Sprite3DTest/boss.png");