Merge pull request #25 from arceusVen1/partycolor_mixing

partycolor_mixing
arceusVen1 · May 9, 2024 · 3f4b66f · 3f4b66f
2 parents d8d23da + d049026
commit 3f4b66f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/lib/classes/texture.dart b/lib/classes/texture.dart
@@ -97,11 +97,12 @@ class ModelTexture {
         }
 
         if (attribute.usePlayerColor && partyColor != null && p.a != 0) {
-          p.r = partyColor.red;
-          p.g = partyColor.green;
-          p.b = partyColor.blue;
+          p.r = (p.r * partyColor.red)/255;
+          p.g = (p.g * partyColor.green)/255;
+          p.b = (p.b * partyColor.blue)/255;
         }
-        // required because of bug in flutter whre alpha 0 with color isn't treated as fully trasnaprent
+
+        // required because of bug in flutter where alpha 0 with color isn't treated as fully transparent
         if (p.a == 0) {
           p.r = 0;
           p.g = 0;

diff --git a/lib/widgets/viewer/viewer.dart b/lib/widgets/viewer/viewer.dart
@@ -285,7 +285,7 @@ class ModelViewerLoader extends ConsumerWidget {
         .toModel(materialsTable, pwFolder, detailTable, getTexturePathFnct);
     return FutureBuilder(
       future: model.loadTextures(Theme.of(context).colorScheme.onBackground,
-          showPartyColor ? Colors.cyan : null),
+          showPartyColor ? Color(0xffffab01) : null),
       builder: (context, snapshot) {
         if (snapshot.connectionState == ConnectionState.done) {
           return Viewer(