From 30e73c9723f08049b75ab67552171f5422a2b285 Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Mon, 22 May 2017 23:15:28 +0200 Subject: [PATCH] [DEV] add non isometric cube --- ege/resource/Mesh.hpp | 3 +++ ege/resource/MeshCube.cpp | 4 ++++ sample/Collision/appl/Windows.cpp | 4 ++-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ege/resource/Mesh.hpp b/ege/resource/Mesh.hpp index 0480a65..ab80ee5 100644 --- a/ege/resource/Mesh.hpp +++ b/ege/resource/Mesh.hpp @@ -37,6 +37,9 @@ namespace ege { static ememory::SharedPtr createCube(float _size=1.0f, const std::string& _materialName="basics", const etk::Color& _color=etk::color::green); + static ememory::SharedPtr createCube(const vec3& _size=vec3(1.0f, 1.0f, 1.0f), + const std::string& _materialName="basics", + const etk::Color& _color=etk::color::green); static ememory::SharedPtr createSphere(float _size=1.0f, const std::string& _materialName="basics", const etk::Color& _color=etk::color::green, diff --git a/ege/resource/MeshCube.cpp b/ege/resource/MeshCube.cpp index 7298bcf..ea7ae71 100644 --- a/ege/resource/MeshCube.cpp +++ b/ege/resource/MeshCube.cpp @@ -8,6 +8,10 @@ #include ememory::SharedPtr ege::resource::Mesh::createCube(float _size, const std::string& _materialName, const etk::Color& _color) { + return createCube(vec3(_size, _size, _size), _materialName, _color); +} + +ememory::SharedPtr ege::resource::Mesh::createCube(const vec3& _size, const std::string& _materialName, const etk::Color& _color) { EGE_VERBOSE(" create a cube _size=" << _size << " _materialName=" << _materialName << " _color=" << _color); ememory::SharedPtr out = ege::resource::Mesh::create("---", "DATA:color3.prog"); if (out != nullptr) { diff --git a/sample/Collision/appl/Windows.cpp b/sample/Collision/appl/Windows.cpp index cf35882..74f059d 100644 --- a/sample/Collision/appl/Windows.cpp +++ b/sample/Collision/appl/Windows.cpp @@ -128,7 +128,7 @@ void appl::Windows::init() { m_env->addEntity(element); } // create cubes ... - myMesh = ege::resource::Mesh::createCube(3, "basics", etk::color::green); + myMesh = ege::resource::Mesh::createCube(vec3(3,0.2,5), "basics", etk::color::green); if (myMesh != nullptr) { ememory::SharedPtr element = ememory::makeShared(m_env); // add all component: @@ -140,7 +140,7 @@ void appl::Windows::init() { // 3rd some physic: ememory::SharedPtr componentPhysics = ememory::makeShared(m_env, transform); ememory::SharedPtr physic = ememory::makeShared(); - physic->setSize(vec3(3.01,3.01,3.01)); + physic->setSize(vec3(3.01,0.21,5.01)); physic->setMass(300000); componentPhysics->addShape(physic); componentPhysics->generate();