فهرست منبع

More complete messages about loading shader data

Bill Robinson 11 سال پیش
والد
کامیت
7065727c35
2فایلهای تغییر یافته به همراه6 افزوده شده و 4 حذف شده
  1. 3 1
      Core/Contents/Source/PolyGLSLShader.cpp
  2. 3 3
      Core/Contents/Source/PolyShader.cpp

+ 3 - 1
Core/Contents/Source/PolyGLSLShader.cpp

@@ -143,16 +143,18 @@ void GLSLShader::linkProgram() {
 		switch(type) {
 			case GL_SAMPLER_2D:
 				expectedTextures.push_back(String(name));
-				printf("expectedTextures: %s\n", name);
+				printf("Shader %s expecting texture: %s\n", this->getName().c_str(), name);
 			break;
 			case GL_SAMPLER_CUBE:
 				expectedCubemaps.push_back(String(name));
+				printf("Shader %s expecting cubemap: %s\n", this->getName().c_str(), name);
 			break;			
 			default:
 				ProgramParam param;
 				param.name = String(name);
 				param.type = getPolycodeParamType(type);
 				expectedParams.push_back(param);
+				printf("Shader %s expecting param glType 0x%x, polycode type %d: %s\n", this->getName().c_str(), type, param.type, name);
 			break;
 		}
 		}

+ 3 - 3
Core/Contents/Source/PolyShader.cpp

@@ -356,7 +356,7 @@ void LocalShaderParam::setParamValueFromString(int type, String pvalue) {
                 if(values.size() == 2) {
                     setVector2(Vector2(atof(values[0].c_str()), atof(values[1].c_str())));
                 } else {
-                    printf("Material parameter error: A Vector2 must have 2 values (%d provided)!\n", (int)values.size());
+					printf("Material parameter error: Vector2 %s must have 2 values (%d provided)!\n", name.c_str(), (int)values.size());
                 }
             }
                 break;
@@ -366,7 +366,7 @@ void LocalShaderParam::setParamValueFromString(int type, String pvalue) {
                 if(values.size() == 3) {
                     setVector3(Vector3(atof(values[0].c_str()), atof(values[1].c_str()), atof(values[2].c_str())));
                 } else {
-                    printf("Material parameter error: A Vector3 must have 3 values (%d provided)!\n", (int)values.size());
+					printf("Material parameter error: Vector3 %s must have 3 values (%d provided)!\n", name.c_str(), (int)values.size());
                 }
             }
                 break;
@@ -376,7 +376,7 @@ void LocalShaderParam::setParamValueFromString(int type, String pvalue) {
                 if(values.size() == 4) {
                     setColor(Color(atof(values[0].c_str()), atof(values[1].c_str()), atof(values[2].c_str()), atof(values[3].c_str())));
                 } else {
-                    printf("Material parameter error: A Vector3 must have 3 values (%d provided)!\n", (int)values.size());
+					printf("Material parameter error: Color %s must have 4 values (%d provided)!\n", name.c_str(), (int)values.size());
                 }
             }
                 break;