Automatic screen size

.vscode/launch.json

@@ -0,0 +1,27 @@
+{
+    // Используйте IntelliSense, чтобы узнать о возможных атрибутах.
+    // Наведите указатель мыши, чтобы просмотреть описания существующих атрибутов.
+    // Для получения дополнительной информации посетите: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "(gdb) Launch",
+            "type": "cppdbg",
+            "request": "launch",
+            "program": "${workspaceFolder}/awoorwae",
+            "args": [],
+            "stopAtEntry": false,
+            "cwd": "${workspaceFolder}",
+            "environment": [],
+            "externalConsole": false,
+            "MIMode": "gdb",
+            "setupCommands": [
+                {
+                    "description": "Enable pretty-printing for gdb",
+                    "text": "-enable-pretty-printing",
+                    "ignoreFailures": true
+                }
+            ]
+        }
+    ]
+}

Makefile

@@ -16,11 +16,10 @@ else
 	CC=gcc
 	CPP=g++
 endif
-SOURCES=$(wildcard src/*.c)
-SOURCES_CPP=$(wildcard src/*.cpp)
-OBJECTS=$(SOURCES:.c=.o) $(SOURCES_CPP:.cpp=.o)
+SOURCES=$(wildcard src/*.cpp) $(wildcard src/**/*.cpp)
+OBJECTS=$(SOURCES:.cpp=.o)
 
-all: $(SOURCES) $(SOURCES_CPP) $(EXECUTABLE)
+all: $(SOURCES) $(EXECUTABLE)
 
 clean: 
 	$(RM) $(OBJECTS) $(EXECUTABLE)
@@ -28,9 +27,6 @@ clean:
 $(EXECUTABLE): $(OBJECTS) 
 	$(CPP) $(LDFLAGS) $(OBJECTS) -o $@ $(LIBRARIES)
 
-.c.o:
-	$(CC) $(INCLUDES) -c $(CFLAGS) $< -o $@
-
 .cpp.o:
 	$(CPP) $(INCLUDES) -c $(CPPFLAGS) $< -o $@
 

include/olcPixelGameEngine.h

@@ -247,6 +247,8 @@ namespace olc // All OneLoneCoder stuff will now exist in the "olc" namespace
 		Pixel();
 		Pixel(uint8_t red, uint8_t green, uint8_t blue, uint8_t alpha = 255);
 		Pixel(uint32_t p);
+
+		static Pixel CreateFromHSV(uint8_t h, uint8_t s, uint8_t v, uint8_t alpha = 255);
 		enum Mode { NORMAL, MASK, ALPHA, CUSTOM };
 	};
 
@@ -412,6 +414,8 @@ namespace olc // All OneLoneCoder stuff will now exist in the "olc" namespace
 
 	public:
 		olc::rcode	Construct(uint32_t screen_w, uint32_t screen_h, uint32_t pixel_w, uint32_t pixel_h, bool full_screen = false);
+		// Selects maximum pixel size to fit in the display resolution
+		olc::rcode	ConstructAuto(uint32_t screen_w, uint32_t screen_h, bool full_screen = false);
 		olc::rcode	Start();
 
 	public: // Override Interfaces
@@ -558,6 +562,7 @@ namespace olc // All OneLoneCoder stuff will now exist in the "olc" namespace
 		void olc_UpdateViewport();
 		bool olc_OpenGLCreate();
 		void olc_ConstructFontSheet();
+		uint32_t olc_GetMaximumPixelSize(uint32_t w, uint32_t h);
 
 
 #ifdef _WIN32

src/main.cpp

@@ -1,38 +1,10 @@
-#include "olcPixelGameEngine.h"
-#include "olcPGEX_Graphics2D.h"
-#include "olcPGEX_Sound.h"
-
-class Example : public olc::PixelGameEngine
-{
-public:
-	Example()
-	{
-		sAppName = "Awoorwa";
-	}
-
-public:
-	bool OnUserCreate() override
-	{
-		// Called once at the start, so create things here
-		return true;
-	}
-
-	bool OnUserUpdate(float fElapsedTime) override
-	{
-		// called once per frame
-		for (int x = 0; x < ScreenWidth(); x++)
-			for (int y = 0; y < ScreenHeight(); y++)
-				Draw(x, y, olc::Pixel(rand() % 255, rand() % 255, rand()% 255));	
-		return true;
-	}
-};
-
+#include "pabloader/awoorwae.h"
 
 int main()
 {
-	Example demo;
-	if (demo.Construct(256, 240, 2, 1))
-		demo.Start();
+    pabloader::Awoorwae game;
+    if (game.ConstructAuto(320, 240))
+        game.Start();
 
-	return 0;
+    return 0;
 }

src/olcPixelGameEngine.cpp

@@ -23,6 +23,51 @@ namespace olc
 		n = p;
 	}
 
+	Pixel Pixel::CreateFromHSV(uint8_t h, uint8_t s, uint8_t v, uint8_t alpha) {
+		Pixel rgb;
+		rgb.a = alpha;
+		uint8_t region, remainder, p, q, t;
+
+		if (s == 0)
+		{
+			rgb.r = v;
+			rgb.g = v;
+			rgb.b = v;
+			return rgb;
+		}
+
+		region = h / 43;
+		remainder = (h - (region * 43)) * 6; 
+
+		p = (v * (255 - s)) >> 8;
+		q = (v * (255 - ((s * remainder) >> 8))) >> 8;
+		t = (v * (255 - ((s * (255 - remainder)) >> 8))) >> 8;
+
+		switch (region)
+		{
+			case 0:
+				rgb.r = v; rgb.g = t; rgb.b = p;
+				break;
+			case 1:
+				rgb.r = q; rgb.g = v; rgb.b = p;
+				break;
+			case 2:
+				rgb.r = p; rgb.g = v; rgb.b = t;
+				break;
+			case 3:
+				rgb.r = p; rgb.g = q; rgb.b = v;
+				break;
+			case 4:
+				rgb.r = t; rgb.g = p; rgb.b = v;
+				break;
+			default:
+				rgb.r = v; rgb.g = p; rgb.b = q;
+				break;
+		}
+
+		return rgb;
+	}
+
 	//==========================================================
 
 	std::wstring ConvertS2W(std::string s)
@@ -480,6 +525,12 @@ namespace olc
 		return olc::OK;
 	}
 
+	olc::rcode PixelGameEngine::ConstructAuto(uint32_t screen_w, uint32_t screen_h, bool fullscreen)
+	{
+		uint32_t pixelSize = olc_GetMaximumPixelSize(screen_w, screen_h);
+		return Construct(screen_w, screen_h, pixelSize, pixelSize, fullscreen);
+	}
+
 	olc::rcode PixelGameEngine::Start()
 	{
 		// Construct the window
@@ -1116,6 +1167,32 @@ namespace olc
 			nMousePosYcache = 0;
 	}
 
+	uint32_t PixelGameEngine::olc_GetMaximumPixelSize(uint32_t width, uint32_t height) 
+	{
+#ifdef _WIN32
+		return 1; // TODO 
+#else
+		Display* d = XOpenDisplay(NULL);
+		int defaultScreen = DefaultScreen(d);
+		Screen *s = ScreenOfDisplay(d, defaultScreen);
+		int minResolution = std::min(WidthOfScreen(s), HeightOfScreen(s));
+		int screensCount = ScreenCount(d);
+		for (int i=0; i < screensCount; i++) {
+			s = ScreenOfDisplay(d, i);
+			if (WidthOfScreen(s) < minResolution) {
+				minResolution = WidthOfScreen(s);
+			}
+			if (HeightOfScreen(s) < minResolution) {
+				minResolution = HeightOfScreen(s);
+			}
+		}
+
+		uint32_t minScreenSize = std::min(width, height);
+
+		return minResolution / minScreenSize;		
+#endif
+	}
+
 	void PixelGameEngine::EngineThread()
 	{
 		// Start OpenGL, the context is owned by the game thread

src/pabloader/awoorwae.cpp

@@ -0,0 +1,59 @@
+#include "awoorwae.h"
+#include <cmath>
+#include <string>
+
+namespace pabloader {
+
+bool Awoorwae::OnUserUpdate(float fElapsedTime)
+{
+    Clear(olc::BLACK);
+
+    player->Update(fElapsedTime);
+    player->Draw();
+    return true;
+}
+
+Entity::Entity(Awoorwae* game_, float x_, float y_)
+    : game(game_)
+    , x(x_)
+    , y(y_)
+    , xv(50)
+    , yv(30)
+    , color(0)
+{
+    xv = 10;
+    yv = 10;
+}
+
+void Entity::Update(float dt)
+{
+    x += dt * xv;
+    y += dt * yv;
+
+    if (x > game->ScreenWidth() - 20) {
+        xv *= -1;
+        x = game->ScreenWidth() - 20;
+    }
+
+    if (x < 20) {
+        xv *= -1.1;
+        x = 20;
+    }
+
+    if (y > game->ScreenHeight() - 20) {
+        yv *= -1;
+        y = game->ScreenHeight() - 20;
+    }
+
+    if (y < 20) {
+        yv *= -1.1;
+        y = 20;
+    }
+    color = fmodf(color + 256 * dt, 256);
+}
+
+void Entity::Draw()
+{
+    game->DrawCircle((int)x, (int)y, 20, olc::Pixel::CreateFromHSV((int)color, 255, 255));
+}
+}

src/pabloader/awoorwae.h

@@ -0,0 +1,50 @@
+#include "olcPGEX_Graphics2D.h"
+#include "olcPGEX_Sound.h"
+#include "olcPixelGameEngine.h"
+#include <cstdint>
+#include <iostream>
+
+namespace pabloader {
+class Awoorwae;
+
+class Entity {
+private:
+    Awoorwae* game;
+    float x;
+    float y;
+    float xv;
+    float yv;
+    float color;
+
+public:
+    Entity(Awoorwae* game_, float x_, float y_);
+
+    void Update(float dt);
+    void Draw();
+};
+
+class Awoorwae : public olc::PixelGameEngine {
+private:
+    Entity* player;
+
+public:
+    Awoorwae()
+    {
+        sAppName = "Awoorwa";
+        player = new Entity(this, 128, 128);
+    }
+
+    ~Awoorwae()
+    {
+        delete player;
+    }
+
+public:
+    bool OnUserCreate() override
+    {
+        return true;
+    }
+
+    bool OnUserUpdate(float fElapsedTime) override;
+};
+}