Use resource packs

.gitignore

@@ -2,5 +2,5 @@ awoorwa
 awoorwae
 *.exe
 *.o
-*.pack
-*.spr
+*.pgp
+*.pgs

Makefile

@@ -2,12 +2,14 @@
 
 CPPFLAGS=-Wall -Wno-misleading-indentation -Werror --std=c++1z
 LDFLAGS=
-INCLUDES=-Ipge/include
+INCLUDES=-Iinclude -Ipge/include
 ifeq ($(OS),Windows_NT)
 	LIBRARIES=-luser32 -lgdi32 -lopengl32 -lgdiplus -lwinmm
 	EXECUTABLE=awoorwae.exe
 	PACKER=packer/packer.exe
+ifneq ($(DEBUG),1)
 	LDFLAGS+=--machine=windows
+endif
 	CPP=i686-w64-mingw32-g++
 	CC=i686-w64-mingw32-gcc
 	MAKE=mingw32-make
@@ -27,12 +29,15 @@ SOURCES=$(wildcard src/*.cpp) $(wildcard src/**/*.cpp) $(wildcard pge/src/*.cpp)
 IMAGES=$(wildcard res/*.png)
 
 OBJECTS=$(SOURCES:.cpp=.o)
-SPRITES=$(IMAGES:.png=.spr)
+SPRITES=$(IMAGES:.png=.pgs)
+RESOURCES=$(SPRITES) $(wildcard res/*.wav)
+
+PACK=awoorwae.pgp
 
-all: $(SOURCES) $(SPRITES) $(EXECUTABLE)
+all: $(SOURCES) $(PACK) $(EXECUTABLE)
 
 clean: 
-	$(RM) $(OBJECTS) $(SPRITES) $(EXECUTABLE)
+	$(RM) $(OBJECTS) $(SPRITES) $(PACK) $(EXECUTABLE)
 	
 $(EXECUTABLE): $(OBJECTS)
 	$(CPP) $(LDFLAGS) $(OBJECTS) -o $@ $(LIBRARIES)
@@ -40,10 +45,13 @@ $(EXECUTABLE): $(OBJECTS)
 .cpp.o:
 	$(CPP) $(INCLUDES) -c $(CPPFLAGS) $< -o $@
 
-%.spr: %.png $(PACKER)
+%.pgs: %.png $(PACKER)
 	$(PACKER) --convert $< $@
 
-run: $(SPRITES) $(EXECUTABLE)
+$(PACK): $(RESOURCES) $(PACKER)
+	$(PACKER) --add $(PACK) $(RESOURCES)
+
+run: $(PACK) $(EXECUTABLE)
 	./$(EXECUTABLE)
 
 $(PACKER):

include/awoorwae.h

@@ -0,0 +1,31 @@
+#ifndef AWOORWAE_H
+#define AWOORWAE_H
+
+#include "olcPixelGameEngine.h"
+#include "player.h"
+
+namespace pabloader {
+class Awoorwae : public olc::PixelGameEngine {
+private:
+    Player* player;
+
+public:
+    Awoorwae()
+    {
+        sAppName = "Awoorwa";
+        player = new Player(this);
+    }
+
+    ~Awoorwae()
+    {
+        delete player;
+    }
+
+public:
+    bool OnUserCreate() override;
+    bool OnUserUpdate(float fElapsedTime) override;
+    olc::ResourcePack pack;
+};
+}
+
+#endif

include/entity.h

@@ -0,0 +1,33 @@
+#ifndef ENTITY_H
+#define ENTITY_H
+
+#include "olcPGEX_Graphics2D.h"
+#include "olcPixelGameEngine.h"
+
+namespace pabloader {    
+class Awoorwae;
+
+class Entity {
+protected:
+    Awoorwae* game;
+    olc::Sprite img;
+    olc::GFX2D::Transform2D transform;
+    float x, y;
+    float xv, yv;
+    int w, h;
+    int tile = 0;
+    int skin = 0;
+    int tileCounter = 0;
+    bool onGround = false;
+
+public:
+    Entity(Awoorwae* game_);
+    virtual ~Entity(){};
+
+    virtual olc::rcode Load() = 0;
+    virtual void Update(float dt) = 0;
+    virtual void Draw() = 0;
+};
+}
+
+#endif

include/player.h

@@ -0,0 +1,19 @@
+#ifndef PLAYER_H
+#define PLAYER_H
+
+#include "entity.h"
+#include "olcPGE_Common.h"
+
+namespace pabloader {
+
+class Player : public Entity {
+public:
+    Player(Awoorwae* game);
+    olc::rcode Load() override;
+    void Update(float dt) override;
+    void Draw() override;
+};
+
+}
+
+#endif

pge/src/olcPGE_Sprite.cpp

@@ -61,13 +61,16 @@ namespace olc {
 		else
 		{
 			auto streamBuffer = pack->GetStreamBuffer(sImageFile);
+			if (streamBuffer.data == nullptr) 
+				return olc::FAIL;
+				
 			std::istream is(&streamBuffer);
 			ReadData(is);
+			return olc::OK;
 		}
 
-
 		return olc::FAIL;
-		}
+	}
 
 	olc::rcode Sprite::SaveToPGESprFile(std::string sImageFile)
 	{

src/awoorwae.cpp

@@ -0,0 +1,31 @@
+#include "awoorwae.h"
+#include <cmath>
+#include <string>
+#include <iostream>
+
+namespace pabloader {
+
+bool Awoorwae::OnUserCreate()
+{
+    if (!pack.LoadPack("awoorwae.pgp")) {
+        std::cerr << "Cannot load resource pack res/awoorwae.pgp" << std::endl;
+        return false;
+    }
+    if (!player->Load())
+        return false;
+
+    SetPixelMode(olc::Pixel::MASK);
+
+    pack.ClearPack();
+    return true;
+}
+
+bool Awoorwae::OnUserUpdate(float fElapsedTime)
+{
+    Clear(olc::VERY_DARK_CYAN);
+
+    player->Update(fElapsedTime);
+    player->Draw();
+    return true;
+}
+}

src/entity.cpp

@@ -0,0 +1,10 @@
+#include "entity.h"
+
+namespace pabloader {
+Entity::Entity(Awoorwae* game_)
+    : game(game_)
+{
+    xv = 0;
+    yv = 0;
+}
+}

src/main.cpp

@@ -1,4 +1,4 @@
-#include "pabloader/awoorwae.h"
+#include "awoorwae.h"
 
 int main()
 {

src/pabloader/awoorwae.h

@@ -1,60 +0,0 @@
-#include "olcPGEX_Graphics2D.h"
-#include "olcPGEX_Sound.h"
-#include "olcPixelGameEngine.h"
-#include <cstdint>
-#include <iostream>
-
-namespace pabloader {
-class Awoorwae;
-
-class Entity {
-protected:
-    Awoorwae* game;
-    olc::Sprite img;
-    olc::GFX2D::Transform2D transform;
-    float x, y;
-    float xv, yv;
-    int w, h;
-    int tile = 0;
-    int skin = 0;
-    int tileCounter = 0;
-    bool onGround = false;
-
-public:
-    Entity(Awoorwae* game_);
-    virtual ~Entity(){};
-
-    virtual olc::rcode Load() = 0;
-    virtual void Update(float dt) = 0;
-    virtual void Draw() = 0;
-};
-
-class Player : public Entity {
-public:
-    Player(Awoorwae* game);
-    olc::rcode Load() override;
-    void Update(float dt) override;
-    void Draw() override;
-};
-
-class Awoorwae : public olc::PixelGameEngine {
-private:
-    Player* player;
-
-public:
-    Awoorwae()
-    {
-        sAppName = "Awoorwa";
-        player = new Player(this);
-    }
-
-    ~Awoorwae()
-    {
-        delete player;
-    }
-
-public:
-    bool OnUserCreate() override;
-    bool OnUserUpdate(float fElapsedTime) override;
-};
-}

src/pabloader/awoorwae.cpp → src/player.cpp

@@ -1,36 +1,8 @@
+#include "player.h"
 #include "awoorwae.h"
-#include <cmath>
-#include <string>
+#include <iostream>
 
 namespace pabloader {
-
-bool Awoorwae::OnUserCreate()
-{
-    if (!player->Load()) {
-        std::cerr << "Could not load awoorwa.spr" << std::endl;
-        return false;
-    }
-
-    SetPixelMode(olc::Pixel::MASK);
-
-    return true;
-}
-
-bool Awoorwae::OnUserUpdate(float fElapsedTime)
-{
-    Clear(olc::VERY_DARK_CYAN);
-
-    player->Update(fElapsedTime);
-    player->Draw();
-    return true;
-}
-
-Entity::Entity(Awoorwae* game_)
-    : game(game_)
-{
-    xv = 0;
-    yv = 0;}
-
 Player::Player(Awoorwae* game_)
     : Entity(game_)
 {
@@ -38,13 +10,16 @@ Player::Player(Awoorwae* game_)
 
 olc::rcode Player::Load()
 {
-    olc::rcode result = img.LoadFromPGESprFile("res/awoorwa.spr");
+    const std::string fileName = "res/player.pgs";
+    olc::rcode result = img.LoadFromPGESprFile(fileName, &game->pack);
     if (result) {
         w = img.width / 4;
         h = img.height / 4;
+        x = (game->ScreenWidth() - w) / 2;
+        y = game->ScreenHeight() / 2;
+    } else {
+        std::cerr << "File " << fileName << " is not found" << std::endl;
     }
-    x = (game->ScreenWidth() - w) / 2;
-    y = game->ScreenHeight() / 2;
     return result;
 }
 
@@ -132,7 +107,7 @@ void Player::Update(float dt)
 
 void Player::Draw()
 {
-    float xOff = xv < 0 ? -1: 0;
+    int xOff = xv < 0 ? -1 : 0;
     if (std::abs(xv) < 1) {
         olc::GFX2D::DrawPartialSprite(&img, skin * w + xOff, h + tile * h, w, h, transform, true);
     } else {