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

[DEV] build again

Browse Source
This commit is contained in:
Edouard DUPIN 2016-03-11 21:43:51 +01:00
parent a9355a5168
commit 9450ebc574
6 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ege/Environement.cpp
View File

@ -305,11 +305,6 @@ ege::Environement::Environement() :
propertyStatus.add(gameStop, "stop", "Scene is stopped"); propertyStatus.add(gameStop, "stop", "Scene is stopped");
} }
void ege::Environement::init(const std::string& _name) {
ewol::Object::init(_name);
}
void ege::Environement::clear() { void ege::Environement::clear() {
m_listElement.clear(); m_listElement.clear();
} }

1
ege/Environement.h
View File

@ -99,7 +99,6 @@ namespace ege {
std::vector<std::shared_ptr<ege::Element>> m_listElement; //!< List of all element added in the Game std::vector<std::shared_ptr<ege::Element>> m_listElement; //!< List of all element added in the Game
protected: protected:
Environement(); Environement();
void init(const std::string& _name="NoName");
public: public:
DECLARE_FACTORY(Environement); DECLARE_FACTORY(Environement);
virtual ~Environement() { }; virtual ~Environement() { };

8
ege/widget/Mesh.cpp
View File

@ -25,12 +25,12 @@ ege::widget::Mesh::Mesh():
addObjectType("ege::widget::Mesh"); addObjectType("ege::widget::Mesh");
} }
void ege::widget::Mesh::init(const std::string& _filename) { void ege::widget::Mesh::init() {
ewol::Widget::init(_filename); ewol::Widget::init();
m_meshName = _filename; m_meshName = *propertyName;
// Limit event at 1: // Limit event at 1:
setMouseLimit(1); setMouseLimit(1);
if (_filename!="") { if (*propertyName!="") {
m_object = ege::resource::Mesh::create(m_meshName); m_object = ege::resource::Mesh::create(m_meshName);
if (nullptr == m_object) { if (nullptr == m_object) {
EGE_ERROR("Can not load the resource : \"" << m_meshName << "\""); EGE_ERROR("Can not load the resource : \"" << m_meshName << "\"");

2
ege/widget/Mesh.h
View File

@ -30,7 +30,7 @@ namespace ege {
float m_cameraDistance; float m_cameraDistance;
protected: protected:
Mesh(); Mesh();
void init(const std::string& _filename); // automatic considering in the appl Data older void init(); // automatic considering in the appl Data older
public: public:
virtual ~Mesh(); virtual ~Mesh();
public: // Derived function public: // Derived function

3
ege/widget/Scene.cpp
View File

@ -47,8 +47,7 @@ ege::widget::Scene::Scene() :
addObjectType("ege::widget::Scene"); addObjectType("ege::widget::Scene");
} }
void ege::widget::Scene::init(std::shared_ptr<ege::Environement> _env) { void ege::widget::Scene::init() {
m_env = _env;
ewol::Widget::init(); ewol::Widget::init();
setKeyboardRepeate(false); setKeyboardRepeate(false);
propertyCanFocus.set(true); propertyCanFocus.set(true);

6
ege/widget/Scene.h
View File

@ -51,7 +51,11 @@ namespace ege {
* @return (no execption generated (not managed in embended platform)) * @return (no execption generated (not managed in embended platform))
*/ */
Scene(); Scene();
void init(std::shared_ptr<ege::Environement> _env); void init();
public:
void setEnv(std::shared_ptr<ege::Environement> _env) {
m_env = _env;
}
public: public:
DECLARE_FACTORY(Scene); DECLARE_FACTORY(Scene);
/** /**