fix EGL
This commit is contained in:
parent
d597335135
commit
7c0ad7a356
|
@ -113,6 +113,7 @@ SET(framework_LIBRARIES
|
||||||
${GLEW_LIBRARY}
|
${GLEW_LIBRARY}
|
||||||
${OPENGL_LIBRARIES}
|
${OPENGL_LIBRARIES}
|
||||||
${OPENGLES_LIBRARY}
|
${OPENGLES_LIBRARY}
|
||||||
|
${EGL_LIBRARY}
|
||||||
${LUA_LIBRARIES}
|
${LUA_LIBRARIES}
|
||||||
${PHYSFS_LIBRARY}
|
${PHYSFS_LIBRARY}
|
||||||
${GMP_LIBRARY}
|
${GMP_LIBRARY}
|
||||||
|
|
|
@ -47,7 +47,7 @@ public:
|
||||||
|
|
||||||
bool isRunning() { return m_running; }
|
bool isRunning() { return m_running; }
|
||||||
bool isStopping() { return m_stopping; }
|
bool isStopping() { return m_stopping; }
|
||||||
std::string getAppName() { return m_appName; }
|
const std::string& getAppName() { return m_appName; }
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
virtual void render();
|
virtual void render();
|
||||||
|
|
|
@ -55,8 +55,8 @@ bool Shader::compileSourceCode(const std::string& sourceCode)
|
||||||
static const char *qualifierDefines =
|
static const char *qualifierDefines =
|
||||||
"#ifndef GL_FRAGMENT_PRECISION_HIGH\n"
|
"#ifndef GL_FRAGMENT_PRECISION_HIGH\n"
|
||||||
"#define highp mediump\n"
|
"#define highp mediump\n"
|
||||||
"#endif\n";
|
"#endif\n"
|
||||||
"precision highp float;\n"
|
"precision highp float;\n";
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
std::string code = qualifierDefines;
|
std::string code = qualifierDefines;
|
||||||
|
|
|
@ -421,7 +421,7 @@ void X11Window::internalDestroyGLContext()
|
||||||
eglDestroyContext(m_eglDisplay, m_eglContext);
|
eglDestroyContext(m_eglDisplay, m_eglContext);
|
||||||
m_eglContext = 0;
|
m_eglContext = 0;
|
||||||
}
|
}
|
||||||
if(m_eglSurface)
|
if(m_eglSurface) {
|
||||||
eglDestroySurface(m_eglDisplay, m_eglSurface);
|
eglDestroySurface(m_eglDisplay, m_eglSurface);
|
||||||
m_eglSurface = 0;
|
m_eglSurface = 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -315,13 +315,8 @@ void Creature::setOutfit(const Outfit& outfit)
|
||||||
m_outfit = outfit;
|
m_outfit = outfit;
|
||||||
m_type = getType();
|
m_type = getType();
|
||||||
|
|
||||||
// Do not apply any mask color.
|
if(m_type->dimensions[ThingType::Layers] == 1)
|
||||||
if(m_type->dimensions[ThingType::Layers] == 1) {
|
m_outfit.resetClothes();
|
||||||
m_outfit.setHead(0);
|
|
||||||
m_outfit.setBody(0);
|
|
||||||
m_outfit.setLegs(0);
|
|
||||||
m_outfit.setFeet(0);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ThingType *Creature::getType()
|
ThingType *Creature::getType()
|
||||||
|
|
|
@ -117,3 +117,11 @@ Color Outfit::getColor(int color)
|
||||||
}
|
}
|
||||||
return Color(int(red * 255), int(green * 255), int(blue * 255));
|
return Color(int(red * 255), int(green * 255), int(blue * 255));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void Outfit::resetClothes()
|
||||||
|
{
|
||||||
|
setHead(0);
|
||||||
|
setBody(0);
|
||||||
|
setLegs(0);
|
||||||
|
setFeet(0);
|
||||||
|
}
|
||||||
|
|
|
@ -44,6 +44,8 @@ public:
|
||||||
void setFeet(int feet) { m_feet = feet; m_feetColor = getColor(feet); }
|
void setFeet(int feet) { m_feet = feet; m_feetColor = getColor(feet); }
|
||||||
void setAddons(int addons) { m_addons = addons; }
|
void setAddons(int addons) { m_addons = addons; }
|
||||||
|
|
||||||
|
void resetClothes();
|
||||||
|
|
||||||
int getType() const { return m_type; }
|
int getType() const { return m_type; }
|
||||||
int getHead() const { return m_head; }
|
int getHead() const { return m_head; }
|
||||||
int getBody() const { return m_body; }
|
int getBody() const { return m_body; }
|
||||||
|
|
Loading…
Reference in New Issue