From 59a2162deb1cf0e1cad78f11f2bc1ffe36619baf Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Thu, 13 Nov 2014 00:04:20 +0100 Subject: [PATCH] [DEV] basic display of 2 basic cube --- sample/MeshCreator/appl/Windows.cpp | 6 +++--- sample/RayTest/appl/Windows.cpp | 11 ++++++++++- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/sample/MeshCreator/appl/Windows.cpp b/sample/MeshCreator/appl/Windows.cpp index 9099572..ab70a6f 100644 --- a/sample/MeshCreator/appl/Windows.cpp +++ b/sample/MeshCreator/appl/Windows.cpp @@ -80,7 +80,7 @@ void appl::Windows::init() { ewol::widget::Windows::init(); setTitle("example ege : MeshCreator"); - //getObjectManager().periodicCall.bind(shared_from_this(), &appl::Windows::onCallbackPeriodicUpdateCamera); + getObjectManager().periodicCall.bind(shared_from_this(), &appl::Windows::onCallbackPeriodicUpdateCamera); m_env = ege::Environement::create(); // Create basic Camera @@ -101,12 +101,12 @@ void appl::Windows::init() { if (myMesh != nullptr) { m_env->addStaticMeshToDraw(myMesh); } - myMesh = createGrid(10, vec3(0,0,0), 5); + myMesh = ege::resource::Mesh::createGrid(10, vec3(0,0,0), 5); if (myMesh != nullptr) { m_env->addStaticMeshToDraw(myMesh); } if (true) { - myMesh = ege::resource::Mesh::create("---"); + myMesh = createMars(); if (myMesh != nullptr) { std::shared_ptr element = std::make_shared(m_env); //std::shared_ptr element = std::make_shared(m_env); diff --git a/sample/RayTest/appl/Windows.cpp b/sample/RayTest/appl/Windows.cpp index df0cfd3..9994c12 100644 --- a/sample/RayTest/appl/Windows.cpp +++ b/sample/RayTest/appl/Windows.cpp @@ -93,7 +93,16 @@ void appl::Windows::init() { } myMesh = ege::resource::Mesh::createCube(3); if (myMesh != nullptr) { - m_env->addStaticMeshToDraw(myMesh); + std::shared_ptr element = std::make_shared(m_env); + //std::shared_ptr element = std::make_shared(m_env); + element->setPosition(vec3(50,0,0)); + element->setMesh(myMesh); + m_env->addElement(element); + element = std::make_shared(m_env); + //std::shared_ptr element = std::make_shared(m_env); + element->setPosition(vec3(-50,0,0)); + element->setMesh(myMesh); + m_env->addElement(element); } }