https://github.com/KhronosGroup/glTF/issues/187

KhronosGroup · Jun 9, 2014 · 9520d77 · 9520d77
1 parent a61cc17
commit 9520d77
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/converter/COLLADA2GLTF/GLTF/GLTFTypesAndConstants.h b/converter/COLLADA2GLTF/GLTF/GLTFTypesAndConstants.h
@@ -86,6 +86,12 @@ const std::string kLights = "lights";
 const std::string kLight = "light";
 const std::string kSemantic = "semantic";
 
+const std::string MODELVIEW = "MODELVIEW";
+const std::string MODELVIEWINVERSETRANSPOSE = "MODELVIEWINVERSETRANSPOSE";
+const std::string MODELVIEWINVERSE = "MODELVIEWINVERSE";
+const std::string PROJECTION = "PROJECTION";
+const std::string JOINTMATRIX = "JOINTMATRIX";
+
 namespace GLTF
 {
     class JSONObject;

diff --git a/converter/COLLADA2GLTF/shaders/commonProfileShaders.cpp b/converter/COLLADA2GLTF/shaders/commonProfileShaders.cpp
@@ -212,11 +212,6 @@ namespace GLTF
      */
 
 
-    static std::string MODELVIEW = "MODELVIEW";
-    static std::string MODELVIEWINVERSETRANSPOSE = "MODELVIEWINVERSETRANSPOSE";
-    static std::string MODELVIEWINVERSE = "MODELVIEWINVERSE";
-    static std::string PROJECTION = "PROJECTION";
-
     /* uniform types, derived from
      GL_INT
      GL_INT_VEC2
@@ -601,7 +596,7 @@ namespace GLTF
                 typeForSemanticUniform[MODELVIEWINVERSE] = _GL(FLOAT_MAT4);
                 typeForSemanticUniform[MODELVIEW] = _GL(FLOAT_MAT4);
                 typeForSemanticUniform[PROJECTION] = _GL(FLOAT_MAT4);
-                typeForSemanticUniform["JOINT_MATRIX"] = _GL(FLOAT_MAT4);
+                typeForSemanticUniform[JOINTMATRIX] = _GL(FLOAT_MAT4);
             }
             return typeForSemanticUniform[semantic];
         }
@@ -767,7 +762,7 @@ namespace GLTF
 
                 assert(techniqueExtras != nullptr);
                 addSemantic("vs", "uniform",
-                            "JOINT_MATRIX", "jointMat", jointsCount, false, true /* force as an array */);
+                            JOINTMATRIX, "jointMat", jointsCount, false, true /* force as an array */);
             }
 
             if (hasNormals) {