Merge remote-tracking branch 'cschool/master'

Author: Dovgalyuk

.gitignore

@@ -2,4 +2,5 @@ build-uno
 bin
 *.swp
 *.exe
-libgame/emulator/emulator
+*.o
+game/emulator/emulator

README.md

@@ -1,5 +1,5 @@
-# BackspaceInvaders
-Game for Arduino and LED display 64x64
+# libgame 
+Game library for Arduino and LED display 64x64
 
 This project uses Adafruit-like display:
 https://learn.adafruit.com/32x16-32x32-rgb-led-matrix
@@ -38,3 +38,6 @@ Therefore this is logically 128x32 display.
 Arduino shifts 128 pixels into display registers at every iteration.
 
 Demonstration of the working prototype: https://www.youtube.com/watch?v=gy7oADJboqM
+
+## Tutorial
+See game/Template.cpp

game/Dump.cpp

@@ -1,5 +1,6 @@
 #pragma GCC optimize ("-O3")
 
+#ifndef EMULATED
 #include "libgame.h"
 #include "font.h"
 #include <avr/eeprom.h>
@@ -79,3 +80,4 @@ game_instance Dump = {
     sizeof(DumpData),
     (void**)(&data)
 };
+#endif

game/avrfix.cpp

@@ -17,17 +17,18 @@
  * Version 1.0.1                                                *
  * Maximilan Rosenblattl, Andreas Wolf 2007-02-07               *
  ****************************************************************/
-#ifndef TEST_ON_PC
+#ifndef EMULATED 
 
 #include <avr/io.h>
 #include <avr/interrupt.h>
 /*#include <avr/signal.h>*/
 #include <avr/pgmspace.h>
+#else
+#include <stdint.h>
+#endif
 
 #include "avrfix.h"
 #include "avrfix_config.h"
-
-#endif
 #if BYTE_ORDER == BIG_ENDIAN
 typedef struct {
    unsigned short ll;

game/avrfix.h

@@ -22,12 +22,14 @@
 #define _AVRFIX_H
 
 
-#ifndef TEST_ON_PC
+#ifndef EMULATED 
 #include <avr/io.h>
 #include <avr/interrupt.h>
 /*#include <avr/signal.h>*/
 #include <avr/pgmspace.h>
 // #include "avrfix_config.h"
+#else
+#include <stdint.h>
 #endif
 
 /* Only two datatypes are used from the ISO/IEC standard:

game/emulator/Makefile

@@ -1,12 +1,16 @@
 CPP_FILES := $(wildcard ../*.cpp)
 OBJ_FILES := $(notdir $(CPP_FILES:.cpp=.o))
-CXXFLAGS := -DEMULATED -Wno-narrowing 
+CXXFLAGS := -I.. -DEMULATED -Wall -fexec-charset=windows-1251 -std=c++11
+LIBS := -lsfml-graphics -lsfml-window -lsfml-system
 
-emulator: main.cpp ../*.cpp ../*.h
-	$(CXX) -I.. -DEMULATED -Wall -fexec-charset=windows-1251 main.cpp ../*.cpp -lsfml-graphics -lsfml-window -lsfml-system -o emulator -std=c++11
+emulator: main.cpp ${OBJ_FILES}
+	$(CXX) $(CXXFLAGS) $^ $(LIBS) -o $@
+
+%.o: ../%.cpp
+	$(CXX) $(CXXFLAGS) $^ -c -o $@
 
 clean:
-	rm -f emulator*
+	rm -f emulator* ${OBJ_FILES}
 
 run: emulator
 	./emulator

game/emulator/Makefile-win32

@@ -1,12 +1,16 @@
 CPP_FILES := $(wildcard ../*.cpp)
 OBJ_FILES := $(notdir $(CPP_FILES:.cpp=.o))
-CXXFLAGS := -DEMULATED -Wno-narrowing 
+CXXFLAGS := -I.. -DEMULATED -Wall -fexec-charset=windows-1251 -mwindows -std=c++11
+LIBS := -lsfml-graphics -lsfml-window -lsfml-system
 
-emulator: main.cpp ../*.cpp
-	$(CXX) -I.. -DEMULATED -Wall -fexec-charset=windows-1251 main.cpp ../*.cpp -lsfml-graphics -lsfml-window -lsfml-system -mwindows -o emulator -std=c++11
+emulator: main.cpp ${OBJ_FILES}
+	$(CXX) $(CXXFLAGS) $^ $(LIBS) -o $@
+
+%.o: ../%.cpp
+	$(CXX) $(CXXFLAGS) $^ -c -o $@
 
 clean:
-	rm -f emulator*
+	rm -f emulator* ${OBJ_FILES}
 
 run: emulator
 	./emulator

game/emulator/main.cpp

@@ -51,20 +51,8 @@ unsigned long millis()
 void storage_init() {}
 void storage_format() {}
 
-uint8_t storage_open(const char *name, uint8_t mode) { return 0; }
-
-void storage_write_byte(uint8_t sd, uint8_t value) {}
-void storage_write_word(uint8_t sd, uint16_t value) {}
-void storage_write_dword(uint8_t sd, uint32_t value) {}
-size_t storage_write(uint8_t sd, void* buffer, size_t size) { return 0; }
-
-uint8_t storage_read_byte(uint8_t sd) { return 0; }
-uint16_t storage_read_word(uint8_t sd) { return 0; }
-uint32_t storage_read_dword(uint8_t sd) { return 0; }
-size_t storage_read(uint8_t sd, void* buffer, size_t size) { return 0; } 
-
-void storage_delete(uint8_t sd) {}
-void storage_close(uint8_t sd) {}
+void storage_read(const char *name, void *buffer, size_t size){};
+bool storage_write(const char *name, const void *buffer, size_t size){return 0;};
 
 uint8_t game_sprite_width(const struct game_sprite *s)
 {

game/games.h

@@ -6,8 +6,9 @@ extern game_instance BackspaceInvaders;
 extern game_instance Snake;
 extern game_instance Tester;
 extern game_instance Raycaster;
+#ifndef EMULATED /* for use only on real hardware */
 extern game_instance Dump;
-
+#endif
 /* Register your game like so:
  * 
  * extern game_instance YOUR_GAME_NAME;
@@ -20,7 +21,9 @@ game_instance instances[] = {
     Snake,
     Raycaster,
     Tester,
+#ifndef EMULATED /* for use only on real hardware */
     Dump,
+#endif
 
     /* Register your game like so:
      * 

game/libgame.h

@@ -18,6 +18,9 @@ using namespace std;
 #define pgm_read_byte(addr) (*(addr))
 #define pgm_read_word(addr) (*(addr))
 #define pgm_read_dword(addr) (*(addr))
+#define pgm_read_byte_near(addr) (*((uint8_t*)(addr)))
+#define pgm_read_word_near(addr) (*((uint16_t*)(addr)))
+#define pgm_read_dword_near(addr) (*((uint32_t*)(addr)))
 #define pgm_read_pointer(addr) (*(addr))
 #else
 #if !defined(__INT_MAX__) || (__INT_MAX__ > 0xFFFF)