BTH/squidout
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Working rotations and positions

Browse Source
This commit is contained in:
viktorljung
2015-09-10 18:12:15 +01:00
parent 7132412f80
commit 0983d76444
4 changed files with 66 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Core/CBoxShape.h
+5 -6
View File
@@ -1,5 +1,5 @@
#ifndef DAYDREAM_CBOXSHAPE_H
#define DAYDREAM_CBOXSHAPE_H
#ifndef DAYDREAM_CRECTANGLESHAPE_H
#define DAYDREAM_CRECTANGLESHAPE_H
#include "Core/Component.h"
@@ -8,14 +8,13 @@ namespace dd
namespace Components
{
struct BoxShape: public Component
struct RectangleShape : public Component
{
float x;
float y;
};
}
}
#endif //DAYDREAM_CBOXSHAPE_H
#endif //DAYDREAM_CRECTANGLESHAPE_H
include/Core/Engine.h
+21 -4
View File
@@ -68,7 +68,7 @@ public:
m_World->ComponentFactory.Register<Components::Sprite>();
m_World->ComponentFactory.Register<Components::BoxShape>();
m_World->ComponentFactory.Register<Components::RectangleShape>();
m_World->ComponentFactory.Register<Components::Physics>();
m_World->SystemFactory.Register<Systems::PhysicsSystem>(
[this]() { return new Systems::PhysicsSystem(m_World.get(), m_EventBroker); });
@@ -86,9 +86,26 @@ public:
std::shared_ptr<Components::Sprite> sprite = m_World->AddComponent<Components::Sprite>(ent);
sprite->SpriteFile = "Textures/Core/ErrorTexture.png";
std::shared_ptr<Components::BoxShape> boxShape = m_World->AddComponent<Components::BoxShape>(ent);
boxShape->x = 5.f;
boxShape->y = 5.f;
std::shared_ptr<Components::RectangleShape> boxShape = m_World->AddComponent<Components::RectangleShape>(ent);
std::shared_ptr<Components::Physics> physics = m_World->AddComponent<Components::Physics>(ent);
physics->Static = false;
m_World->CommitEntity(ent);
}
{
auto ent = m_World->CreateEntity();
std::shared_ptr<Components::Transform> transform = m_World->AddComponent<Components::Transform>(ent);
transform->Position = glm::vec3(0.f, -3.f, -9.f);
transform->Scale = glm::vec3(2.f, 0.5f, 1.f);
transform->Orientation = glm::rotate(transform->Orientation, glm::radians(45.f), glm::vec3(0, 0, -1));
std::shared_ptr<Components::Sprite> sprite = m_World->AddComponent<Components::Sprite>(ent);
sprite->SpriteFile = "Textures/Core/ErrorTexture.png";
std::shared_ptr<Components::RectangleShape> boxShape = m_World->AddComponent<Components::RectangleShape>(ent);
std::shared_ptr<Components::Physics> physics = m_World->AddComponent<Components::Physics>(ent);
physics->Static = true;
include/Core/Physics/PhysicsSystem.h
+2 -1
View File
@@ -8,7 +8,8 @@
#include "Core/CBoxShape.h"
#include "Core/Physics/CPhysics.h"
#include <Box2D/Box2D.h>
#include <Core/CTransform.h>
#include "Core/CTransform.h"
#include "Transform/TransformSystem.h"
namespace dd