StateManager and States now have their own reference to Graphics instead of being passed into Draw(), Added image class and test images

Image class is just array of palette indices converted from the rgb data of any image by using euclidian distance between palette rgb and pixel rgb. Works well.

.gitignore

@@ -3,3 +3,4 @@ cmake-build-debug
 .vscode
 cmake-build-release
 build
+.DS_Store

CMakeLists.txt

@@ -43,7 +43,9 @@ add_executable(Pycron src/main.cpp
         src/Graphics/Font.cpp
         src/Graphics/Font.h
         src/States/EditorState.cpp
-        src/States/EditorState.h)
+        src/States/EditorState.h
+        src/Graphics/PycronImage.h
+        src/Graphics/PycronImage.cpp)
 
 add_subdirectory(dependencies/pocketpy)
 # Declaring our executable

src/Graphics/Graphics.cpp

@@ -3,10 +3,15 @@
 //
 
 #include "Graphics.h"
+#include "PycronImage.h"
+#include "Font.h"
 #include "../Utilities.h"
-#include <raymath.h>
 #include "../StateManager.h"
+
 #include <fstream>
+#include <raymath.h>
+
+
 
 
 Graphics::Graphics(int screenWidth, int screenHeight, int startupScale) : m_screenWidth(screenWidth), m_screenHeight(screenHeight){
@@ -51,7 +56,7 @@ void Graphics::draw(StateManager* stateManager) {
         calculateScreenPositionInWindow();
     }
 
-    stateManager->Draw(this);
+    stateManager->Draw();
     copyBufferToGPU();
     renderVirtualScreen();
 }
@@ -540,6 +545,30 @@ void Graphics::Triangle(int32_t x1, int32_t y1, int32_t x2, int32_t y2, int32_t
 
 }
 
+PycronImage* Graphics::loadImage(std::string path) {
+    Image img = LoadImage(path.c_str());
+    ImageRotateCW(&img);
+    ImageFlipHorizontal(&img);
+    if(img.width == 0 && img.height == 0) std::cerr << "Image at path " << path << " is empty\n";
+    Color* colors = LoadImageColors(img);
+    auto* idImg = new PycronImage(img.width, img.height);
+    for (int i = 0; i < idImg->data.size(); ++i) {
+        if(colors[i].a == 0){
+            idImg->data[i] = -1;
+        }else{
+            idImg->data[i] = (int8_t)rgbToID(colors[i].r, colors[i].g, colors[i].b);
+        }
+    }
+    return idImg;
+}
+
+void Graphics::Img(PycronImage* img, int x, int y) {
+    for (int i = 0; i < img->data.size(); ++i) {
+        if(img->data[i] == -1) continue;
+        Pixel(x + i / img->width, y + i % img->width, img->data[i]);
+    }
+}
+
 
 
 

src/Graphics/Graphics.h

@@ -1,7 +1,6 @@
 #pragma once
 #include "raylib.h"
 #include "pocketpy/vm.h"
-#include "Font.h"
 
 #include <algorithm>
 #include <vector>
@@ -10,6 +9,8 @@
 
 
 class StateManager;
+class PycronImage;
+class PixelFont;
 
 class Graphics {
 
@@ -46,18 +47,18 @@ public:
 
     std::unordered_map<unsigned int, unsigned int> m_paletteByID;    // <id, hex color>
 
-
-
 public:
+
     Graphics(int screenWidth, int screenHeight, int startupScale);
     ~Graphics();
 
     void draw(StateManager* stateManager);
     int rgbToID(int r, int g, int b);
 
-
     void copyBufferToGPU();
 
+    PycronImage* loadImage(std::string path);
+
     void updateVMVars(pkpy::VM* vm);
 
     void loadPalette(std::string path);
@@ -76,7 +77,7 @@ public:
     void RectBorder(int x, int y, int width, int height, int paletteIndex);
     void Text(const std::string& s, int x, int y, int paletteIndex);
     void Triangle(int32_t x1, int32_t y1, int32_t x2, int32_t y2, int32_t x3, int32_t y3, int paletteIndex);
-
+    void Img(PycronImage* img, int x, int y);
     int GetPixel(int x, int y);
 
 

src/Graphics/PycronImage.cpp

@@ -0,0 +1,8 @@
+//
+// Created by Bobby Lucero on 5/22/24.
+//
+
+#include "PycronImage.h"
+
+PycronImage::PycronImage(int width, int height) : width(width), height(height), data(width * height) {
+}

src/Graphics/PycronImage.h

@@ -0,0 +1,12 @@
+#pragma once
+
+#include <vector>
+
+struct PycronImage {
+    int width;
+    int height;
+    std::vector<int8_t> data;
+
+    PycronImage(int width, int height);
+};
+

src/Pycron.cpp

@@ -32,7 +32,7 @@ Pycron::Pycron() {
     m_graphics->loadPalette("resources/thecosmos.hex");
     m_graphics->bindMethods(m_vm);
     m_graphics->updateVMVars(m_vm);
-    m_stateManager = new StateManager(this);
+    m_stateManager = new StateManager(this, m_graphics);
 
 
 

src/State.h

@@ -8,7 +8,7 @@ protected:
     State(){}
 public:
     virtual ~State() = default;
-    virtual void Draw(Graphics* graphics) = 0;
+    virtual void Draw() = 0;
     virtual void OnEnter() = 0;
     virtual void OnExit() = 0;
     virtual void onKeyPressed(int key) = 0;

src/StateManager.cpp

@@ -4,9 +4,9 @@
 
 #include "StateManager.h"
 
-StateManager::StateManager(Pycron *pycron) : m_pycron(pycron){
+StateManager::StateManager(Pycron *pycron, Graphics *graphics) : m_pycron(pycron){
-    m_gameState = new GameState(m_pycron->m_vm);
+    m_gameState = new GameState(m_pycron->m_vm, graphics);
-    m_editorState = new EditorState(m_pycron->m_vm);
+    m_editorState = new EditorState(m_pycron->m_vm, graphics);
     m_currentState = nullptr;
     RequestStateChange(GAME);
 }
@@ -14,6 +14,8 @@ StateManager::StateManager(Pycron *pycron) : m_pycron(pycron){
 StateManager::~StateManager() {
     m_currentState = nullptr;
     delete m_gameState;
+    delete m_editorState;
+    delete m_graphics;
 }
 
 
@@ -40,7 +42,7 @@ void StateManager::RequestStateChange(StateManager::StateType state) {
     }
 }
 
-void StateManager::Draw(Graphics *graphics) {
+void StateManager::Draw() {
 
     if(IsKeyPressed(KEY_ENTER)){
         if(m_currentState == m_gameState){
@@ -56,11 +58,11 @@ void StateManager::Draw(Graphics *graphics) {
                 m_pycron->m_graphics->Text(m_gameState->m_previousError, 2, 2, 59);
             }
             else{
-                m_currentState->Draw(graphics);
+                m_currentState->Draw();
             }
         }
         else{
-            m_currentState->Draw(graphics);
+            m_currentState->Draw();
         }
     }
 }

src/StateManager.h

@@ -22,10 +22,11 @@ private:
     Pycron* m_pycron;
     GameState* m_gameState;
     EditorState* m_editorState;
+    Graphics* m_graphics;
 
 
 public:
-    explicit StateManager(Pycron* pycron);
+    explicit StateManager(Pycron* pycron, Graphics* graphics);
     ~StateManager();
 
     void RequestStateChange(StateType state);
@@ -34,7 +35,7 @@ public:
     void RequestRunGame();
     void RequestStopGame();
 
-    void Draw(Graphics* graphics);
+    void Draw();
 
 };
 

src/States/EditorState.cpp

@@ -3,21 +3,28 @@
 //
 
 #include "EditorState.h"
+#include "../Graphics/PycronImage.h"
 
-EditorState::EditorState(pkpy::VM *vm) : m_vm(vm){
+EditorState::EditorState(pkpy::VM *vm, Graphics *graphics) : m_vm(vm), m_graphics(graphics){
-
+    test = m_graphics->loadImage("resources/plane2.png");
 }
 
-void EditorState::Draw(Graphics *graphics) {
+EditorState::~EditorState() {
-    graphics->Clear(1);
+    delete test;
+}
+
+void EditorState::Draw() {
+    m_graphics->Clear(1);
     std::string text = "Editor State";
-    graphics->Text(text, graphics->m_screenWidth / 2 - (text.size() / 2 * 6), graphics->m_screenHeight / 2 - (7 / 2), 5);
+    m_graphics->Text(text, m_graphics->m_screenWidth / 2 - (text.size() / 2 * 6), m_graphics->m_screenHeight / 2 - (7 / 2), 5);
     for (int y = 0; y < 128; ++y) {
         for (int x = 0; x < 128; ++x) {
             int c = x;
-            graphics->Pixel(x, y, graphics->rgbToID(x * 2, y * 2, graphics->mouseX()));
+            m_graphics->Pixel(x, y, m_graphics->rgbToID(x * 2, y * 2, m_graphics->mouseX()));
         }
     }
+    std::cout << test->width << "\n";
+    m_graphics->Img(test, m_graphics->mouseX() - (test->height / 2), m_graphics->mouseY() - (test->width / 2));
 }
 
 void EditorState::OnEnter() {

src/States/EditorState.h

@@ -1,18 +1,23 @@
 #pragma once
 #include "../State.h"
 
+class PycronImage;
+
 class EditorState : public State{
 
 public:
-    EditorState(pkpy::VM* vm);
+    EditorState(pkpy::VM* vm, Graphics* graphics);
+    ~EditorState();
 
-    void Draw(Graphics* graphics) override;
+    void Draw() override;
     void OnEnter() override;
     void OnExit() override;
     void onKeyPressed(int key) override;
 
 private:
     pkpy::VM* m_vm;
+    PycronImage* test;
+    Graphics* m_graphics;
 
 
 };

src/States/GameState.cpp

@@ -8,12 +8,12 @@
 #include <filesystem>
 #include "../Pycron.h"
 
-GameState::GameState(pkpy::VM* vm) :m_vm(vm){
+GameState::GameState(pkpy::VM* vm, Graphics* graphics) :m_vm(vm), m_graphics(graphics){
     m_updateFunction = nullptr;
     m_previousError = "";
 }
 
-void GameState::Draw(Graphics *graphics) {
+void GameState::Draw() {
         try{
             if(m_updateFunction != nullptr){
                 m_vm->call(m_updateFunction);

src/States/GameState.h

@@ -9,9 +9,9 @@ public:
     std::string m_previousError;
     bool m_errorThrown = false;
 
-    GameState(pkpy::VM* vm);
+    GameState(pkpy::VM* vm, Graphics* graphics);
 
-    void Draw(Graphics* graphics) override;
+    void Draw() override;
     void OnEnter() override;
     void OnExit() override;
     void onKeyPressed(int key) override;
@@ -20,7 +20,7 @@ private:
 
     pkpy::VM* m_vm;
     pkpy::PyObject* m_updateFunction;
-
+    Graphics* m_graphics;
 
     std::unordered_map<std::string, std::string> readPythonFiles(const std::string& dir);
     void loadPythonModules(std::unordered_map<std::string, std::string>& fileContents);