github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-06-12 22:04:24 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

SurfaceCtrl: removed flagSKYBOX

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@15008 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
xemuth 2020-09-10 14:36:06 +00:00
parent 33af420c8d
commit eb93dc9750
2 changed files with 22 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

22
bazaar/SurfaceCtrl/Shader.h
View file

@ -15,7 +15,27 @@ class OpenGLShader{
glGetShaderiv(ID, GL_COMPILE_STATUS, &success);
if (!success){
glGetShaderInfoLog(ID, 512, NULL, infoLog);
LOG("ERROR::SHADER::VERTEX::COMPILATION_FAILED\n" + String(infoLog));
String type;
switch(shaderType){
case GL_VERTEX_SHADER:
type= "VERTEX";
break;
case GL_FRAGMENT_SHADER:
type= "FRAGMENT";
break;
case GL_TESS_CONTROL_SHADER:
type= "TESSELATION_CONTROL";
break;
case GL_TESS_EVALUATION_SHADER:
type= "TESSELATION_EVALUATION";
break;
case GL_GEOMETRY_SHADER:
type= "GEOMETRY";
break;
default:
type= "UNKNOW";
};
LOG("ERROR::SHADER::" + type + "::" + AsString(ID) + "::COMPILATION_FAILED\n" + String(infoLog));
return false;
}
return true;

6
bazaar/SurfaceCtrl/SurfaceCtrl.cpp
View file

@ -20,11 +20,7 @@ void SurfaceCtrl::Init()noexcept{
SetDefaultShader(Axis);
CameraFocus = objProvider.Begin(GL_TRIANGLE_FAN).AddCube(0.0f,0.0f,0.0f,1,LtYellow()).End();
SetDefaultShader(CameraFocus);
#ifdef flagSKYBOX
skybox.Init();
#endif
WhenBegin();
loaded = true;
});