Fix color palette opacity issue and aspect ratio correction

Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com>
2026-03-16 13:23:13 +01:00
parent f3e9a9d67d
commit 4723b704db
2 changed files with 177 additions and 187 deletions
--- a/packages/wolf_3d_data_types/lib/src/color_palette.dart
+++ b/packages/wolf_3d_data_types/lib/src/color_palette.dart
@@ -67,78 +67,78 @@ abstract class ColorPalette {
    0xFF0055B6,
    0xFF004C9D,
    0xFFDAFFFF,
-    0xBAFFFF,
-    0x9DFFFF,
-    0x7DFFFF,
-    0x5DFAFF,
-    0x40F6FF,
-    0x20F6FF,
-    0x00F6FF,
-    0x00DAE6,
-    0x00C6CE,
-    0x00AEB6,
-    0x009D9D,
-    0x008585,
-    0x006D71,
-    0x005559,
-    0x004040,
-    0x5DFFD2,
-    0x40FFC6,
-    0x20FFB6,
-    0x00FFA1,
-    0x00E691,
-    0x00CE81,
-    0x00B675,
-    0x009D61,
-    0xDAFFDA,
-    0xBAFFBE,
-    0x9DFF9D,
-    0x7DFF81,
-    0x5DFF61,
-    0x40FF40,
-    0x20FF20,
-    0x00FF00,
-    0x00FF00,
-    0x00EE00,
-    0x00E200,
-    0x00D600,
-    0x00CA04,
-    0x00BE04,
-    0x00B204,
-    0x00A504,
-    0x009904,
-    0x008904,
-    0x007D04,
-    0x007104,
-    0x006504,
-    0x005904,
-    0x004C04,
-    0x004004,
-    0xFFFFDA,
-    0xFFFFBA,
-    0xFFFF9D,
-    0xFAFF7D,
-    0xFFFF5D,
-    0xFFFF40,
-    0xFFFF20,
-    0xFFFF00,
-    0xE6E600,
-    0xCECE00,
-    0xB6B600,
-    0x9D9D00,
-    0x858500,
-    0x717100,
-    0x595900,
-    0x404000,
+    0xFFBAFFFF,
+    0xFF9DFFFF,
+    0xFF7DFFFF,
+    0xFF5DFAFF,
+    0xFF40F6FF,
+    0xFF20F6FF,
+    0xFF00F6FF,
+    0xFF00DAE6,
+    0xFF00C6CE,
+    0xFF00AEB6,
+    0xFF009D9D,
+    0xFF008585,
+    0xFF006D71,
+    0xFF005559,
+    0xFF004040,
+    0xFF5DFFD2,
+    0xFF40FFC6,
+    0xFF20FFB6,
+    0xFF00FFA1,
+    0xFF00E691,
+    0xFF00CE81,
+    0xFF00B675,
+    0xFF009D61,
+    0xFFDAFFDA,
+    0xFFBAFFBE,
+    0xFF9DFF9D,
+    0xFF7DFF81,
+    0xFF5DFF61,
+    0xFF40FF40,
+    0xFF20FF20,
+    0xFF00FF00,
+    0xFF00FF00,
+    0xFF00EE00,
+    0xFF00E200,
+    0xFF00D600,
+    0xFF00CA04,
+    0xFF00BE04,
+    0xFF00B204,
+    0xFF00A504,
+    0xFF009904,
+    0xFF008904,
+    0xFF007D04,
+    0xFF007104,
+    0xFF006504,
+    0xFF005904,
+    0xFF004C04,
+    0xFF004004,
+    0xFFFFFFDA,
+    0xFFFFFFBA,
+    0xFFFFFF9D,
+    0xFFFAFF7D,
+    0xFFFFFF5D,
+    0xFFFFFF40,
+    0xFFFFFF20,
+    0xFFFFFF00,
+    0xFFE6E600,
+    0xFFCECE00,
+    0xFFB6B600,
+    0xFF9D9D00,
+    0xFF858500,
+    0xFF717100,
+    0xFF595900,
+    0xFF404000,
    0xFFBE5D,
    0xFFB240,
    0xFFAA20,
    0xFF9D00,
-    0xE68D00,
-    0xCE7D00,
-    0xB66D00,
-    0x9D5D00,
-    0xDADADA,
+    0xFFE68D00,
+    0xFFCE7D00,
+    0xFFB66D00,
+    0xFF9D5D00,
+    0xFFDADADA,
    0xFFBEBA,
    0xFF9D9D,
    0xFF817D,
@@ -147,37 +147,37 @@ abstract class ColorPalette {
    0xFF2420,
    0xFF0400,
    0xFF0000,
-    0xEE0000,
-    0xE20000,
-    0xD60000,
-    0xCA0000,
-    0xBE0000,
-    0xB20000,
-    0xA50000,
-    0x990000,
-    0x890000,
-    0x7D0000,
-    0x710000,
-    0x650000,
-    0x590000,
-    0x4C0000,
-    0x400000,
-    0x282828,
-    0x34E2FF,
-    0x24D6FF,
-    0x18CEFF,
-    0x08C2FF,
-    0x00B6FF,
+    0xFFEE0000,
+    0xFFE20000,
+    0xFFD60000,
+    0xFFCA0000,
+    0xFFBE0000,
+    0xFFB20000,
+    0xFFA50000,
+    0xFF990000,
+    0xFF890000,
+    0xFF7D0000,
+    0xFF710000,
+    0xFF650000,
+    0xFF590000,
+    0xFF4C0000,
+    0xFF400000,
+    0xFF282828,
+    0xFF34E2FF,
+    0xFF24D6FF,
+    0xFF18CEFF,
+    0xFF08C2FF,
+    0xFF00B6FF,
    0xFF20B6,
    0xFF00AA,
-    0xE60099,
-    0xCE0081,
-    0xB60075,
-    0x9D0061,
-    0x850050,
-    0x710044,
-    0x590034,
-    0x400028,
+    0xFFE60099,
+    0xFFCE0081,
+    0xFFB60075,
+    0xFF9D0061,
+    0xFF850050,
+    0xFF710044,
+    0xFF590034,
+    0xFF400028,
    0xFFDAFF,
    0xFFBAFF,
    0xFF9DFF,
@@ -186,77 +186,77 @@ abstract class ColorPalette {
    0xFF40FF,
    0xFF20FF,
    0xFF00FF,
-    0xE600E2,
-    0xCE00CA,
-    0xB600B6,
-    0x9D009D,
-    0x850085,
-    0x71006D,
-    0x590059,
-    0x400040,
-    0xDEEAFF,
-    0xD2E2FF,
-    0xC6DAFF,
-    0xBED6FF,
-    0xB2CEFF,
-    0xA5C6FF,
-    0x9DBEFF,
-    0x91BAFF,
-    0x81B2FF,
-    0x1F57FA,
-    0x619DFF,
-    0x5D95F2,
-    0x598DEA,
-    0x5589DE,
-    0x5081D2,
-    0x4C7DCA,
-    0x4879BE,
-    0x4471B6,
-    0x4069AA,
-    0x3C65A1,
-    0x38619D,
-    0x345D91,
-    0x305989,
-    0x2C5081,
-    0x284C75,
-    0x24486D,
-    0x20405D,
-    0x1C3C55,
-    0x183848,
-    0x183040,
-    0x142C38,
-    0x0C2028,
-    0x650061,
-    0x656500,
-    0x616100,
-    0x1C0000,
-    0x2C0000,
-    0x102430,
-    0x480048,
-    0x500050,
-    0x340000,
-    0x1C1C1C,
-    0x4C4C4C,
-    0x5D5D5D,
-    0x404040,
-    0x303030,
-    0x343434,
-    0xF6F6DA,
-    0xEAEABA,
-    0xDEDED9,
-    0xCACA75,
-    0xC2C248,
-    0xB6B620,
-    0xB2B220,
-    0xA5A500,
-    0x999900,
-    0x8D8D00,
-    0x858500,
-    0x7D7D00,
-    0x797900,
-    0x757500,
-    0x717100,
-    0x6D6D00,
-    0x890099,
+    0xFFE600E2,
+    0xFFCE00CA,
+    0xFFB600B6,
+    0xFF9D009D,
+    0xFF850085,
+    0xFF71006D,
+    0xFF590059,
+    0xFF400040,
+    0xFFDEEAFF,
+    0xFFD2E2FF,
+    0xFFC6DAFF,
+    0xFFBED6FF,
+    0xFFB2CEFF,
+    0xFFA5C6FF,
+    0xFF9DBEFF,
+    0xFF91BAFF,
+    0xFF81B2FF,
+    0xFF1F57FA,
+    0xFF619DFF,
+    0xFF5D95F2,
+    0xFF598DEA,
+    0xFF5589DE,
+    0xFF5081D2,
+    0xFF4C7DCA,
+    0xFF4879BE,
+    0xFF4471B6,
+    0xFF4069AA,
+    0xFF3C65A1,
+    0xFF38619D,
+    0xFF345D91,
+    0xFF305989,
+    0xFF2C5081,
+    0xFF284C75,
+    0xFF24486D,
+    0xFF20405D,
+    0xFF1C3C55,
+    0xFF183848,
+    0xFF183040,
+    0xFF142C38,
+    0xFF0C2028,
+    0xFF650061,
+    0xFF656500,
+    0xFF616100,
+    0xFF1C0000,
+    0xFF2C0000,
+    0xFF102430,
+    0xFF480048,
+    0xFF500050,
+    0xFF340000,
+    0xFF1C1C1C,
+    0xFF4C4C4C,
+    0xFF5D5D5D,
+    0xFF404040,
+    0xFF303030,
+    0xFF343434,
+    0xFFF6F6DA,
+    0xFFEAEABA,
+    0xFFDEDED9,
+    0xFFCACA75,
+    0xFFC2C248,
+    0xFFB6B620,
+    0xFFB2B220,
+    0xFFA5A500,
+    0xFF999900,
+    0xFF8D8D00,
+    0xFF858500,
+    0xFF7D7D00,
+    0xFF797900,
+    0xFF757500,
+    0xFF717100,
+    0xFF6D6D00,
+    0xFF890099,
  ]);
 }
--- a/packages/wolf_3d_renderer/lib/wolf_3d_renderer.dart
+++ b/packages/wolf_3d_renderer/lib/wolf_3d_renderer.dart
@@ -110,29 +110,19 @@ class _WolfRendererState extends State<WolfRenderer>
    }

    return Scaffold(
-      backgroundColor: Colors.black,
+      backgroundColor: Color.fromARGB(255, 4, 64, 64),
      body: KeyboardListener(
        focusNode: _focusNode,
        autofocus: true,
        onKeyEvent: (_) {},
-        child: Column(
-          children: [
-            Expanded(
-              child: LayoutBuilder(
-                builder: (context, constraints) {
-                  return Center(
-                    child: AspectRatio(
-                      aspectRatio: 320 / 200,
-                      child: CustomPaint(
-                        size: Size(constraints.maxWidth, constraints.maxHeight),
-                        painter: BufferPainter(_renderedFrame),
-                      ),
-                    ),
-                  );
-                },
-              ),
+        child: Center(
+          child: Padding(
+            padding: const EdgeInsets.all(16.0),
+            child: AspectRatio(
+              aspectRatio: 4 / 3,
+              child: CustomPaint(painter: BufferPainter(_renderedFrame)),
            ),
-          ],
+          ),
        ),
      ),
    );