Lighting, fixed sky box, tracker, automated tests

.gitignore

@@ -5,3 +5,8 @@ build
 *.orig
 *.rej
 xcuserdata
+__pycache__
+*.pyc
+*.sublime-project
+*.sublime-workspace
+.vscode

.travis.yml

@@ -10,7 +10,7 @@ jobs:
       skip_cleanup: true
       script: bash deploy.bash linux    
       on:
-        branch: master
+        all_branches: true
   - stage: test
     os: osx
     before_install:
@@ -22,12 +22,13 @@ jobs:
       - sudo cp -R /Volumes/SDL2/SDL2.framework /Library/Frameworks/
     script:
       - make -j3 macapp SIGNING_ID=NONE
+      - make tests
     deploy:
       provider: script
       skip_cleanup: true
       script: bash deploy.bash mac
       on:
-        branch: master
+        all_branches: true
   - stage: test
     os: windows
     before_install:
@@ -39,8 +40,7 @@ jobs:
       skip_cleanup: true
       script: bash deploy.bash windows
       on:
-        branch: master
-    after_script: powershell -Command "Stop-Computer"
+        all_branches: true
 addons:
   apt:
     packages:
@@ -51,6 +51,8 @@ addons:
     - libegl1-mesa-dev
     - libgles2-mesa-dev
     - libsdl2-net-dev
+    - libdirectfb-dev
 script:
   - make -j3
+  - make tests
 

Makefile

@@ -4,12 +4,12 @@ CC = clang
 CXX = clang++
 
 BUILD_DIR ?= build
-SRC_DIRS ?= $(shell find src -type d -not -path src) vendor/glad vendor/nanovg vendor/nanogui
+SRC_DIRS ?= $(shell find src -type d -not -path src) vendor/glad vendor/nanovg vendor/nanogui vendor/pugixml vendor
 
 UNAME := $(shell uname)
 SRCS := $(shell find $(SRC_DIRS) -maxdepth 1 -name '*.cpp' -or -name '*.c')
 
-INCFLAGS := $(addprefix -I, $(SRC_DIRS)) -Ivendor
+INCFLAGS := $(addprefix -I, $(SRC_DIRS)) -Ivendor -Ivendor/gtest/include
 CPPFLAGS := ${CPPFLAGS}
 CPPFLAGS += $(INCFLAGS) -MMD -MP -g -Wno-multichar -DNANOGUI_GLAD
 CXXFLAGS := ${CXXFLAGS}
@@ -20,11 +20,11 @@ ifeq ($(UNAME), Darwin)
 	# MacOS
 	SRCS += $(shell find $(SRC_DIRS) -maxdepth 1 -name '*.mm')
 	CPPFLAGS += -F/Library/Frameworks
-	LDFLAGS += -F/Library/Frameworks -lstdc++ -lm -framework SDL2 -framework SDL2_net -framework OpenGL -framework AppKit
+	LDFLAGS += -F/Library/Frameworks -lstdc++ -lm -lpthread -framework SDL2 -framework SDL2_net -framework OpenGL -framework AppKit
 	POST_PROCESS ?= dsymutil
 else ifneq (,$(findstring NT-10.0,$(UNAME)))
 	# Windows - should match for MSYS2 on Win10
-	LDFLAGS += -lstdc++ -lm -lmingw32 -lSDL2main -lSDL2 -lSDL2_net -lglu32 -lopengl32 -lws2_32 -lcomdlg32
+	LDFLAGS += -lstdc++ -lm -lpthread -lmingw32 -lSDL2main -lSDL2 -lSDL2_net -lglu32 -lopengl32 -lws2_32 -lcomdlg32
 	POST_PROCESS ?= ls -lh
 else
 	# Linux
@@ -47,8 +47,12 @@ SIGNING_ID := Y56DGU8P8X
 
 avara: $(BUILD_DIR)/Avara resources
 
+tests: $(BUILD_DIR)/tests resources
+
 bspviewer: $(BUILD_DIR)/BSPViewer resources
 
+levelviewer: $(BUILD_DIR)/AvaraLevelViewer resources
+
 macapp: avara
 	rm -rf $(BUILD_DIR)/Avara.app
 	$(MKDIR_P) $(BUILD_DIR)/Avara.app/Contents/{Frameworks,MacOS,Resources}
@@ -76,11 +80,24 @@ $(BUILD_DIR)/Avara: $(OBJS) $(BUILD_DIR)/src/Avara.cpp.o
 	$(CXX) $(OBJS) $(BUILD_DIR)/src/Avara.cpp.o -o $@ $(LDFLAGS)
 	$(POST_PROCESS) $@
 
+# Tests
+$(BUILD_DIR)/tests: $(OBJS) $(BUILD_DIR)/src/tests.cpp.o $(BUILD_DIR)/vendor/gtest-all.cc.o
+	$(CXX) $(OBJS) $(BUILD_DIR)/vendor/gtest-all.cc.o $(BUILD_DIR)/src/tests.cpp.o -o $@ $(LDFLAGS)
+	$(POST_PROCESS) $@
+
+# Google test
+$(BUILD_DIR)/vendor/gtest-all.cc.o:
+	$(CXX) -isystem vendor/gtest/include/ -Ivendor/gtest/ -pthread -c vendor/gtest/src/gtest-all.cc -o $@
 # BSPViewer
 $(BUILD_DIR)/BSPViewer: $(OBJS) $(BUILD_DIR)/src/BSPViewer.cpp.o
 	$(CC) $(OBJS) $(BUILD_DIR)/src/BSPViewer.cpp.o -o $@ $(LDFLAGS)
 	$(POST_PROCESS) $@
 
+# LevelViewer
+$(BUILD_DIR)/AvaraLevelViewer: $(OBJS) $(BUILD_DIR)/src/AvaraLevelViewer.cpp.o
+	$(CXX) $(OBJS) $(BUILD_DIR)/src/AvaraLevelViewer.cpp.o -o $@ $(LDFLAGS)
+	$(POST_PROCESS) $@
+
 # c source
 $(BUILD_DIR)/%.c.o: %.c
 	$(MKDIR_P) $(dir $@)
@@ -101,10 +118,11 @@ $(BUILD_DIR)/%.mm.o: %.mm
 clean:
 	$(RM) -r $(BUILD_DIR)
 
-publish: 
+publish:
 	scp build/Avara-*.zip avaraline.net:/srv/http/avaraline/dev/builds/
 
 resources:
+	# python3 bin/pict2svg.py
 	cp -r bsps levels rsrc shaders $(BUILD_DIR)
 
 -include $(DEPS)

bin/Converter/bspt/datatypes.py

@@ -0,0 +1,134 @@
+from Converter.helpers import *
+
+
+UniquePointLength = 16
+
+
+class UniquePoint():
+    size = 16
+
+    def __init__(self, raw_data=None):
+        if raw_data is None:
+            self.x = 0
+            self.y = 0
+            self.z = 0
+            self.w = 0
+        else:
+            assert(len(raw_data) == UniquePointLength)
+            self.x = bytes_to_fixed(raw_data[0:4])
+            self.y = bytes_to_fixed(raw_data[4:8])
+            self.z = bytes_to_fixed(raw_data[8:12])
+            self.w = bytes_to_fixed(raw_data[12:16])
+
+    def __repr__(self):
+        tup = (self.x, self.y, self.z, self.w)
+        return "UniquePoint(%f %f %f %f)" % tup
+
+    def serialize(self):
+        return self.as_list_4()
+
+    def as_list_3(self):
+        return [self.x, self.y, self.z]
+
+    def as_list_4(self):
+        return [self.x, self.y, self.z, self.w]
+
+
+NormalRecordLength = 8
+
+
+class NormalRecord():
+    def __init__(self, raw_data):
+        assert(len(raw_data) == NormalRecordLength)
+        self.normal_index = bytes_to_unsigned_short(raw_data[0:2])
+        self.base_point_index = bytes_to_unsigned_short(raw_data[2:4])
+        self.color_index = bytes_to_unsigned_short(raw_data[4:6])
+        self.visibility_flags = bytes_to_unsigned_short(raw_data[6:8])
+
+    def __repr__(self):
+        tup = (self.normal_index, self.base_point_index, self.color_index, self.visibility_flags)
+        return "NormalRecord (%d %d %d %d)" % tup
+
+    def serialize(self):
+        return [
+            self.normal_index,
+            self.base_point_index,
+            self.color_index,
+            self.visibility_flags
+        ]
+
+
+EdgeRecordLength = 4
+
+
+class EdgeRecord():
+    def __init__(self, raw_data):
+        assert(len(raw_data) == EdgeRecordLength)
+        self.a = bytes_to_unsigned_short(raw_data[0:2])
+        self.b = bytes_to_unsigned_short(raw_data[2:4])
+
+    def __repr__(self):
+        tup = (self.a, self.b)
+        return "EdgeRecord (%d %d)" % tup
+
+    def serialize(self):
+        return [self.a, self.b]
+
+
+PolyRecordLength = 16
+
+
+class PolyRecord():
+    def __init__(self, raw_data):
+        assert(len(raw_data) == PolyRecordLength)
+        self.first_edge = bytes_to_unsigned_short(raw_data[0:2])
+        self.edge_count = bytes_to_unsigned_short(raw_data[2:4])
+        self.normal_index = bytes_to_unsigned_short(raw_data[4:6])
+        self.front_poly = bytes_to_unsigned_short(raw_data[6:8])
+        self.back_poly = bytes_to_unsigned_short(raw_data[8:10])
+        self.visibility = bytes_to_unsigned_short(raw_data[10:12])
+        self.reserved = bytes_to_unsigned_long(raw_data[12:16])
+
+    def __repr__(self):
+        tup = (self.first_edge, self.edge_count, self.normal_index, self.front_poly, self.back_poly, self.visibility)
+        return "PolyRecord (%d %d %d %d %d %d)" % tup
+
+    def serialize(self):
+        return [
+            self.first_edge,
+            self.edge_count,
+            self.normal_index,
+            self.front_poly,
+            self.back_poly,
+            self.visibility,
+            self.reserved
+        ]
+
+
+ColorRecordLength = (32 * 2) + 4
+
+
+class ColorRecord():
+    def __init__(self, raw_data):
+        assert(len(raw_data) == ColorRecordLength)
+        self.color_long = bytes_to_long(raw_data[0:4])
+        # convert to RGBA float color format
+        self.color = [
+            ((self.color_long >> 8) & 0xff) / 254.0,
+            ((self.color_long >> 16) & 0xff) / 254.0,
+            ((self.color_long >> 24) & 0xff) / 254.0,
+            (self.color_long & 0xff) / 254.0
+        ]
+        # colorCache[32] (COLORCACHESIZE)
+        # this is not useful to most people because
+        # it was used to store intermediate shades
+        # of a color when shading it with white light
+        self.color_cache = [bytes_to_unsigned_short(x)
+                            for x in chunks(raw_data[4:ColorRecordLength], 2)]
+
+    def __repr__(self):
+        tup = (self.color, self.color_cache)
+        return "ColorRecord (%s %s)" % tup
+
+    def serialize(self):
+        return self.color