Merge pull request #6 from daktak/hd2x

Hd 2x gfx pack
daktak · May 31, 2018 · 742b924 · 742b924
2 parents 9ad8e42 + 2d6d53c
commit 742b924
Show file tree

Hide file tree

Showing 128 changed files with 243 additions and 52 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,3 @@
+.lock-waf_linux2_build
+build/
+node_modules/
diff --git a/package.json b/package.json
@@ -16,7 +16,9 @@
             "ShipRotate",
             "ShipChange",
             "CapChange",
-            "TurretRotate"
+            "TurretRotate",
+            "Animations",
+            "Hd2x"
         ],
         "projectType": "native",
         "resources": {
@@ -27,102 +29,204 @@
                     "targetPlatforms": null,
                     "type": "bitmap"
                 },
+                {
+                    "file": "images/ywing_hd2x.png",
+                    "name": "YWING_HD2X",
+                    "targetPlatforms": null,
+                    "type": "bitmap"
+                },
                 {
                     "file": "images/xform.png",
                     "name": "XFORM",
                     "targetPlatforms": null,
                     "type": "bitmap"
                 },
+                {
+                    "file": "images/xform_hd2x.png",
+                    "name": "XFORM_HD2X",
+                    "targetPlatforms": null,
+                    "type": "bitmap"
+                },
                 {
                     "file": "images/trader.png",
                     "name": "TRADER",
                     "targetPlatforms": null,
                     "type": "bitmap"
                 },
+                {
+                    "file": "images/trader_hd2x.png",
+                    "name": "TRADER_HD2X",
+                    "targetPlatforms": null,
+                    "type": "bitmap"
+                },
                 {
                     "file": "images/torch.png",
                     "name": "TORCH",
                     "targetPlatforms": null,
                     "type": "bitmap"
                 },
+                {
+                    "file": "images/torch_hd2x.png",
+                    "name": "TORCH_HD2X",
+                    "targetPlatforms": null,
+                    "type": "bitmap"
+                },
                 {
                     "file": "images/terminator.png",
                     "name": "TERMINATOR",
                     "targetPlatforms": null,
                     "type": "bitmap"
                 },
+                {
+                    "file": "images/terminator_hd2x.png",
+                    "name": "TERMINATOR_HD2X",
+                    "targetPlatforms": null,
+                    "type": "bitmap"
+                },
                 {
                     "file": "images/stinger.png",
                     "name": "STINGER",
                     "targetPlatforms": null,
                     "type": "bitmap"
                 },
+                {
+                    "file": "images/stinger_hd2x.png",
+                    "name": "STINGER_HD2X",
+                    "targetPlatforms": null,
+                    "type": "bitmap"
+                },
                 {
                     "file": "images/skiff.png",
                     "name": "SKIFF",
                     "targetPlatforms": null,
                     "type": "bitmap"
                 },
+                {
+                    "file": "images/skiff_hd2x.png",
+                    "name": "SKIFF_HD2X",
+                    "targetPlatforms": null,
+                    "type": "bitmap"
+                },
                 {
                     "file": "images/scout.png",
                     "name": "SCOUT",
                     "targetPlatforms": null,
                     "type": "bitmap"
                 },
+                {
+                    "file": "images/scout_hd2x.png",
+                    "name": "SCOUT_HD2X",
+                    "targetPlatforms": null,
+                    "type": "bitmap"
+                },
                 {
                     "file": "images/probe.png",
                     "name": "PROBE",
                     "targetPlatforms": null,
                     "type": "bitmap"
                 },
+                {
+                    "file": "images/probe_hd2x.png",
+                    "name": "PROBE_HD2X",
+                    "targetPlatforms": null,
+                    "type": "bitmap"
+                },
                 {
                     "file": "images/podship.png",
                     "name": "PODSHIP",
                     "targetPlatforms": null,
                     "type": "bitmap"
                 },
+                {
+                    "file": "images/podship_hd2x.png",
+                    "name": "PODSHIP_HD2X",
+                    "targetPlatforms": null,
+                    "type": "bitmap"
+                },
                 {
                     "file": "images/penetrator.png",
                     "name": "PENETRATOR",
                     "targetPlatforms": null,
                     "type": "bitmap"
                 },
+                {
+                    "file": "images/penetrator_hd2x.png",
+                    "name": "PENETRATOR_HD2X",
+                    "targetPlatforms": null,
+                    "type": "bitmap"
+                },
                 {
                     "file": "images/nemesis.png",
                     "name": "NEMESIS",
                     "targetPlatforms": null,
                     "type": "bitmap"
                 },
                 {
-                    "file": "images/nemesis_turret.png",
+                    "file": "images/turret.png",
                     "name": "NEMESIS_TURRET",
                     "targetPlatforms": null,
                     "type": "bitmap"
                 },
+                {
+                    "file": "images/turret_hd2x.png",
+                    "name": "NEMESIS_TURRET_HD2X",
+                    "targetPlatforms": null,
+                    "type": "bitmap"
+                },
+                {
+                    "file": "images/nemesis_hd2x.png",
+                    "name": "NEMESIS_HD2X",
+                    "targetPlatforms": null,
+                    "type": "bitmap"
+                },
                 {
                     "file": "images/mauler.png",
                     "name": "MAULER",
                     "targetPlatforms": null,
                     "type": "bitmap"
                 },
+                {
+                    "file": "images/mauler_hd2x.png",
+                    "name": "MAULER_HD2X",
+                    "targetPlatforms": null,
+                    "type": "bitmap"
+                },
                 {
                     "file": "images/marauder.png",
                     "name": "MARAUDER",
                     "targetPlatforms": null,
                     "type": "bitmap"
                 },
+                {
+                    "file": "images/marauder_hd2x.png",
+                    "name": "MARAUDER_HD2X",
+                    "targetPlatforms": null,
+                    "type": "bitmap"
+                },
                 {
                     "file": "images/jugger.png",
                     "name": "JUGGER",
                     "targetPlatforms": null,
                     "type": "bitmap"
                 },
+                {
+                    "file": "images/jugger_hd2x.png",
+                    "name": "JUGGER_HD2X",
+                    "targetPlatforms": null,
+                    "type": "bitmap"
+                },
                 {
                     "file": "images/intruder.png",
                     "name": "INTRUDER",
                     "targetPlatforms": null,
                     "type": "bitmap"
                 },
+                {
+                    "file": "images/intruder_hd2x.png",
+                    "name": "INTRUDER_HD2X",
+                    "targetPlatforms": null,
+                    "type": "bitmap"
+                },
                 {
                     "file": "images/icon.png",
                     "menuIcon": true,
@@ -136,59 +240,119 @@
                     "targetPlatforms": null,
                     "type": "bitmap"
                 },
+                {
+                    "file": "images/guardian_hd2x.png",
+                    "name": "GUARDIAN_HD2X",
+                    "targetPlatforms": null,
+                    "type": "bitmap"
+                },
                 {
                     "file": "images/fury.png",
                     "name": "FURY",
                     "targetPlatforms": null,
                     "type": "bitmap"
                 },
+                {
+                    "file": "images/fury_hd2x.png",
+                    "name": "FURY_HD2X",
+                    "targetPlatforms": null,
+                    "type": "bitmap"
+                },
                 {
                     "file": "images/eluder.png",
                     "name": "ELUDER",
                     "targetPlatforms": null,
                     "type": "bitmap"
                 },
+                {
+                    "file": "images/eluder_hd2x.png",
+                    "name": "ELUDER_HD2X",
+                    "targetPlatforms": null,
+                    "type": "bitmap"
+                },
                 {
                     "file": "images/drone.png",
                     "name": "DRONE",
                     "targetPlatforms": null,
                     "type": "bitmap"
                 },
+                {
+                    "file": "images/drone_hd2x.png",
+                    "name": "DRONE_HD2X",
+                    "targetPlatforms": null,
+                    "type": "bitmap"
+                },
                 {
                     "file": "images/dreadnought.png",
                     "name": "DREADNOUGHT",
                     "targetPlatforms": null,
                     "type": "bitmap"
                 },
+                {
+                    "file": "images/dreadnought_hd2x.png",
+                    "name": "DREADNOUGHT_HD2X",
+                    "targetPlatforms": null,
+                    "type": "bitmap"
+                },
                 {
                     "file": "images/cruiser.png",
                     "name": "CRUISER",
                     "targetPlatforms": null,
                     "type": "bitmap"
                 },
+                {
+                    "file": "images/cruiser_hd2x.png",
+                    "name": "CRUISER_HD2X",
+                    "targetPlatforms": null,
+                    "type": "bitmap"
+                },
                 {
                     "file": "images/broodhome.png",
                     "name": "BROODHOME",
                     "targetPlatforms": null,
                     "type": "bitmap"
                 },
+                {
+                    "file": "images/broodhome_hd2x.png",
+                    "name": "BROODHOME_HD2X",
+                    "targetPlatforms": null,
+                    "type": "bitmap"
+                },
                 {
                     "file": "images/blade.png",
                     "name": "BLADE",
                     "targetPlatforms": null,
                     "type": "bitmap"
                 },
+                {
+                    "file": "images/blade_hd2x.png",
+                    "name": "BLADE_HD2X",
+                    "targetPlatforms": null,
+                    "type": "bitmap"
+                },
                 {
                     "file": "images/avenger.png",
                     "name": "AVENGER",
                     "targetPlatforms": null,
                     "type": "bitmap"
                 },
+                {
+                    "file": "images/avenger_hd2x.png",
+                    "name": "AVENGER_HD2X",
+                    "targetPlatforms": null,
+                    "type": "bitmap"
+                },
                 {
                     "file": "images/avatar.png",
                     "name": "AVATAR",
                     "targetPlatforms": null,
                     "type": "bitmap"
+                },
+                {
+                    "file": "images/avatar_hd2x.png",
+                    "name": "AVATAR_HD2X",
+                    "targetPlatforms": null,
+                    "type": "bitmap"
                 }
             ]
         },
@@ -203,5 +367,5 @@
             "watchface": true
         }
     },
-    "version": "0.4.0"
+    "version": "0.5.0"
 }
diff --git a/resources/images/avatar_hd2x~bw.png b/resources/images/avatar_hd2x~bw.png
diff --git a/resources/images/avatar_hd2x~color.png b/resources/images/avatar_hd2x~color.png
diff --git a/resources/images/avatar~bw.png b/resources/images/avatar~bw.png
diff --git a/resources/images/avatar~color.png b/resources/images/avatar~color.png
diff --git a/resources/images/avenger_hd2x~bw.png b/resources/images/avenger_hd2x~bw.png
diff --git a/resources/images/avenger_hd2x~color.png b/resources/images/avenger_hd2x~color.png
diff --git a/resources/images/avenger~bw.png b/resources/images/avenger~bw.png
diff --git a/resources/images/avenger~color.png b/resources/images/avenger~color.png
diff --git a/resources/images/blade_hd2x~bw.png b/resources/images/blade_hd2x~bw.png
diff --git a/resources/images/blade_hd2x~color.png b/resources/images/blade_hd2x~color.png
diff --git a/resources/images/blade~bw.png b/resources/images/blade~bw.png
diff --git a/resources/images/blade~color.png b/resources/images/blade~color.png
diff --git a/resources/images/broodhome.png b/resources/images/broodhome.png
diff --git a/resources/images/broodhome_hd2x~bw.png b/resources/images/broodhome_hd2x~bw.png
diff --git a/resources/images/broodhome_hd2x~color.png b/resources/images/broodhome_hd2x~color.png
diff --git a/resources/images/broodhome~bw.png b/resources/images/broodhome~bw.png
diff --git a/resources/images/broodhome~color.png b/resources/images/broodhome~color.png
diff --git a/resources/images/cruiser_hd2x~bw.png b/resources/images/cruiser_hd2x~bw.png
diff --git a/resources/images/cruiser_hd2x~color.png b/resources/images/cruiser_hd2x~color.png
diff --git a/resources/images/cruiser~bw.png b/resources/images/cruiser~bw.png
diff --git a/resources/images/cruiser~color.png b/resources/images/cruiser~color.png
diff --git a/resources/images/dreadnought_hd2x~bw.png b/resources/images/dreadnought_hd2x~bw.png
diff --git a/resources/images/dreadnought_hd2x~color.png b/resources/images/dreadnought_hd2x~color.png
diff --git a/resources/images/dreadnought~bw.png b/resources/images/dreadnought~bw.png
diff --git a/resources/images/dreadnought~color.png b/resources/images/dreadnought~color.png
diff --git a/resources/images/drone.png b/resources/images/drone.png
diff --git a/resources/images/drone_hd2x~bw.png b/resources/images/drone_hd2x~bw.png
diff --git a/resources/images/drone_hd2x~color.png b/resources/images/drone_hd2x~color.png
diff --git a/resources/images/drone~bw.png b/resources/images/drone~bw.png
diff --git a/resources/images/drone~color.png b/resources/images/drone~color.png
diff --git a/resources/images/eluder_hd2x~bw.png b/resources/images/eluder_hd2x~bw.png
diff --git a/resources/images/eluder_hd2x~color.png b/resources/images/eluder_hd2x~color.png
diff --git a/resources/images/eluder~bw.png b/resources/images/eluder~bw.png
diff --git a/resources/images/eluder~color.png b/resources/images/eluder~color.png
diff --git a/resources/images/fury.png b/resources/images/fury.png
diff --git a/resources/images/fury_hd2x~bw.png b/resources/images/fury_hd2x~bw.png
diff --git a/resources/images/fury_hd2x~color.png b/resources/images/fury_hd2x~color.png
diff --git a/resources/images/fury~bw.png b/resources/images/fury~bw.png
diff --git a/resources/images/fury~color.png b/resources/images/fury~color.png
diff --git a/resources/images/guardian.png b/resources/images/guardian.png
diff --git a/resources/images/guardian_hd2x~bw.png b/resources/images/guardian_hd2x~bw.png
diff --git a/resources/images/guardian_hd2x~color.png b/resources/images/guardian_hd2x~color.png
diff --git a/resources/images/guardian~bw.png b/resources/images/guardian~bw.png
diff --git a/resources/images/guardian~color.png b/resources/images/guardian~color.png
diff --git a/resources/images/icon.png b/resources/images/icon.png
diff --git a/resources/images/icon~bw.png b/resources/images/icon~bw.png
diff --git a/resources/images/icon~color.png b/resources/images/icon~color.png
diff --git a/resources/images/intruder_hd2x~bw.png b/resources/images/intruder_hd2x~bw.png
diff --git a/resources/images/intruder_hd2x~color.png b/resources/images/intruder_hd2x~color.png
diff --git a/resources/images/intruder~bw.png b/resources/images/intruder~bw.png
diff --git a/resources/images/intruder~color.png b/resources/images/intruder~color.png
diff --git a/resources/images/jugger.png b/resources/images/jugger.png
diff --git a/resources/images/jugger_hd2x~bw.png b/resources/images/jugger_hd2x~bw.png
diff --git a/resources/images/jugger_hd2x~color.png b/resources/images/jugger_hd2x~color.png
diff --git a/resources/images/jugger~bw.png b/resources/images/jugger~bw.png
diff --git a/resources/images/jugger~color.png b/resources/images/jugger~color.png
diff --git a/resources/images/marauder_hd2x~bw.png b/resources/images/marauder_hd2x~bw.png
diff --git a/resources/images/marauder_hd2x~color.png b/resources/images/marauder_hd2x~color.png
diff --git a/resources/images/marauder~bw.png b/resources/images/marauder~bw.png
diff --git a/resources/images/marauder~color.png b/resources/images/marauder~color.png
diff --git a/resources/images/mauler_hd2x~bw.png b/resources/images/mauler_hd2x~bw.png
diff --git a/resources/images/mauler_hd2x~color.png b/resources/images/mauler_hd2x~color.png
diff --git a/resources/images/mauler~bw.png b/resources/images/mauler~bw.png
diff --git a/resources/images/mauler~color.png b/resources/images/mauler~color.png
diff --git a/resources/images/nemesis_hd2x~bw.png b/resources/images/nemesis_hd2x~bw.png
diff --git a/resources/images/nemesis_hd2x~color.png b/resources/images/nemesis_hd2x~color.png
diff --git a/resources/images/nemesis_turret~bw.png b/resources/images/nemesis_turret~bw.png
diff --git a/resources/images/nemesis_turret~color.png b/resources/images/nemesis_turret~color.png
diff --git a/resources/images/nemesis~bw.png b/resources/images/nemesis~bw.png
diff --git a/resources/images/nemesis~color.png b/resources/images/nemesis~color.png
diff --git a/resources/images/penetrator_hd2x~bw.png b/resources/images/penetrator_hd2x~bw.png
diff --git a/resources/images/penetrator_hd2x~color.png b/resources/images/penetrator_hd2x~color.png
diff --git a/resources/images/penetrator~bw.png b/resources/images/penetrator~bw.png
diff --git a/resources/images/penetrator~color.png b/resources/images/penetrator~color.png
diff --git a/resources/images/podship_hd2x~bw.png b/resources/images/podship_hd2x~bw.png
diff --git a/resources/images/podship_hd2x~color.png b/resources/images/podship_hd2x~color.png
diff --git a/resources/images/podship~bw.png b/resources/images/podship~bw.png
diff --git a/resources/images/podship~color.png b/resources/images/podship~color.png
diff --git a/resources/images/probe_hd2x~bw.png b/resources/images/probe_hd2x~bw.png
diff --git a/resources/images/probe_hd2x~color.png b/resources/images/probe_hd2x~color.png
diff --git a/resources/images/probe~bw.png b/resources/images/probe~bw.png
diff --git a/resources/images/probe~color.png b/resources/images/probe~color.png
diff --git a/resources/images/scout_hd2x~bw.png b/resources/images/scout_hd2x~bw.png
diff --git a/resources/images/scout_hd2x~color.png b/resources/images/scout_hd2x~color.png
diff --git a/resources/images/scout~bw.png b/resources/images/scout~bw.png
diff --git a/resources/images/scout~color.png b/resources/images/scout~color.png
diff --git a/resources/images/skiff_hd2x~bw.png b/resources/images/skiff_hd2x~bw.png
diff --git a/resources/images/skiff_hd2x~color.png b/resources/images/skiff_hd2x~color.png
diff --git a/resources/images/skiff~bw.png b/resources/images/skiff~bw.png
diff --git a/resources/images/skiff~color.png b/resources/images/skiff~color.png
diff --git a/resources/images/stinger_hd2x~bw.png b/resources/images/stinger_hd2x~bw.png
diff --git a/resources/images/stinger_hd2x~color.png b/resources/images/stinger_hd2x~color.png
diff --git a/resources/images/stinger~bw.png b/resources/images/stinger~bw.png
diff --git a/resources/images/stinger~color.png b/resources/images/stinger~color.png
diff --git a/resources/images/terminator_hd2x~bw.png b/resources/images/terminator_hd2x~bw.png
diff --git a/resources/images/terminator_hd2x~color.png b/resources/images/terminator_hd2x~color.png
diff --git a/resources/images/terminator~bw.png b/resources/images/terminator~bw.png
diff --git a/resources/images/terminator~color.png b/resources/images/terminator~color.png
diff --git a/resources/images/torch_hd2x~bw.png b/resources/images/torch_hd2x~bw.png
diff --git a/resources/images/torch_hd2x~color.png b/resources/images/torch_hd2x~color.png
diff --git a/resources/images/torch~bw.png b/resources/images/torch~bw.png
diff --git a/resources/images/torch~color.png b/resources/images/torch~color.png
diff --git a/resources/images/trader_hd2x~bw.png b/resources/images/trader_hd2x~bw.png
diff --git a/resources/images/trader_hd2x~color.png b/resources/images/trader_hd2x~color.png
diff --git a/resources/images/trader~bw.png b/resources/images/trader~bw.png
diff --git a/resources/images/trader~color.png b/resources/images/trader~color.png
diff --git a/resources/images/turret_hd2x~bw.png b/resources/images/turret_hd2x~bw.png
diff --git a/resources/images/turret_hd2x~color.png b/resources/images/turret_hd2x~color.png
diff --git a/resources/images/turret~bw.png b/resources/images/turret~bw.png
diff --git a/resources/images/turret~color.png b/resources/images/turret~color.png
diff --git a/resources/images/xform_hd2x~bw.png b/resources/images/xform_hd2x~bw.png
diff --git a/resources/images/xform_hd2x~color.png b/resources/images/xform_hd2x~color.png
diff --git a/resources/images/xform~bw.png b/resources/images/xform~bw.png
diff --git a/resources/images/xform~color.png b/resources/images/xform~color.png
diff --git a/resources/images/ywing_hd2x~bw.png b/resources/images/ywing_hd2x~bw.png
diff --git a/resources/images/ywing_hd2x~color.png b/resources/images/ywing_hd2x~color.png
diff --git a/resources/images/ywing~bw.png b/resources/images/ywing~bw.png
diff --git a/resources/images/ywing~color.png b/resources/images/ywing~color.png
diff --git a/src/c/display_layer.c b/src/c/display_layer.c
@@ -199,10 +199,8 @@ void window_load(GRect bounds, Layer *window_layer) {
   text_layer_set_font(s_cap_layer, fonts_get_system_font(FONT_KEY_GOTHIC_18));
   text_layer_set_text_alignment(s_cap_layer, GTextAlignmentCenter);
   layer_add_child(window_layer, text_layer_get_layer(s_cap_layer));
-
-  create_turret(bounds, window_layer);
-
-  //SHIP
+
   ClaySettings settings = get_settings();
+  create_turret(bounds, window_layer, settings.hd_gfx);
   set_ship(settings);
 }
diff --git a/src/c/main.c b/src/c/main.c
@@ -9,9 +9,12 @@
 
 /*
  NOTES
- -- UQM HD content too large to store all ships
+ -- UQM HD4X content too large to store all ships
  -- max watchface size 100k
  TODO
+ - HD2X move nemesis_turret to rotate correctly
+ - run all pngs through the palette
+ - test b&w
  - Remember last ship and not redraw
  - Remember last captain name
  - Animate ship
@@ -181,4 +184,4 @@ int main(void) {
   init();
   app_event_loop();
   window_destroy(s_main_window);
-}
+}