Scaling textures (start)

4 files changed, 27 insertions, 4 deletions

diff --git a/src/components.cpp b/src/components.cpp
index c7069ce..f216cd2 100644
--- a/src/components.cpp
+++ b/src/components.cpp
@@ -53,8 +53,8 @@ void RenderSystem::update(entityx::EntityManager &en, entityx::EventManager &ev,
 								1.0, 0.0};
 
 		for (auto &S : sprite.sprite) {
-			float width = S.first.size.x;
-			float height = S.first.size.y;
+			float width = HLINES(S.first.size.x);
+			float height = HLINES(S.first.size.y);
 
 			vec2 loc = vec2(pos.x + S.first.offset.x, pos.y + S.first.offset.y);
 
diff --git a/src/ui.cpp b/src/ui.cpp
index e9738cf..922e5be 100644
--- a/src/ui.cpp
+++ b/src/ui.cpp
@@ -1337,10 +1337,12 @@ void InputSystem::update(entityx::EntityManager &en, entityx::EventManager &ev,
 				break;
 			case SDLK_F12:
 				// Make the BYTE array, factor of 3 because it's RBG.
-				static GLubyte* pixels;
+				/*static GLubyte* pixels;
 				pixels = new GLubyte[ 3 * SCREEN_WIDTH * SCREEN_HEIGHT];
 				glReadPixels(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, GL_RGB, GL_UNSIGNED_BYTE, pixels);
-				takeScreenshot(pixels);
+				takeScreenshot(pixels);*/
+
+				ev.emit<ScreenshotEvent>(game::SCREEN_WIDTH, game::SCREEN_HEIGHT);
 
 				std::cout << "Took screenshot" << std::endl;
 				break;
diff --git a/src/window.cpp b/src/window.cpp
index 4c73b8b..f878ec3 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -66,6 +66,7 @@ void WindowSystem::die(void)
 void WindowSystem::configure(entityx::EventManager &ev)
 {
     ev.subscribe<WindowResizeEvent>(*this);
+	ev.subscribe<ScreenshotEvent>(*this);
 }
 
 
@@ -78,6 +79,22 @@ void WindowSystem::receive(const WindowResizeEvent &wre)
 	SDL_SetWindowSize(window, wre.x, wre.y);
 }	
 
+#include <ui.hpp>
+
+void WindowSystem::receive(const ScreenshotEvent &scr)
+{
+	// Make the BYTE array, factor of 3 because it's RBG.
+	static GLubyte* pixels;
+	pixels = new GLubyte[ 3 * scr.w * scr.h];
+	//glReadPixels(0, 0, scr.w, scr.h, GL_RGB, GL_UNSIGNED_BYTE, pixels);
+	for(int i = 0; i < (3 * scr.w * scr.h); i++) {
+		pixels[i] = 255;
+	}
+
+	ui::takeScreenshot(pixels);
+	std::cout << "Triggered\n";
+}
+
 void WindowSystem::update(entityx::EntityManager &en, entityx::EventManager &ev, entityx::TimeDelta dt)
 {
     (void)en;
diff --git a/src/world.cpp b/src/world.cpp
index 8f67d8b..02db9cf 100644
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -759,6 +759,8 @@ void WorldSystem::render(void)
 
 	bgTex++;
 	auto mountainDim = bgTex.getTextureDim();
+	mountainDim.x = HLINES(mountainDim.x);
+	mountainDim.y = HLINES(mountainDim.y);
     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);
@@ -786,6 +788,8 @@ void WorldSystem::render(void)
 	for (unsigned int i = 0; i < 4; i++) {
 		bgTex++;
 		auto dim = bgTex.getTextureDim();
+		dim.x = HLINES(dim.x);
+		dim.y = HLINES(dim.y);
 		auto xcoord = offset.x * bgDraw[i][2];
 
 		bg_items.clear();