fix *most* tools in palettized mode

5GameMaker · Sep 13, 2024 · 0d9914b · 0d9914b
1 parent cf7e3ad
commit 0d9914b
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 22 deletions.
diff --git a/freesprite/Brush1pxLine.cpp b/freesprite/Brush1pxLine.cpp
@@ -10,7 +10,7 @@ void Brush1pxLine::clickPress(MainEditor* editor, XY pos)
 
 void Brush1pxLine::clickRelease(MainEditor* editor, XY pos)
 {
-	editor->DrawLine(startPos, pos, 0xFF000000 | editor->pickedColor);
+	editor->DrawLine(startPos, pos, editor->getActiveColor());
 	dragging = false;
 }
 

diff --git a/freesprite/Brush1pxLinePathfind.cpp b/freesprite/Brush1pxLinePathfind.cpp
@@ -12,7 +12,7 @@ void Brush1pxLinePathfind::clickRelease(MainEditor* editor, XY pos)
 {
 	std::vector<Node> pathfindResult = genAStar(editor->getCurrentLayer(), startPos, pos);
 	for (Node& n : pathfindResult) {
-		editor->SetPixel(XY{ n.x, n.y }, editor->pickedColor);
+		editor->SetPixel(XY{ n.x, n.y }, editor->getActiveColor());
 	}
 	//editor->DrawLine(startPos, pos, 0xFF000000 | editor->pickedColor);
 	dragging = false;

diff --git a/freesprite/Brush1x1ArcX.cpp b/freesprite/Brush1x1ArcX.cpp
@@ -2,12 +2,12 @@
 #include "maineditor.h"
 
 void Brush1x1ArcX::clickPress(MainEditor* editor, XY pos) {
-	editor->SetPixel(pos, 0xFF000000 | editor->pickedColor);
+	editor->SetPixel(pos, editor->getActiveColor());
 }
 
 void Brush1x1ArcX::clickDrag(MainEditor* editor, XY from, XY to) {
 	//editor->DrawLine(from, to, 0xFF000000 | editor->pickedColor);
 	rasterizeLine(from, to, [&](XY a)->void {
-		editor->SetPixel(a, editor->pickedColor);
+		editor->SetPixel(a, editor->getActiveColor());
 	}, 1);
 }
diff --git a/freesprite/Brush1x1ArcY.cpp b/freesprite/Brush1x1ArcY.cpp
@@ -2,12 +2,11 @@
 #include "maineditor.h"
 
 void Brush1x1ArcY::clickPress(MainEditor* editor, XY pos) {
-	editor->SetPixel(pos, 0xFF000000 | editor->pickedColor);
+	editor->SetPixel(pos, editor->getActiveColor());
 }
 
 void Brush1x1ArcY::clickDrag(MainEditor* editor, XY from, XY to) {
-	//editor->DrawLine(from, to, 0xFF000000 | editor->pickedColor);
 	rasterizeLine(from, to, [&](XY a)->void {
-		editor->SetPixel(a, editor->pickedColor);
+		editor->SetPixel(a, editor->getActiveColor());
 		}, 2);
 }
diff --git a/freesprite/Brush3pxCircle.cpp b/freesprite/Brush3pxCircle.cpp
@@ -3,21 +3,21 @@
 
 void Brush3pxCircle::clickPress(MainEditor* editor, XY pos)
 {
-	editor->SetPixel(xyAdd(pos, XY{-1,0}), 0xFF000000 | editor->pickedColor);
-	editor->SetPixel(xyAdd(pos, XY{1,0}), 0xFF000000 | editor->pickedColor);
-	editor->SetPixel(xyAdd(pos, XY{0,-1}), 0xFF000000 | editor->pickedColor);
-	editor->SetPixel(xyAdd(pos, XY{0,1}), 0xFF000000 | editor->pickedColor);
-	editor->SetPixel(pos, 0xFF000000 | editor->pickedColor);
+	editor->SetPixel(xyAdd(pos, XY{-1,0}), editor->getActiveColor());
+	editor->SetPixel(xyAdd(pos, XY{1,0}), editor->getActiveColor());
+	editor->SetPixel(xyAdd(pos, XY{0,-1}), editor->getActiveColor());
+	editor->SetPixel(xyAdd(pos, XY{0,1}), editor->getActiveColor());
+	editor->SetPixel(pos, editor->getActiveColor());
 }
 
 void Brush3pxCircle::clickDrag(MainEditor* editor, XY from, XY to)
 {
 	rasterizeLine(from, to, [editor](XY pos) {
-		editor->SetPixel(xyAdd(pos, XY{ -1,0 }), 0xFF000000 | editor->pickedColor);
-		editor->SetPixel(xyAdd(pos, XY{ 1,0 }), 0xFF000000 | editor->pickedColor);
-		editor->SetPixel(xyAdd(pos, XY{ 0,-1 }), 0xFF000000 | editor->pickedColor);
-		editor->SetPixel(xyAdd(pos, XY{ 0,1 }), 0xFF000000 | editor->pickedColor);
-		editor->SetPixel(pos, 0xFF000000 | editor->pickedColor);
+		editor->SetPixel(xyAdd(pos, XY{ -1,0 }), editor->getActiveColor());
+		editor->SetPixel(xyAdd(pos, XY{ 1,0 }), editor->getActiveColor());
+		editor->SetPixel(xyAdd(pos, XY{ 0,-1 }), editor->getActiveColor());
+		editor->SetPixel(xyAdd(pos, XY{ 0,1 }), editor->getActiveColor());
+		editor->SetPixel(pos, editor->getActiveColor());
 	});
 	//editor->DrawLine(from, to, 0xFF000000 | editor->pickedColor);
 }

diff --git a/freesprite/BrushCircle.cpp b/freesprite/BrushCircle.cpp
@@ -17,7 +17,7 @@ void BrushCircle::clickRelease(MainEditor* editor, XY pos)
 	editor->getCurrentLayer()->setPixel({posMin.x, posMax.y}, editor->pickedColor);
 	editor->getCurrentLayer()->setPixel({posMax.x, posMin.y}, editor->pickedColor);*/
 	rasterizeEllipse(posMin, posMax, [&](XY a) {
-		editor->SetPixel(a, editor->pickedColor);
+		editor->SetPixel(a, editor->getActiveColor());
 	});
 	heldDown = false;
 }

diff --git a/freesprite/BrushReplaceColor.cpp b/freesprite/BrushReplaceColor.cpp
@@ -3,7 +3,7 @@
 
 void BrushReplaceColor::clickPress(MainEditor* editor, XY pos)
 {
-	editor->layer_replaceColor(editor->layer_getPixelAt(pos), editor->eraserMode ? 0x00000000 : editor->pickedColor);
+	editor->layer_replaceColor(editor->layer_getPixelAt(pos), editor->eraserMode ? (editor->isPalettized ? -1 : 0x00000000) : editor->getActiveColor());
 }
 
 void BrushReplaceColor::renderOnCanvas(MainEditor* editor, int scale)

diff --git a/freesprite/Layer.h b/freesprite/Layer.h
@@ -276,7 +276,7 @@ class Layer
 	void replaceColor(uint32_t from, uint32_t to) {
 		uint32_t* px32 = (uint32_t*)pixelData;
 		for (uint64_t x = 0; x < w * h; x++) {
-			if (px32[x] == from || ((px32[x]&0xFF000000) == 0 && (from&0xFF000000) == 0)) {
+			if (px32[x] == from || (!isPalettized && (px32[x]&0xFF000000) == 0 && (from&0xFF000000) == 0)) {
 				px32[x] = to;
 			}
 		}

diff --git a/freesprite/ToolRectMove.cpp b/freesprite/ToolRectMove.cpp
@@ -30,7 +30,7 @@ void ToolRectMove::clickRelease(MainEditor* editor, XY pos)
 	for (int y = ymin; y < ymax; y++) {
 		for (int x = xmin; x < xmax; x++) {
 			clonedArea[copyIndex++] = editor->layer_getPixelAt(XY{ x,y });
-			editor->SetPixel(XY{ x,y }, 0x00000000);
+			editor->SetPixel(XY{ x,y }, !editor->isPalettized ? 0x00000000 : -1);
 		}
 	}
 	cacheClonePreview = SDL_CreateTexture(g_rd, SDL_PIXELFORMAT_ARGB8888, SDL_TEXTUREACCESS_STREAMING, clonedAreaPointAndDimensions.w, clonedAreaPointAndDimensions.h);

diff --git a/freesprite/UtilPathfind.cpp b/freesprite/UtilPathfind.cpp
@@ -102,7 +102,7 @@ bool CanWalkOnMapPoint(Layer* map, int x, int y, uint32_t col1, uint32_t col2) {
         return false;
     }
     uint32_t mapPixel = map->getPixelAt(XY{ x,y });
-    return mapPixel == col1 || mapPixel == col2 || (mapPixel >> 24 == 0 && (col1 >> 24 == 0 || col2 >> 24 == 0));
+    return mapPixel == col1 || mapPixel == col2 || (!map->isPalettized && mapPixel >> 24 == 0 && (col1 >> 24 == 0 || col2 >> 24 == 0));
 }
 
 uint64_t startTime;