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

[DEV] corection of mesh contructor

Browse Source
This commit is contained in:
Edouard DUPIN 2013-09-09 06:33:35 +02:00
parent a131e75b28
commit 318e44f571
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
external/ege vendored

@ -1 +1 @@
Subproject commit 48099a92bb36496f1b2399bc8793b08fd7438748 Subproject commit d68acc190307c9be0232f3b17cfe0c8cbb3ea683

2
sources/ewol/resources/Mesh.h
View File

@ -107,7 +107,7 @@ namespace ewol
etk::Vector<ewol::PhysicsShape*> m_physics; //!< collision shape module ... (independent of bullet lib) etk::Vector<ewol::PhysicsShape*> m_physics; //!< collision shape module ... (independent of bullet lib)
protected: protected:
ewol::VirtualBufferObject* m_verticesVBO; ewol::VirtualBufferObject* m_verticesVBO;
private: protected:
Mesh(const etk::UString& _fileName, const etk::UString& _shaderName="DATA:textured3D2.prog"); Mesh(const etk::UString& _fileName, const etk::UString& _shaderName="DATA:textured3D2.prog");
virtual ~Mesh(void); virtual ~Mesh(void);
public: public:

2
sources/ewol/resources/Resource.cpp
View File

@ -39,7 +39,7 @@ void ewol::Resource::Reload(void)
EWOL_DEBUG("Not Set for : [" << m_uniqueId << "]" << m_name << " loaded " << m_counter << " time(s)"); EWOL_DEBUG("Not Set for : [" << m_uniqueId << "]" << m_name << " loaded " << m_counter << " time(s)");
} }
ewol::ResourceManager ewol::Resource::GetManager(void) ewol::ResourceManager& ewol::Resource::GetManager(void)
{ {
return ewol::GetContext().GetResourcesManager(); return ewol::GetContext().GetResourcesManager();
} }

1
sources/lutin_ewol.py
View File

@ -49,6 +49,7 @@ def Create(target):
'ewol/resources/Texture.cpp', 'ewol/resources/Texture.cpp',
'ewol/resources/Colored3DObject.cpp', 'ewol/resources/Colored3DObject.cpp',
'ewol/resources/Image.cpp', 'ewol/resources/Image.cpp',
'ewol/resources/Resource.cpp',
'ewol/resources/ResourceManager.cpp']) 'ewol/resources/ResourceManager.cpp'])
# physical shape parser # physical shape parser