Merge remote-tracking branch 'upstream/master'

Author: kometbomb

.circleci/config.yml

@@ -0,0 +1,78 @@
+version: 2
+jobs:
+  build:
+    docker:
+      - image: minextu/sdl2-cross-platform
+    steps:
+      - checkout
+      - run:
+          name: Init
+          command: |
+            echo 'export EXECNAME=${CIRCLE_PROJECT_REPONAME}' >> $BASH_ENV
+            echo 'export BASENAME=${CIRCLE_PROJECT_REPONAME}-$(git describe --tags --always | sed -e 's/^v//')' >> $BASH_ENV
+            mkdir artifacts
+      - run:
+          name: Build (Linux)
+          command: make linux OUTPUT=${EXECNAME}
+      - run:
+          name: Store binary
+          command: |
+            zip -r artifacts/${BASENAME}-linux.zip ${EXECNAME} assets
+            zip -j artifacts/${BASENAME}-linux.zip \
+              LICENSE
+            make -f Makefile.linux clean OUTPUT=${EXECNAME}
+      - run:
+          name: Build (Windows 32-bit)
+          command: |
+            PATH="/usr/i686-w64-mingw32/bin:$PATH"
+            make linux CC=i686-w64-mingw32-g++ GCC=i686-w64-mingw32-gcc OUTPUT=${EXECNAME}.exe
+      - run:
+          name: Store binary
+          command: |
+            zip -r artifacts/${BASENAME}-win32.zip ${EXECNAME}.exe assets
+            zip -j artifacts/${BASENAME}-win32.zip \
+              LICENSE \
+              /usr/i686-w64-mingw32/bin/SDL2.dll \
+              /usr/i686-w64-mingw32/bin/SDL2_image.dll \
+              /usr/i686-w64-mingw32/bin/libpng16-16.dll \
+              /usr/i686-w64-mingw32/bin/zlib1.dll
+            make -f Makefile.linux clean OUTPUT=${EXECNAME}.exe
+      - persist_to_workspace:
+          root: .
+          paths:
+              - artifacts
+  publish-github-release:
+    docker:
+      - image: cibuilds/github:0.10
+    steps:
+      - checkout
+      - attach_workspace:
+          at: .
+      - run:
+          name: "Publish Release on GitHub"
+          command: |
+            VERSION=$(git describe --tags --always)
+            ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -delete ${VERSION} ./artifacts/
+
+workflows:
+  version: 2
+  test:
+    jobs:
+      - build:
+          filters:
+            branches:
+              ignore: master
+            tags:
+              ignore: /.*/
+  build-and-release:
+    jobs:
+      - build:
+          filters: &release-filters
+            branches:
+              ignore: /.*/
+            tags:
+              only: /^v\d+\.\d+\.\d+$/
+      - publish-github-release:
+          requires:
+            - build
+          filters: *release-filters

Makefile.chip8

@@ -7,7 +7,9 @@ OUTPUT=prototracker-opll
 
 $(OUTPUT): $(CPP_SRC) $(CPP_H) $(C_OBJ)
 	g++ -Wformat -s -std=c++11 -o $@ $(CPP_SRC) $(C_OBJ) -lSDL2_image -lSDL2main `sdl2-config --cflags --libs` -march=armv7-a -mtune=cortex-a7 -ffast-math -Ofast -DSCALE=1 -DOVERSAMPLE=0 -DFULLSCREEN=1 -DSAMPLERATE=22050
-	
+
 $(C_OBJ): $(C_SRC) $(C_H)
 	gcc -c -o $@ $(C_SRC) -O3 -Wall -std=gnu99 -march=armv7-a -mtune=cortex-a7 -ffast-math -Ofast
 
+clean:
+	rm $(OUTPUT) $(C_OBJ)

Makefile.linux

@@ -1,7 +1,12 @@
 OUTPUT=prototracker-opll
+CC=g++
+GCC=gcc
 
 $(OUTPUT): $(CPP_SRC) $(CPP_H) $(C_OBJ)
-	g++ -O3 -Wformat -std=c++11 -o $@ $(CPP_SRC) $(C_OBJ) -lSDL2_image -lSDL2main `sdl2-config --cflags --libs` -s
-	
+	$(CC) -O3 -Wformat -std=c++11 -o $@ $(CPP_SRC) $(C_OBJ) -lSDL2_image -lSDL2main `sdl2-config --cflags --libs` -s -DSCALE=2
+
 $(C_OBJ): $(C_SRC) $(C_H)
-	gcc -c -o $@ $(C_SRC) -O3 -Wall -std=gnu99
+	$(GCC) -c -o $@ $(C_SRC) -O3 -Wall -std=gnu99
+
+clean:
+	rm $(OUTPUT) $(C_OBJ)

Makefile.mingw

@@ -5,3 +5,6 @@ $(OUTPUT): $(CPP_SRC) $(CPP_H) $(C_OBJ)
 
 $(C_OBJ): $(C_SRC) $(C_H)
 	gcc -c -o $@ $(C_SRC) -O3 -Wall -std=gnu99
+
+clean:
+	rm $(OUTPUT) $(C_OBJ)

assets/font.png

@@ -1,13 +1,13 @@
 #include "Emscripten.h"
 #include "SDL.h"
-#include "Context.h"
 #include <cstdlib>
 #include "App.h"
 
-
 #ifdef __EMSCRIPTEN__
 
-extern Context* _context;
+#include "Prototracker.h"
+
+extern Prototracker *g_prototracker;
 
 #include <emscripten.h>
 
@@ -130,7 +130,7 @@ void emNewSong()
 EMSCRIPTEN_KEEPALIVE
 const char * emRequestSong()
 {
-	return _context->mainEditor.getSongBase64().c_str();
+	return g_prototracker->getSongBase64().c_str();
 }
 
 

src/Context.h

@@ -5,6 +5,7 @@
 #include <cstdlib>
 #include <cstdio>
 #include <cstdint>
+#include <cmath>
 
 FileSection* FileSection::createSection(const char *name)
 {
@@ -171,6 +172,19 @@ unsigned int FileSection::readDword(int& offset) const
 }
 
 
+float FileSection::readFloat(int& offset) const
+{
+	if (offset < 0 || offset + sizeof(float) > mSize)
+		return NAN;
+
+	unsigned int returnValueRaw = read4bytes(&static_cast<char*>(mData)[offset]);
+
+	offset += sizeof(float);
+
+	return *reinterpret_cast<float*>(&returnValueRaw);
+}
+
+
 const char * FileSection::readString(int& offset) const
 {
 	for (int i = offset ; ; ++i)
@@ -210,6 +224,16 @@ void FileSection::writeDword(unsigned int dword)
 }
 
 
+void FileSection::writeFloat(float value)
+{
+	ensureAllocated(mSize + sizeof(unsigned int));
+
+	write4bytes(&static_cast<char*>(mData)[mSize], *reinterpret_cast<unsigned int*>(&value));
+
+	mSize += sizeof(unsigned int);
+}
+
+
 void FileSection::writeString(const char *str)
 {
 	int strSize = strlen(str) + 1;

src/Emscripten.cpp

@@ -10,8 +10,10 @@ class FileSection
 
 	/*
 	 * readByte() & readDword() return this if it failed
+	 *
+	 * NOTE: readFloat() returns NAN if it fails!
 	 */
-	static const int invalidRead = 0xffffffff;
+	static constexpr int invalidRead = 0xffffffff;
 
 private:
 	char mName[nameSize + 1];
@@ -47,12 +49,14 @@ class FileSection
 	unsigned int readByte(int& offset) const;
 	int readSignedByte(int& offset) const;
 	unsigned int readDword(int& offset) const;
+	float readFloat(int& offset) const;
 	const char * readString(int& offset) const;
 	FileSection * readSection(int& offset) const;
 	bool readPattern(Pattern& pattern, int effectParamCount, int& offset) const;
 
 	void writeByte(unsigned int byte);
 	void writeDword(unsigned int dword);
+	void writeFloat(float value);
 	void writeString(const char *str);
 	void writeSection(FileSection& section);
 	void writePattern(Pattern& pattern);