Better sprites

6 files changed, 23 insertions, 13 deletions

diff --git a/src/components.cpp b/src/components.cpp
index 32d0f79..45a9315 100644
--- a/src/components.cpp
+++ b/src/components.cpp
@@ -16,6 +16,16 @@ void MovementSystem::update(entityx::EntityManager &en, entityx::EventManager &e
 	});
 }
 
+void PhysicsSystem::update(entityx::EntityManager &en, entityx::EventManager &ev, entityx::TimeDelta dt)
+{
+	(void)ev;
+	en.each<Direction, Physics>([dt](entityx::Entity entity, Direction &direction, Physics &physics) {
+		(void)entity;
+		// TODO GET GRAVITY FROM WOLRD
+		direction.y += physics.g * dt;
+	});
+}
+
 void RenderSystem::update(entityx::EntityManager &en, entityx::EventManager &ev, entityx::TimeDelta dt)
 {
 	(void)ev;
@@ -61,7 +71,7 @@ void RenderSystem::update(entityx::EntityManager &en, entityx::EventManager &ev,
 				float flashAmt = 1-(hitDuration/maxHitDuration);
 				glUniform4f(Render::worldShader.uniform[WU_tex_color], 1.0, flashAmt, flashAmt, 1.0);
 			}*/
-			glBindTexture(GL_TEXTURE_2D, game::sprite_l.getSprite(S.first.sheetID));
+			glBindTexture(GL_TEXTURE_2D, S.first.pic);
 			glUniform1i(Render::worldShader.uniform[WU_texture], 0);
 			Render::worldShader.enable();
 
diff --git a/src/engine.cpp b/src/engine.cpp
index a367e27..90cfb3a 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -25,6 +25,7 @@ void Engine::init(void) {
     systems.add<InventorySystem>();
     systems.add<WorldSystem>();
     systems.add<PlayerSystem>();
+	systems.add<PhysicsSystem>();
 	systems.add<MovementSystem>();
 
     systems.configure();
@@ -44,6 +45,7 @@ void Engine::render(entityx::TimeDelta dt)
 void Engine::update(entityx::TimeDelta dt)
 {
     systems.update<InputSystem>(dt);
+	//systems.update<PhysicsSystem>(dt);
 	systems.update<MovementSystem>(dt);
 	systems.update<WorldSystem>(dt);
     systems.update<PlayerSystem>(dt);
diff --git a/src/entities.cpp b/src/entities.cpp
index 1426eaf..29380c8 100644
--- a/src/entities.cpp
+++ b/src/entities.cpp
@@ -13,11 +13,11 @@ void entityxTest(void)
 	e = game::entities.create();
 	e.assign<Position>(0.0f, 100.0f);
 	e.assign<Direction>(-0.01f, 0.0f);
+	e.assign<Physics>(-0.001f);
 	e.assign<Visible>(-.2f);
 	auto sprite_h = e.assign<Sprite>();
-	sprite_h->addSpriteSegment(SpriteData(game::sprite_l.loadSprite("assets/cat.png"),
-							  			  vec2(0, 0),
-										  vec2(19, 15)),
+	sprite_h->addSpriteSegment(SpriteData("assets/cat.png",
+										  vec2(0, 0)),
 										  vec2(0, 0));
 
 	game::engine.getSystem<PlayerSystem>()->setPlayer(e);
diff --git a/src/texture.cpp b/src/texture.cpp
index bdac28e..1f80d38 100644
--- a/src/texture.cpp
+++ b/src/texture.cpp
@@ -144,12 +144,12 @@ namespace Texture{
         return object;
     }
 
-	dim2 imageDim(std::string fileName) {
+	vec2 imageDim(std::string fileName) {
 		for(auto &t : LoadedTexture) {
 			if (t.name == fileName)
-				return t.dim;
+				return vec2(t.dim.x, t.dim.y);
 		}
-		return {0,0};
+		return vec2(0,0);
 	}
 
 	void freeTextures(void) {
diff --git a/src/ui.cpp b/src/ui.cpp
index 85b2d2b..43dd6cc 100644
--- a/src/ui.cpp
+++ b/src/ui.cpp
@@ -682,7 +682,7 @@ namespace ui {
 		static GLuint box_side = 		Texture::loadTexture("assets/ui/button_side_borders.png");
 
 		// the dimensions of the corner textures
-		static dim2 box_corner_dim_t = 	Texture::imageDim("assets/ui/button_corners.png");
+		static vec2 box_corner_dim_t = 	Texture::imageDim("assets/ui/button_corners.png");
 		static vec2 box_corner_dim = vec2(box_corner_dim_t.x / 2.0, box_corner_dim_t.y / 2.0);
 
 		// the amount of bytes to skip in the OpenGL arrays (see below)
diff --git a/src/world.cpp b/src/world.cpp
index 78de9ed..e44406e 100644
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -354,10 +354,8 @@ void WorldSystem::load(const std::string& file)
 					} else if (tname == "Sprite") {
 						auto sprite = entity.assign<Sprite>();
 						auto tex = abcd->Attribute("image");
-						auto dim = Texture::imageDim(tex);
-						sprite->addSpriteSegment(SpriteData(game::sprite_l.loadSprite(tex),
-						                                    vec2(0, 0),
-						                                    vec2(dim.x, dim.y) * 2),
+						sprite->addSpriteSegment(SpriteData(tex,
+						                                    vec2(0, 0)),
 						                         vec2(0, 0));
 					}
 
@@ -752,7 +750,7 @@ void WorldSystem::render(void)
 	std::vector<vec2> bg_tex;
 
 	bgTex++;
-	dim2 mountainDim = bgTex.getTextureDim();
+	vec2 mountainDim = bgTex.getTextureDim();
     auto xcoord = width / 2 * -1 + offset.x * 0.85f;
 	for (int i = 0; i <= width / mountainDim.x; i++) {
         bg_items.emplace_back(mountainDim.x * i       + xcoord, GROUND_HEIGHT_MINIMUM, 				 8.0f);