Merge branch 'p8sciiCtrl'

Author: jtothebell

source/PicoRam.h

@@ -218,8 +218,14 @@ struct hwState_t {
     uint8_t mapMemMapping;
     //0x5f57
     uint8_t widthOfTheMap;
-    //0x5f58..0x5f5b
-    uint8_t printAttributes[4];
+    //0x5f58
+    uint8_t printAttributes;
+    //0x5f59
+    uint8_t printCharDimensions;
+    //0x5f5a
+    uint8_t printTabWidth;
+    //0x5f5b
+    uint8_t printOffsetDimensions;
     //0x5f5c
     uint8_t btnpRepeatDelay;
     //0x5f5d

source/graphics.cpp

@@ -204,7 +204,10 @@ void Graphics::copyStretchSpriteToScreen(
 	int scr_w,
 	int scr_h,
 	bool flip_x,
-	bool flip_y) 
+	bool flip_y,
+	//skipStretchPx is currently only used for drawing stripey mode text,
+	//so it is only used when drawing in non-flipped mode
+	bool skipStretchPx)
 {
 	if (scr_w == 0 || scr_h == 0)
 		return;
@@ -287,18 +290,31 @@ void Graphics::copyStretchSpriteToScreen(
 		dy = -dy;
 	}
 
+	int prevSprX = -1;
+	int prevSprY = -1;
+
 	//ugly duplication but see if inlining helps
 	if (hwState.colorBitmask == 0xff){
 		for (int y = 0; y < scr_h; y++) {
-			uint8_t* spr = spritebuffer + (((spr_y + y * dy) >> 16) & 0x7f) * 64;
+			int sprY = ((spr_y + y * dy) >> 16);
+			uint8_t* spr = spritebuffer + (sprY & 0x7f) * 64;
+
+			if (skipStretchPx && prevSprY == sprY){
+				continue;
+			}
+			prevSprY = sprY;
 
 			if (!flip_x) {
 				for (int x = 0; x < scr_w; x++) {
-					int pixIndex = (spr_x + x * dx);
-					int combinedPixIdx = ((pixIndex / 2) >> 16) & 0x7f;
-					uint8_t bothPix = spr[combinedPixIdx];
+					int shiftedPixIndex = (spr_x + x * dx) >> 16;
+					if (skipStretchPx && prevSprX == shiftedPixIndex){
+						continue;
+					}
+					prevSprX = shiftedPixIndex;
+					int preShiftedCombinedPixIndex = (shiftedPixIndex / 2) & 0x7f;
+					uint8_t bothPix = spr[preShiftedCombinedPixIndex];
 
-					uint8_t c = (pixIndex >> 16) % 2 == 0 
+					uint8_t c = shiftedPixIndex % 2 == 0 
 						? bothPix & 0x0f //just first 4 bits
 						: bothPix >> 4;  //just last 4 bits
 
@@ -1247,61 +1263,49 @@ fix32 Graphics::fillp(fix32 pat) {
 	return z8::fix32::frombits(prev);
 }
 
-int Graphics::print(std::string str) {
-	int result = this->print(str, _memory->drawState.text_x, _memory->drawState.text_y);
-
-	return result;
-}
-
-int Graphics::print(std::string str, int x, int y) {
-	return this->print(str, x, y, _memory->drawState.color);
-}
 
-//based on tac08 impl
-int Graphics::print(std::string str, int x, int y, uint8_t c) {
-	color(c);
+int Graphics::drawCharacter(uint8_t ch, int x, int y, uint8_t printMode) {
+	int extraCharWidth = 0;
+	if ((printMode & PRINT_MODE_ON) == PRINT_MODE_ON){
+		int scrW = 4;
+		int scrH = 5;
+		bool evenPxOnly = false;
 
-	_memory->drawState.text_x = x;
-	_memory->drawState.text_y = y;
+		if ((printMode & PRINT_MODE_WIDE) == PRINT_MODE_WIDE) {
+			scrW *= 2;
+		}
+		if((printMode & PRINT_MODE_TALL) == PRINT_MODE_TALL) {
+			scrH *= 2;
+		}
+		if((printMode & PRINT_MODE_STRIPEY) == PRINT_MODE_STRIPEY) {
+			//draw every other pixel-- also kinda broken on pico 8 0.2.4 
+			evenPxOnly = true;
+		}
+		//TODO: other print modes
 
-	uint8_t effectiveC = getDrawPalMappedColor(c);
+		if (ch >= 0x10 && ch < 0x80) {
+			int index = ch - 0x10;
+			copyStretchSpriteToScreen(fontSpriteData, (index % 16) * 8, (index / 16) * 8, 4, 5, x, y, scrW, scrH, false, false, evenPxOnly);
+		} else if (ch >= 0x80) {
+			int index = ch - 0x80;
+			extraCharWidth = 4;
+			copyStretchSpriteToScreen(fontSpriteData, (index % 16) * 8, (index / 16) * 8 + 56, 8, 5, x, y, (scrW + extraCharWidth), scrH, false, false, evenPxOnly);
+			
+		}
 
-	//font sprite sheet has text as color 7, with 0 as transparent. We need to override
-	//these values and restore them after
-	uint8_t prevDrawPal[16];
-	for(uint8_t i = 0; i < 16; i++) {
-		prevDrawPal[i] = _memory->drawState.drawPaletteMap[i];
-		_memory->drawState.drawPaletteMap[i] = i;
 	}
-
-	_memory->drawState.drawPaletteMap[7] = effectiveC;
-	_memory->drawState.drawPaletteMap[0] = 16; //transparent
-
-
-	for (size_t n = 0; n < str.length(); n++) {
-		uint8_t ch = str[n];
+	else{
 		if (ch >= 0x10 && ch < 0x80) {
 			int index = ch - 0x10;
 			copySpriteToScreen(fontSpriteData, x, y, (index % 16) * 8, (index / 16) * 8, 4, 5, false, false);
-			x += 4;
 		} else if (ch >= 0x80) {
 			int index = ch - 0x80;
 			copySpriteToScreen(fontSpriteData, x, y, (index % 16) * 8, (index / 16) * 8 + 56, 8, 5, false, false);
-			x += 8;
-		} else if (ch == '\n') {
-			x = _memory->drawState.text_x;
-			y += 6;
+			extraCharWidth = 4;
 		}
 	}
 
-	for(int i = 0; i < 16; i++) {
-		_memory->drawState.drawPaletteMap[i] = prevDrawPal[i];
-	}
-
-	//todo: auto scrolling
-	_memory->drawState.text_y += 6;
-
-	return x;
+	return extraCharWidth;
 }
 
 void Graphics::spr(
@@ -1332,7 +1336,7 @@ void Graphics::sspr(
         bool flip_x = false,
         bool flip_y = false)
 {
-	copyStretchSpriteToScreen(GetP8SpriteSheetBuffer(), sx, sy, sw, sh, dx, dy, dw, dh, flip_x, flip_y);
+	copyStretchSpriteToScreen(GetP8SpriteSheetBuffer(), sx, sy, sw, sh, dx, dy, dw, dh, flip_x, flip_y, false);
 }
 
 bool Graphics::fget(uint8_t n, uint8_t f){

source/graphics.h

@@ -35,7 +35,8 @@ class Graphics {
 		int scr_w,
 		int scr_h,
 		bool flip_x,
-		bool flip_y);
+		bool flip_y,
+		bool skipStretchPx);
 
 	void swap(int *x, int *y);
 	void applyCameraToPoint(int *x, int *y);
@@ -108,9 +109,7 @@ class Graphics {
 
 	fix32 fillp(fix32 pat);
 
-	int print(std::string str);
-	int print(std::string str, int x, int y);
-	int print(std::string str, int x, int y, uint8_t c);
+	int drawCharacter(uint8_t ch, int x, int y, uint8_t printMode = 0);
 
 	void spr(
 		int n,

source/hostVmShared.h

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <stdint.h>
+
 /// Creates a bitmask from a bit number.
 #define BITMASK(n) (1U<<(n))
 
@@ -71,3 +73,15 @@ struct InputState_t {
 	int16_t mouseY;
 	uint8_t mouseBtnState;
 };
+
+enum PrintMode_t
+{
+	PRINT_MODE_ON = 0x1,
+    PRINT_MODE_PADDING = 0x2,
+	PRINT_MODE_WIDE = 0x4,
+    PRINT_MODE_TALL = 0x8,
+	PRINT_MODE_SOLID_BG = 0x10,
+	PRINT_MODE_INVERTED = 0x20,
+	PRINT_MODE_STRIPEY = 0x40,
+	PRINT_MODE_CUSTOM_FONT = 0x80
+};

source/picoluaapi.cpp

@@ -9,6 +9,7 @@ using namespace std;
 #include "Input.h"
 #include "vm.h"
 #include "logger.h"
+#include "printHelper.h"
 
 //extern "C" {
   #include <lua.h>
@@ -21,11 +22,13 @@ Input* _inputForLuaApi;
 Vm* _vmForLuaApi;
 Audio* _audioForLuaApi;
 
-void initPicoApi(Graphics* graphics, Input* input, Vm* vm, Audio* audio){
+void initPicoApi(PicoRam* memory, Graphics* graphics, Input* input, Vm* vm, Audio* audio){
     _graphicsForLuaApi = graphics;
     _inputForLuaApi = input;
     _vmForLuaApi = vm;
     _audioForLuaApi = audio;
+
+    initPrintHelper(memory, _graphicsForLuaApi, _vmForLuaApi, _audioForLuaApi);
 }
 
 int noop(const char * name) {
@@ -318,27 +321,27 @@ int print(lua_State *L){
     }
 
     if (numArgs < 2) {
-        newx = _graphicsForLuaApi->print(str);
+        newx = print(str);
     }
     else if (numArgs == 2) {
         uint8_t c = lua_tonumber(L,2);
 
         _graphicsForLuaApi->color(c);
-        newx = _graphicsForLuaApi->print(str);
+        newx = print(str);
     }
     else if (numArgs == 3) {
         int x = lua_tonumber(L,2);
         int y = lua_tonumber(L,3);
 
-        newx = _graphicsForLuaApi->print(str, x, y);
+        newx = print(str, x, y);
     }
     else {
         int x = lua_tonumber(L,2);
         int y = lua_tonumber(L,3);
 
         uint8_t c = lua_tonumber(L,4);
 
-        newx = _graphicsForLuaApi->print(str, x, y, c);
+        newx = print(str, x, y, c);
     }
 
     lua_pushinteger(L, newx);

source/picoluaapi.h

@@ -11,9 +11,10 @@
 #include "graphics.h"
 #include "Input.h"
 #include "vm.h"
+#include "PicoRam.h"
 
 //this can probably go away when I'm loading actual carts and just have to expose api to lua
-void initPicoApi(Graphics* graphics, Input* input, Vm* vm, Audio* audio);
+void initPicoApi(PicoRam* memory, Graphics* graphics, Input* input, Vm* vm, Audio* audio);
 
 //graphics api
 int cls(lua_State *L);