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

Breakout Standard Screen

Browse Source 
Meaning bricks, ball, pad, walls bounces, things.
May or may not work as intended.
This commit is contained in:
PlatinumSkink
2015-09-11 15:07:00 +02:00
parent ead7c6c754
commit bda864ac11
7 changed files with 67 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Core/Engine.h
+8 -5
View File
@@ -39,6 +39,7 @@
#include "Game/PadSystem.h"
#include "Game/CBall.h"
#include "Game/CBrick.h"
#include "Game/CPad.h"
#include "Physics/PhysicsSystem.h"
#include "Physics/CPhysics.h"
@@ -78,6 +79,7 @@ public:
m_World->ComponentFactory.Register<Components::Physics>();
m_World->ComponentFactory.Register<Components::Ball>();
m_World->ComponentFactory.Register<Components::Brick>();
m_World->ComponentFactory.Register<Components::Pad>();
m_World->SystemFactory.Register<Systems::PhysicsSystem>(
[this]() { return new Systems::PhysicsSystem(m_World.get(), m_EventBroker); });
m_World->AddSystem<Systems::PhysicsSystem>();
@@ -110,7 +112,7 @@ public:
Events::SetImpulse e;
e.Entity = ent;
e.Impulse = glm::vec2(0.f, -1.f);
e.Impulse = glm::vec2(0.f, -7.f);
e.Point = glm::vec2(0.5f, 0.f);
m_EventBroker->Publish(e);
}
@@ -118,8 +120,8 @@ public:
{
auto topWall = m_World->CreateEntity();
std::shared_ptr<Components::Transform> transform = m_World->AddComponent<Components::Transform>(topWall);
transform->Position = glm::vec3(-9.f, 5.f, -9.f);
transform->Scale = glm::vec3(10.f, 0.5f, 1.f);
transform->Position = glm::vec3(0.f, 5.f, -10.f);
transform->Scale = glm::vec3(15.f, 0.5f, 1.f);
std::shared_ptr<Components::Sprite> sprite = m_World->AddComponent<Components::Sprite>(topWall);
sprite->SpriteFile = "Textures/Core/ErrorTexture.png";
@@ -134,7 +136,7 @@ public:
{
auto leftWall = m_World->CreateEntity();
std::shared_ptr<Components::Transform> transform = m_World->AddComponent<Components::Transform>(leftWall);
transform->Position = glm::vec3(-7.f, 1.f, -9.f);
transform->Position = glm::vec3(-9.f, 1.f, -10.f);
transform->Scale = glm::vec3(0.5f, 10.f, 1.f);
std::shared_ptr<Components::Sprite> sprite = m_World->AddComponent<Components::Sprite>(leftWall);
@@ -150,7 +152,7 @@ public:
{
auto rightWall = m_World->CreateEntity();
std::shared_ptr<Components::Transform> transform = m_World->AddComponent<Components::Transform>(rightWall);
transform->Position = glm::vec3(7.f, 1.f, -9.f);
transform->Position = glm::vec3(9.f, 1.f, -10.f);
transform->Scale = glm::vec3(0.5f, 10.f, 1.f);
std::shared_ptr<Components::Sprite> sprite = m_World->AddComponent<Components::Sprite>(rightWall);
@@ -192,6 +194,7 @@ public:
auto rectangle = m_World->AddComponent<Components::RectangleShape>(ent);
auto physics = m_World->AddComponent<Components::Physics>(ent);
auto csprite = m_World->AddComponent<Components::Sprite>(ent);
auto pad = m_World->AddComponent<Components::Pad>(ent);
csprite->SpriteFile = "Textures/Pad.png";
m_World->CommitEntity(ent);
}
include/Game/CBall.h
+4 -4
View File
@@ -1,9 +1,9 @@
//
// Created by Administrator on 2015-09-10.
// Created by Adniklastrator on 2015-09-10.
//
#ifndef DAYDREAM_CPAD_H
#define DAYDREAM_CPAD_H
#ifndef DAYDREAM_CBALL_H
#define DAYDREAM_CBALL_H
#include "Core/Component.h"
@@ -22,4 +22,4 @@ struct Ball : Component
}
#endif //DAYDREAM_CPAD_H
#endif //DAYDREAM_CBALL_H
include/Game/CPad.h
+1 -3
View File
@@ -1,5 +1,5 @@
//
// Created by Administrator on 2015-09-10.
// Created by Adniklastrator on 2015-09-10.
//
#ifndef DAYDREAM_CPAD_H
@@ -17,8 +17,6 @@ namespace Components
struct Pad : Component
{
//std::shared_ptr<dd::EventBroker> eventBroker;
//EVENT_SUBSCRIBE_MEMBER(m_EKeyDown, CPad::OnKeyDown);
int Lives;
int Points;
};
include/Game/PadSystem.h
+5 -3
View File
@@ -11,13 +11,15 @@
#include "Core/EKeyDown.h"
#include "Core/EKeyUp.h"
#include "Input/EBindKey.h"
//#include "Core/EContact.h"
#include "Physics/EContact.h"
#include "Core/CTransform.h"
#include "Physics/CBoxShape.h"
#include "Physics/CPhysics.h"
#include "Rendering/CSprite.h"
#include "Game/CBall.h"
#include "Core/Component.h"
#include "Physics/ESetImpulse.h"
#include "Physics/CCircleShape.h"
namespace dd
@@ -39,13 +41,13 @@ public:
private:
dd::EventRelay<PadSystem, dd::Events::KeyDown> m_EKeyDown;
dd::EventRelay<PadSystem, dd::Events::KeyUp> m_EKeyUp;
//dd::EventRelay<LevelSystem, dd::Events::Contact> m_EContact;
dd::EventRelay<PadSystem, dd::Events::Contact> m_EContact;
bool OnKeyDown(const dd::Events::KeyDown &event);
bool OnKeyUp(const dd::Events::KeyUp &event);
bool OnContact(/*const dd::Events::Contact &event*/);
bool OnContact(const dd::Events::Contact &event);
include/Physics/PhysicsSystem.h
-2
View File
@@ -78,8 +78,6 @@ private:
e.Entity1 = m_PhysicsSystem->m_BodiesToEntities[contact->GetFixtureA()->GetBody()];
e.Entity2 = m_PhysicsSystem->m_BodiesToEntities[contact->GetFixtureB()->GetBody()];
std::cout << e.Entity1 << " " << e.Entity2 << std::endl;
m_PhysicsSystem->EventBroker->Publish(e);
}
void EndContact(b2Contact* contact)
src/game/Game/PadSystem.cpp
+44 -1
View File
@@ -6,6 +6,7 @@
#include "Game/PadSystem.h"
#include "Core/World.h"
#include <iostream>
#include <Game/CPad.h>
void dd::Systems::PadSystem::Initialize()
@@ -22,6 +23,7 @@ void dd::Systems::PadSystem::Initialize()
EVENT_SUBSCRIBE_MEMBER(m_EKeyDown, PadSystem::OnKeyDown);
EVENT_SUBSCRIBE_MEMBER(m_EKeyUp, PadSystem::OnKeyUp);
EVENT_SUBSCRIBE_MEMBER(m_EContact, PadSystem::OnContact);
return;
}
@@ -114,9 +116,50 @@ bool dd::Systems::PadSystem::OnKeyUp(const dd::Events::KeyUp &event)
return true;
}
bool dd::Systems::PadSystem::OnContact(/*const dd::Events::Contact &event,*/)
bool dd::Systems::PadSystem::OnContact(const dd::Events::Contact &event)
{
EntityID entityBall = event.Entity2;
auto ball = m_World->GetComponent<Components::Ball>(entityBall);
if (ball == NULL)
{
return false;
}
EntityID entityPad = event.Entity1;
auto pad = m_World->GetComponent<Components::Pad>(entityPad);
if (pad == NULL)
{
return false;
}
auto transformBall = m_World->GetComponent<Components::Transform>(entityBall);
auto transformPad = m_World->GetComponent<Components::Transform>(entityPad);
float movementMultiplier = 2.f;
float movementX = (event.ContactPoint.x - transformPad->Position.x) * movementMultiplier;
float movementY = glm::cos((abs(movementX) / (3.2f * movementMultiplier)) * 3.14159265359f / 2) * 2.f;
std::cout << movementX << " " << movementY << std::endl;
//Temporary solution. Add a new ball and delete the old one.
auto ent = m_World->CreateEntity();
std::shared_ptr<Components::Transform> transform = m_World->AddComponent<Components::Transform>(ent);
transform->Position = glm::vec3(transformBall->Position.x, transformBall->Position.y + 0.1f, -10.f);
transform->Scale = glm::vec3(1.f, 1.f, 1.f);
std::shared_ptr<Components::Sprite> sprite = m_World->AddComponent<Components::Sprite>(ent);
sprite->SpriteFile = "Textures/Ball.png";
std::shared_ptr<Components::CircleShape> circleShape = m_World->AddComponent<Components::CircleShape>(ent);
std::shared_ptr<Components::Ball> cball = m_World->AddComponent<Components::Ball>(ent);
std::shared_ptr<Components::Physics> physics = m_World->AddComponent<Components::Physics>(ent);
physics->Static = false;
m_World->RemoveEntity(entityBall);
m_World->CommitEntity(ent);
Events::SetImpulse e;
e.Entity = ent;
e.Impulse = glm::vec2(movementX, movementY);
e.Point = glm::vec2(event.ContactPoint);
EventBroker->Publish(e);
}
bool dd::Systems::PadSystem::PadSteeringInputController::OnCommand(const Events::InputCommand &event)
src/game/Physics/PhysicsSystem.cpp
+5 -5
View File
@@ -16,8 +16,8 @@ void dd::Systems::PhysicsSystem::Initialize()
m_PhysicsWorld = new b2World(m_Gravity);
m_TimeStep = 1.f/60.f;
m_VelocityIterations = 6;
m_PositionIterations = 2;
m_VelocityIterations = 8;
m_PositionIterations = 6;
m_PhysicsWorld->SetContactListener(m_ContactListener);
@@ -147,7 +147,7 @@ void dd::Systems::PhysicsSystem::CreateBody(EntityID entity)
auto boxComponent = m_World->GetComponent<Components::RectangleShape>(entity);
if (boxComponent) {
b2PolygonShape* bShape = new b2PolygonShape();
bShape->SetAsBox(absoluteTransform.Scale.x/4, absoluteTransform.Scale.y/4); //TODO: THIS SUCKS DUDE 4?!?!?!?
bShape->SetAsBox(absoluteTransform.Scale.x/2, absoluteTransform.Scale.y/2); //TODO: THIS SUCKS DUDE 4?!?!?!?
pShape = bShape;
} else {
auto circleComponent = m_World->GetComponent<Components::CircleShape>(entity);
@@ -159,7 +159,7 @@ void dd::Systems::PhysicsSystem::CreateBody(EntityID entity)
if (absoluteTransform.Scale.x != absoluteTransform.Scale.y && absoluteTransform.Scale.y != absoluteTransform.Scale.z) {
LOG_WARNING("Circles has to be of uniform scale.");
}
pShape->m_radius = absoluteTransform.Scale.x/4; //TODO: THIS ALSO SUCKS 4 WTH
pShape->m_radius = absoluteTransform.Scale.x/2; //TODO: THIS ALSO SUCKS 4 WTH
}
}
@@ -172,7 +172,7 @@ void dd::Systems::PhysicsSystem::CreateBody(EntityID entity)
b2FixtureDef fixtureDef;
fixtureDef.shape = pShape;
fixtureDef.density = 1.f;
fixtureDef.restitution = 0.0f;
fixtureDef.restitution = 1.0f;
fixtureDef.friction = 0.3f;
body->CreateFixture(&fixtureDef);