Alpha 1.1 (#13)

Alpha 1.1

.gitignore

@@ -2,4 +2,5 @@ log.txt
 test_log.txt
 Spylike-v*
 lib/bin
-lib/include
+lib/include
+build/*

Makefile

@@ -1,8 +1,10 @@
 CXX=g++
 CPPFLAGS=-std=c++2a -Iinclude -Igame/include -Ilib/include -DMA_NO_PULSEAUDIO
-LDLIBS=
-OBJS=graphics/*.cpp logging/*.cpp models/*.cpp level/*.cpp audio/*.cpp game/*.cpp game/entities/*.cpp game/UI/*.cpp util/*.cpp main.cpp
+LDLIBS=-Llib/bin
+SOURCES=$(wildcard graphics/*.cpp logging/*.cpp models/*.cpp level/*.cpp audio/*.cpp game/*.cpp game/entities/*.cpp game/UI/*.cpp util/*.cpp main.cpp)
+OBJS=$(patsubst %.cpp, build/%.o, $(SOURCES))
 VER=vA1
+USE_DISCORD=1
 
 ifndef PDCURSES_BACKEND
 	ifeq ($(OS),Windows_NT)
@@ -12,6 +14,7 @@ ifndef PDCURSES_BACKEND
 		ifeq ($(UNAME_S),Linux)
 			ifndef USE_NCURSES
 				USE_NCURSES=1
+				CPPFLAGS+= -DUSE_NCURSESW
 			endif
 			PDCURSES_BACKEND=x11
 			LDLIBS+= -lpthread -lm -ldl
@@ -22,21 +25,46 @@ endif
 ifeq ($(USE_NCURSES), 1)
 	LDLIBS+= -lncursesw
 else
-	LDLIBS+= -Llib/bin -lpdcurses
+	LDLIBS+= -lpdcurses
 endif
 
 ifndef PDCURSES_BACKEND
 	$(error  "OS not detected or supported - please specify PDCurses backend (wincon, x11, sdl2))
 endif
 
+ifeq ($(USE_DISCORD), 1)
+    $(shell mkdir -p lib/bin)
+    $(shell mkdir -p lib/include)
+    ifeq ($(UNAME_S),Linux)
+        $(shell cp -u lib/discord-rpc-linux/linux-dynamic/include/*.h lib/include)
+        $(shell cp -u lib/discord-rpc-linux/linux-dynamic/lib/libdiscord-rpc.so lib/bin)
+        LDLIBS+= -ldiscord-rpc
+        CPPFLAGS+= -DUSE_DISCORD
+    else
+        USE_DISCORD=0
+    endif
+endif
+
+$(shell mkdir -p lib/include)
+$(shell cp lib/miniaudio/miniaudio.h lib/include/miniaudio.h)
+
 build: build-pdcurses
 build: $(OBJS)
-	cp lib/miniaudio/miniaudio.h lib/include/miniaudio.h
-	$(CXX) $(CPPFLAGS) -o Spylike-$(VER) $(OBJS) $(LDLIBS)
+	$(CXX) $(CPPFLAGS) -o Spylike-$(VER) $(OBJS) $(LDLIBS) -Wl,-rpath=lib/bin
+
+build/%.o: %.cpp
+	mkdir -p $(@D)
+	$(CXX) $(CPPFLAGS) -c -o $@ $(LDLIBS) $^
 
-debug: CPPFLAGS+= -g -O0
+debug: CPPFLAGS+= -g -O0 -v
 debug: build
 
+clean:
+	rm -rf lib/bin/*
+	rm -rf lib/include/*
+	rm -rf build/*
+	rm -rf lib/src/*
+
 build-pdcurses:
 	cd lib && mkdir -p bin
 	cd lib && mkdir -p include

events.txt

@@ -8,7 +8,11 @@ CAMERA_MoveUp: Moves the camera up by one unit. (CameraEvent)
 CAMERA_MoveDown: Moves the camera down by one unit. (CameraEvent)
 CAMERA_MoveRight: Moves the camera right by one unit. (CameraEvent)
 CAMERA_MoveLeft: Moves the camera left by one unit. (CameraEvent)
-CAMERA_Move: Moves the camera to pos specified in CameraEvent.pos.
+CAMERA_Move: Moves the camera origin to pos specified in CameraEvent.pos.
+CAMERA_MoveCenter: Centers the camera at pos specified in CameraEvent.pos.
+CAMERA_MoveCenterH: Centers the camera horizontally at pos specified in CameraEvent.pos, ignoring y
+CAMERA_MoveCenterX: Centers the camera vertically at pos specified in CameraEvent.pos, ignoring x
+
 
 Audio:
 AUDIO_PlayMusic: Plays the music with filepath [rootPath]/AudioPlayEvent.sound and volume AudioPlayEvent.volume
@@ -24,4 +28,4 @@ MENU_ButtonClick: Calls when any button is clicked, ID given in MenuButtonEvent.
 LEVEL_change: Changes the level to LevelChangeEvent.levelPath
 GAME_KeyCollect: The key for the final boss door was collected.
 GAME_DoorRequest: Event for the door to check whether it can be opened.
-GAME_DoorResponse: Response from the game manager about GAME_DoorRequest, result in bool DoorResponse.result.
+GAME_DoorResponse: Response from the game manager about GAME_DoorRequest, result in bool DoorResponse.result.

game/UI/menus.cpp

@@ -16,7 +16,7 @@ void MenuButton::click() {
 	eventManager->emit(ev);
 }
 
-void MenuButton::draw(GeometryRenderer& painter) {
+void MenuButton::draw(TextRenderManager& painter) {
 	std::string drawnText = text;
 	// note that subtracting 2 from width may cause integer overflow(???) so we have to do it this way
 	if (((text.length() + 2) > width) || (height < 3)) {
@@ -43,7 +43,7 @@ void MenuButton::on_event(Event& e) {}
 
 void MenuButton::on_update() {}
 
-void Menu::draw(GeometryRenderer& painter) {
+void Menu::draw(TextRenderManager& painter) {
 	Coordinate selectionPos = buttons.find(currentSelection)->second.pos;
 	Coordinate arrowPos = Coordinate(selectionPos.x + buttons.find(currentSelection)->second.width/2, selectionPos.y - 1);
 	painter.draw(arrowPos, 'v', "UI");
@@ -53,7 +53,7 @@ void Menu::draw(GeometryRenderer& painter) {
 	}
 }
 
-void PauseMenu::draw(GeometryRenderer& painter) {
+void PauseMenu::draw(TextRenderManager& painter) {
 	/*
 	painter.drawString(Coordinate(1, 1), ""
  "|||\n"
@@ -68,12 +68,12 @@ void PauseMenu::draw(GeometryRenderer& painter) {
 	Menu::draw(painter);
 }
 
-void GameOverMenu::draw(GeometryRenderer& painter) {
+void GameOverMenu::draw(TextRenderManager& painter) {
 	painter.drawString(Coordinate(painter.getScreenWidth()/2-8, 1), "GAME OVER!", "UI");
 	Menu::draw(painter);
 }
 
-void StartMenu::draw(GeometryRenderer& painter) {
+void StartMenu::draw(TextRenderManager& painter) {
 	painter.drawString(Coordinate(painter.getScreenWidth()/2-12, 1), "WELCOME TO SPYLIKE!", "UI");	
 	painter.drawString(Coordinate(painter.getScreenWidth()/2-7, 2), "CONTROLS:", "UI");
 	painter.drawString(Coordinate(painter.getScreenWidth()/2-10, 3), "W,A,S,D MOVEMENT", "UI");