From 42157161e02340e3188966348a6bd3f92cba43c0 Mon Sep 17 00:00:00 2001 From: dev Date: Tue, 23 Dec 2014 18:19:25 -0800 Subject: [PATCH] fix the c++ header generation for mac though the brand new raw string format of c++11 --- libraries/render-utils/src/model.slf | 8 ++++---- tools/scribe/src/main.cpp | 8 +++++++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/libraries/render-utils/src/model.slf b/libraries/render-utils/src/model.slf index 967fccce2a..42421c71a2 100755 --- a/libraries/render-utils/src/model.slf +++ b/libraries/render-utils/src/model.slf @@ -21,9 +21,9 @@ uniform float alphaThreshold; varying vec4 normal; void main(void) { - // set the diffuse, normal, specular data - vec4 diffuse = texture2D(diffuseMap, gl_TexCoord[0].st); - gl_FragData[0] = vec4(gl_Color.rgb * diffuse.rgb, mix(gl_Color.a, 1.0 - gl_Color.a, step(diffuse.a, alphaThreshold))); - gl_FragData[1] = normalize(normal) * 0.5 + vec4(0.5, 0.5, 0.5, 1.0); + // set the diffuse, normal, specular data + vec4 diffuse = texture2D(diffuseMap, gl_TexCoord[0].st); + gl_FragData[0] = vec4(gl_Color.rgb * diffuse.rgb, mix(gl_Color.a, 1.0 - gl_Color.a, step(diffuse.a, alphaThreshold))); + gl_FragData[1] = normalize(normal) * 0.5 + vec4(0.5, 0.5, 0.5, 1.0); gl_FragData[2] = vec4(gl_FrontMaterial.specular.rgb, gl_FrontMaterial.shininess / 128.0); } diff --git a/tools/scribe/src/main.cpp b/tools/scribe/src/main.cpp index 6128b0bee1..2258947853 100755 --- a/tools/scribe/src/main.cpp +++ b/tools/scribe/src/main.cpp @@ -192,16 +192,22 @@ int main (int argc, char** argv) { targetStringStream << "#ifndef scribe_" << targetName << "_h" << std::endl; targetStringStream << "#define scribe_" << targetName << "_h" << std::endl << std::endl; + targetStringStream << "const char " << targetName << "[] = R\"XXX(" << destStringStream.str() << ")XXX\";"; +/* targetStringStream << "const char " << targetName << "[] = {\n"; std::stringstream destStringStreamAgain(destStringStream.str()); while (!destStringStreamAgain.eof()) { std::string line; std::getline(destStringStreamAgain, line); + + + if (line.find_first_of('/t') ) targetStringStream << "\"" << line << "\\n\"" << std::endl; } targetStringStream << "};" << std::endl << std::endl; - +*/ + targetStringStream << std::endl << std::endl; targetStringStream << "#endif" << std::endl; } else { targetStringStream << destStringStream.str();