Update nGL

- Use lcd_blit everywhere
- Use VECTOR3 type
- Remove unnecessary ';'
- Convert Makefile to unix line endings
- Add Makefile.pc and libndls.h stub to enable SDL port

Author: Vogtinator

Makefile

@@ -1,31 +1,31 @@
-GCC = nspire-gcc
-GPP = nspire-g++
-LD = nspire-ld
-GENZEHN = genzehn
-OPTIMIZE ?= fast
-GCCFLAGS = -O$(OPTIMIZE) -I nGL -I . -Wall -W -marm -ffast-math -mcpu=arm926ej-s -fno-math-errno -fomit-frame-pointer -flto -fno-rtti -fgcse-sm -fgcse-las -funsafe-loop-optimizations -fno-fat-lto-objects -frename-registers -fprefetch-loop-arrays -Wold-style-cast -mno-thumb-interwork -ffunction-sections -fdata-sections
-LDFLAGS = -lm -Wl,--gc-sections
-ZEHNFLAGS = --name "Crafti" --version 11 --author "Fabian Vogt" --notice "3D Minecraft" --compress
-EXE = crafti
-OBJS = $(patsubst %.c, %.o, $(shell find . -name \*.c))
-OBJS += $(patsubst %.cpp, %.o, $(shell find . -name \*.cpp))
-OBJS += $(patsubst %.S, %.o, $(shell find . -name \*.S))
-
-all: $(EXE).tns
-
-%.o: %.cpp
-	@echo Compiling $<...
-	@$(GPP) -std=c++11 $(GCCFLAGS) -c $< -o $@
-
-$(EXE).elf: $(OBJS)
-	+$(LD) $^ -o $@ $(GCCFLAGS) $(LDFLAGS)
-
-$(EXE).tns: $(EXE).elf
-	+$(GENZEHN) --input $^ --output $@.zehn $(ZEHNFLAGS)
-	+make-prg $@.zehn $@
-	+rm $@.zehn
-
-.PHONY: clean
-clean:
-	rm -f `find . -name \*.o`
-	rm -f $(EXE).tns $(EXE).elf
+GCC = nspire-gcc
+GPP = nspire-g++
+LD = nspire-ld
+GENZEHN = genzehn
+OPTIMIZE ?= fast
+GCCFLAGS = -g -O$(OPTIMIZE) -I nGL -I . -Wall -W -marm -ffast-math -mcpu=arm926ej-s -fno-math-errno -fomit-frame-pointer -flto -fno-rtti -fgcse-sm -fgcse-las -funsafe-loop-optimizations -fno-fat-lto-objects -frename-registers -fprefetch-loop-arrays -Wold-style-cast -mno-thumb-interwork -ffunction-sections -fdata-sections
+LDFLAGS = -g -lm -Wl,--gc-sections
+ZEHNFLAGS = --name "Crafti" --version 11 --author "Fabian Vogt" --notice "3D Minecraft" --compress
+EXE = crafti
+OBJS = $(patsubst %.c, %.o, $(shell find . -name \*.c))
+OBJS += $(patsubst %.cpp, %.o, $(shell find . -name \*.cpp))
+OBJS += $(patsubst %.S, %.o, $(shell find . -name \*.S))
+
+all: $(EXE).tns
+
+%.o: %.cpp
+	@echo Compiling $<...
+	@$(GPP) -std=c++11 $(GCCFLAGS) -c $< -o $@
+
+$(EXE).elf: $(OBJS)
+	+$(LD) $^ -o $@ $(GCCFLAGS) $(LDFLAGS)
+
+$(EXE).tns: $(EXE).elf
+	+$(GENZEHN) --input $^ --output $@.zehn $(ZEHNFLAGS)
+	+make-prg $@.zehn $@
+	+rm $@.zehn
+
+.PHONY: clean
+clean:
+	rm -f `find . -name \*.o`
+	rm -f $(EXE).tns $(EXE).elf

Makefile.pc

@@ -0,0 +1,24 @@
+GCC = gcc
+GPP = g++
+LD = g++
+OPTIMIZE ?= g
+GCCFLAGS = -g -O$(OPTIMIZE) -I nGL -I . -Wall -W -ffast-math -fno-math-errno -fomit-frame-pointer -flto -fno-rtti -fgcse-sm -fgcse-las -funsafe-loop-optimizations -fno-fat-lto-objects -frename-registers -fprefetch-loop-arrays -Wold-style-cast -ffunction-sections -fdata-sections
+LDFLAGS = -lm -lSDL -Wl,--gc-sections
+EXE = crafti
+OBJS = $(patsubst %.c, %.o, $(shell find . -name \*.c))
+OBJS += $(patsubst %.cpp, %.o, $(shell find . -name \*.cpp))
+OBJS += $(patsubst %.S, %.o, $(shell find . -name \*.S))
+
+all: $(EXE).elf
+
+%.o: %.cpp
+	@echo Compiling $<...
+	@$(GPP) -std=c++14 $(GCCFLAGS) -c $< -o $@
+
+$(EXE).elf: $(OBJS)
+	+$(LD) $^ -o $@ $(GCCFLAGS) $(LDFLAGS)
+
+.PHONY: clean
+clean:
+	rm -f `find . -name \*.o`
+	rm -f $(EXE).tns $(EXE).elf

aabb.h

@@ -17,7 +17,7 @@ class AABB
         NONE
     };
 
-    AABB() : AABB(0, 0, 0, 0, 0, 0) {};
+    AABB() : AABB(0, 0, 0, 0, 0, 0) {}
     AABB(VERTEX *v1, VERTEX *v2);
     AABB(GLFix low_x, GLFix low_y, GLFix low_z, GLFix high_x, GLFix high_y, GLFix high_z);
     AABB(VERTEX *list, unsigned int size);

blockrenderer.h

@@ -12,7 +12,7 @@
 class BlockRenderer
 {
 public:
-    virtual ~BlockRenderer() {};
+    virtual ~BlockRenderer() {}
 
     virtual void renderSpecialBlock(const BLOCK_WDATA block, GLFix x, GLFix y, GLFix z, Chunk &c) = 0;
     virtual void geometryNormalBlock(const BLOCK_WDATA block, const int x, const int y, const int z, const BLOCK_SIDE side, Chunk &c) = 0;
@@ -75,8 +75,8 @@ class UniversalBlockRenderer : public BlockRenderer
 
 class DumbBlockRenderer : public BlockRenderer
 {
-    virtual void renderSpecialBlock(const BLOCK_WDATA /*block*/, GLFix /*x*/, GLFix /*y*/, GLFix /*z*/, Chunk &/*c*/) override {};
-    virtual void geometryNormalBlock(const BLOCK_WDATA /*block*/, const int /*x*/, const int /*y*/, const int /*z*/, const BLOCK_SIDE /*side*/, Chunk &/*c*/) override {};
+    virtual void renderSpecialBlock(const BLOCK_WDATA /*block*/, GLFix /*x*/, GLFix /*y*/, GLFix /*z*/, Chunk &/*c*/) override {}
+    virtual void geometryNormalBlock(const BLOCK_WDATA /*block*/, const int /*x*/, const int /*y*/, const int /*z*/, const BLOCK_SIDE /*side*/, Chunk &/*c*/) override {}
     virtual bool isOpaque(const BLOCK_WDATA /*block*/) override { return true; }
     virtual bool isObstacle(const BLOCK_WDATA /*block*/) override { return false; }
     virtual bool isOriented(const BLOCK_WDATA /*block*/) override { return false; }

chunk.cpp

@@ -32,7 +32,7 @@ int Chunk::getPosition(int x, int y, int z)
     if(pos_indices[x][y][z] == -1)
     {
         pos_indices[x][y][z] = positions.size();
-        positions.emplace_back(Position{abs_x + x*BLOCK_SIZE, abs_y + y*BLOCK_SIZE, abs_z + z*BLOCK_SIZE});
+        positions.emplace_back(VECTOR3{abs_x + x*BLOCK_SIZE, abs_y + y*BLOCK_SIZE, abs_z + z*BLOCK_SIZE});
     }
 
     return pos_indices[x][y][z];
@@ -165,9 +165,9 @@ void Chunk::buildGeometry()
 
 #define MAKE_VERTEX(pos, iver) { (pos).x, (pos).y, (pos).z, iver.u, iver.v, iver.c }
 
-VERTEX Chunk::perspective(const IndexedVertex &v, Position &transformed)
+VERTEX Chunk::perspective(const IndexedVertex &v, VECTOR3 &transformed)
 {
-    std::pair<Position, bool> &p = positions_perspective[v.pos];
+    std::pair<VECTOR3, bool> &p = positions_perspective[v.pos];
     if(!p.second)
     {
         VERTEX ver = MAKE_VERTEX(transformed, v);
@@ -183,7 +183,7 @@ VERTEX Chunk::perspective(const IndexedVertex &v, Position &transformed)
 
 bool Chunk::drawTriangle(const IndexedVertex &low, const IndexedVertex &middle, const IndexedVertex &high, bool backface_culling)
 {
-    Position pos_low = positions_transformed[low.pos], pos_middle = positions_transformed[middle.pos], pos_high = positions_transformed[high.pos];
+    VECTOR3 pos_low = positions_transformed[low.pos], pos_middle = positions_transformed[middle.pos], pos_high = positions_transformed[high.pos];
 
 #ifndef Z_CLIPPING
     if(pos_low.z < GLFix(CLIP_PLANE) || pos_middle.z < GLFix(CLIP_PLANE) || pos_high.z < GLFix(CLIP_PLANE))
@@ -201,7 +201,7 @@ bool Chunk::drawTriangle(const IndexedVertex &low, const IndexedVertex &middle,
 
     VERTEX invisible[3];
     IndexedVertex visible[3];
-    Position *pos_visible[3];
+    VECTOR3 *pos_visible[3];
     int count_invisible = -1, count_visible = -1;
 
     if(pos_low.z < GLFix(CLIP_PLANE))
@@ -374,15 +374,10 @@ void Chunk::render()
             && v13.y >= SCREEN_HEIGHT && v14.y >= SCREEN_HEIGHT && v15.y >= SCREEN_HEIGHT && v16.y >= SCREEN_HEIGHT)
         return;
 
-    std::fill(positions_perspective.begin(), positions_perspective.end(), std::make_pair<Position, bool>({0, 0, 0}, false));
+    std::fill(positions_perspective.begin(), positions_perspective.end(), std::make_pair<VECTOR3, bool>({0, 0, 0}, false));
 
     for(unsigned int i = 0; i < positions.size(); i++)
-    {
-        Position &position = positions[i];
-        VERTEX t1{position.x, position.y, position.z, 0, 0, 0}, t2;
-        nglMultMatVectRes(transformation, &t1, &t2);
-        positions_transformed[i] = {t2.x, t2.y, t2.z};
-    }
+        nglMultMatVectRes(transformation, &positions[i], &positions_transformed[i]);
 
     nglForceColor(true);
     const IndexedVertex *v = vertices_color.data();
@@ -416,9 +411,9 @@ void Chunk::render()
     const VERTEX *ve = vertices_unaligned.data();
     for(unsigned int i = 0; i < vertices_unaligned.size(); i += 4, ve += 4)
     {
-        nglMultMatVectRes(transformation, ve + 0, &v1);
-        nglMultMatVectRes(transformation, ve + 1, &v2);
-        nglMultMatVectRes(transformation, ve + 2, &v3);
+        nglMultMatVectRes(transformation, &ve[0], &v1);
+        nglMultMatVectRes(transformation, &ve[1], &v2);
+        nglMultMatVectRes(transformation, &ve[2], &v3);
 
         //nglMultMatVectRes doesn't copy u,v and c
         v1.u = ve[0].u;
@@ -433,7 +428,7 @@ void Chunk::render()
 
         if(nglDrawTriangle(&v1, &v2, &v3, (v1.c & TEXTURE_DRAW_BACKFACE) == 0))
         {
-            nglMultMatVectRes(transformation, ve + 3, &v4);
+            nglMultMatVectRes(transformation, &ve[3], &v4);
             v4.u = ve[3].u;
             v4.v = ve[3].v;
             v4.c = ve[3].c;
@@ -557,7 +552,7 @@ bool Chunk::intersects(AABB &other)
     return false;
 }
 
-bool Chunk::intersectsRay(GLFix rx, GLFix ry, GLFix rz, GLFix dx, GLFix dy, GLFix dz, GLFix &dist, Position &pos, AABB::SIDE &side, bool ignore_water)
+bool Chunk::intersectsRay(GLFix rx, GLFix ry, GLFix rz, GLFix dx, GLFix dy, GLFix dz, GLFix &dist, VECTOR3 &pos, AABB::SIDE &side, bool ignore_water)
 {
     GLFix shortest_dist;
     if(aabb.intersectsRay(rx, ry, rz, dx, dy, dz, shortest_dist) == AABB::NONE)
@@ -787,9 +782,13 @@ void drawLoadingtext(const int i)
 
     shown = true;
 
-    TEXTURE screen;
-    screen.width = SCREEN_WIDTH;
-    screen.height = SCREEN_HEIGHT;
-    screen.bitmap = reinterpret_cast<COLOR*>(SCREEN_BASE_ADDRESS);
-    drawTexture(loadingtext, screen, 0, 0, loadingtext.width, loadingtext.height, (SCREEN_WIDTH - loadingtext.width) / 2, 0, loadingtext.width, loadingtext.height);
+    if(lcd_type() != SCR_320x240_565 && lcd_type() != SCR_320x240_4)
+        return;
+    #ifdef _TINSPIRE
+        TEXTURE screen;
+        screen.width = SCREEN_WIDTH;
+        screen.height = SCREEN_HEIGHT;
+        screen.bitmap = reinterpret_cast<COLOR*>(REAL_SCREEN_BASE_ADDRESS);
+        drawTexture(loadingtext, screen, 0, 0, loadingtext.width, loadingtext.height, (SCREEN_WIDTH - loadingtext.width) / 2, 0, loadingtext.width, loadingtext.height);
+    #endif
 }

chunk.h

@@ -11,10 +11,6 @@
 
 class World;
 
-struct Position {
-    GLFix x, y, z;
-};
-
 struct IndexedVertex {
     int pos;
     GLFix u, v;
@@ -37,7 +33,7 @@ class Chunk
     void setGlobalBlockRelative(const int x, const int y, const int z, const BLOCK_WDATA block, bool set_dirty = true);
     AABB &getAABB() { return aabb; }
     bool intersects(AABB &other);
-    bool intersectsRay(GLFix x, GLFix y, GLFix z, GLFix dx, GLFix dy, GLFix dz, GLFix &dist, Position &pos, AABB::SIDE &side, bool ignore_water);
+    bool intersectsRay(GLFix x, GLFix y, GLFix z, GLFix dx, GLFix dy, GLFix dz, GLFix &dist, VECTOR3 &pos, AABB::SIDE &side, bool ignore_water);
     void generate();
     bool saveToFile(FILE *file);
     bool loadFromFile(FILE *file);
@@ -80,7 +76,7 @@ class Chunk
     //Rendering
     void geometrySpecialBlock(BLOCK_WDATA block, unsigned int x, unsigned int y, unsigned int z, BLOCK_SIDE side);
     void buildGeometry();
-    VERTEX perspective(const IndexedVertex &v, Position &transformed);
+    VERTEX perspective(const IndexedVertex &v, VECTOR3 &transformed);
     bool drawTriangle(const IndexedVertex &low, const IndexedVertex &middle, const IndexedVertex &high, bool backface_culling = true);
 
     //Data
@@ -92,8 +88,8 @@ class Chunk
     bool render_dirty = true;
     int pos_indices[SIZE + 1][SIZE + 1][SIZE + 1];
     BLOCK_SIDE_BITFIELD sides_rendered[SIZE][SIZE][SIZE] = {}; //It could be that other chunks already rendered parts of our blocks
-    std::vector<Position> positions, positions_transformed;
-    std::vector<std::pair<Position, bool>> positions_perspective;
+    std::vector<VECTOR3> positions, positions_transformed;
+    std::vector<std::pair<VECTOR3, bool>> positions_perspective;
     std::vector<IndexedVertex> vertices, vertices_quad, vertices_color;
     std::vector<VERTEX> vertices_unaligned; //The optimized drawing with indices doesn't work with unaligned positions
     int tick_counter = 1; //1 to trigger a tick the next frame