atria-soft/ege
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] stupid and unneeded modif

Browse Source
This commit is contained in:
Edouard DUPIN 2016-04-22 22:40:09 +02:00
parent cf4bdcf286
commit c8a5b1f125
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ege/resource/Mesh.cpp
View File

@ -119,7 +119,7 @@ void ege::resource::Mesh::draw(mat4& _positionMatrix,
//EGE_DEBUG(m_name << " " << m_light); //EGE_DEBUG(m_name << " " << m_light);
if (_enableDepthTest == true) { if (_enableDepthTest == true) {
gale::openGL::enable(gale::openGL::flag_depthTest); gale::openGL::enable(gale::openGL::flag_depthTest);
if (false == _enableDepthUpdate) { if (_enableDepthUpdate == false) {
glDepthMask(GL_FALSE); glDepthMask(GL_FALSE);
} }
} else { } else {
@ -232,7 +232,7 @@ void ege::resource::Mesh::draw(mat4& _positionMatrix,
m_GLprogram->unUse(); m_GLprogram->unUse();
if (_enableDepthTest == true){ if (_enableDepthTest == true){
if (false == _enableDepthUpdate) { if (_enableDepthUpdate == false) {
glDepthMask(GL_TRUE); glDepthMask(GL_TRUE);
} }
gale::openGL::disable(gale::openGL::flag_depthTest); gale::openGL::disable(gale::openGL::flag_depthTest);

9
ege/resource/Mesh.h
View File

@ -31,8 +31,13 @@ namespace ege {
namespace resource { namespace resource {
class Mesh : public gale::Resource { class Mesh : public gale::Resource {
public: public:
static std::shared_ptr<ege::resource::Mesh> createGrid(int32_t _lineCount, const vec3& _position=vec3(0,0,0), float _size=1.0f, const std::string& _materialName="basics"); static std::shared_ptr<ege::resource::Mesh> createGrid(int32_t _lineCount,
static std::shared_ptr<ege::resource::Mesh> createCube(float _size=1.0f, const std::string& _materialName="basics", const etk::Color<float>& _color=etk::color::white); const vec3& _position=vec3(0,0,0),
float _size=1.0f,
const std::string& _materialName="basics");
static std::shared_ptr<ege::resource::Mesh> createCube(float _size=1.0f,
const std::string& _materialName="basics",
const etk::Color<float>& _color=etk::color::white);
public: public:
/** /**
* @not_in_doc * @not_in_doc