From 4afebb4380f9eb85eb92e783d7325573de481697 Mon Sep 17 00:00:00 2001
From: Zack Buhman <zack@buhman.org>
Date: Thu, 29 Jan 2026 20:20:41 -0600
Subject: [PATCH] Makefile: combine rc files

---
 Makefile                                           |  9 +++++++--
 main.rc => debug/main.rc                           | 10 ++++------
 .../curve_interpolation.rc                         |  0
 rc/main.rc                                         | 14 ++++++++++++++
 .../curve_interpolation/curve_interpolation.cpp    |  6 +++---
 5 files changed, 28 insertions(+), 11 deletions(-)
 rename main.rc => debug/main.rc (97%)
 rename curve_interpolation.rc => rc/curve_interpolation.rc (100%)
 create mode 100644 rc/main.rc

diff --git a/Makefile b/Makefile
index 170091a..33920b6 100644
--- a/Makefile
+++ b/Makefile
@@ -55,7 +55,12 @@ SCENES = \
 
 include curve_interpolation.mk
 
-$(BUILD_TYPE)/%.res: %.rc $(SHADERS) $(SCENES) $(IMAGES)
+RC_FILES = $(wildcard rc/*.rc)
+
+$(BUILD_TYPE)/main.rc: $(RC_FILES)
+	cat $^ > $@
+
+$(BUILD_TYPE)/%.res: $(BUILD_TYPE)/%.rc $(SHADERS) $(SCENES) $(IMAGES)
 	@mkdir -p $(@D)
 	$(WINDRES) -O coff -I$(BUILD_TYPE)/effect -o $@ $<
 
@@ -72,7 +77,7 @@ include/scenes/%.hpp: $(COLLADA_PY_SOURCE)
 
 src/scenes/%.cpp: scenes/%.DAE include/scenes/%.hpp
 	@mkdir -p $(@D)
-	PYTHONPATH=. python -m collada.main $< $@ $(<:.DAE=.vtx) $(<:.DAE=.idx) $(notdir $(<:.DAE=.rc)) $(notdir $(<:.DAE=.mk))
+	PYTHONPATH=. python -m collada.main $< $@ $(<:.DAE=.vtx) $(<:.DAE=.idx) rc/$(notdir $(<:.DAE=.rc)) $(notdir $(<:.DAE=.mk))
 
 #	$(BUILD_TYPE)/curve_interpolation.res \
 
diff --git a/main.rc b/debug/main.rc
similarity index 97%
rename from main.rc
rename to debug/main.rc
index 4a68417..ee18074 100644
--- a/main.rc
+++ b/debug/main.rc
@@ -1,3 +1,7 @@
+_AMERICAN_CHERRY_PNG RCDATA "image/american_cherry.DDS"
+_102_PNG RCDATA "image/102.DDS"
+_FINISHES_FLOORING_TILE_SQUARE_MEDIUM_BLUE_PNG RCDATA "image/Finishes.Flooring.Tile.Square.Medium Blue.DDS"
+_SITEWORK_PLANTING_GRASS_BERMUDA1_JPG RCDATA "image/SiteWork.Planting.Grass.Bermuda1.DDS"
 RES_MAIN_FXO RCDATA "main.fxo"
 RES_FONT_FXO RCDATA "font.fxo"
 RES_VOLUME_FXO RCDATA "volume.fxo"
@@ -12,9 +16,3 @@ RES_COLLADA_FXO RCDATA "collada.fxo"
 RES_COLLADA_SCENE_FXO RCDATA "collada_scene.fxo"
 RES_MODELS_CURVE_INTERPOLATION_VTX RCDATA "scenes/curve_interpolation/curve_interpolation.vtx"
 RES_MODELS_CURVE_INTERPOLATION_IDX RCDATA "scenes/curve_interpolation/curve_interpolation.idx"
-
-
-_AMERICAN_CHERRY_PNG RCDATA "image/american_cherry.DDS"
-_102_PNG RCDATA "image/102.DDS"
-_FINISHES_FLOORING_TILE_SQUARE_MEDIUM_BLUE_PNG RCDATA "image/Finishes.Flooring.Tile.Square.Medium Blue.DDS"
-_SITEWORK_PLANTING_GRASS_BERMUDA1_JPG RCDATA "image/SiteWork.Planting.Grass.Bermuda1.DDS"
diff --git a/curve_interpolation.rc b/rc/curve_interpolation.rc
similarity index 100%
rename from curve_interpolation.rc
rename to rc/curve_interpolation.rc
diff --git a/rc/main.rc b/rc/main.rc
new file mode 100644
index 0000000..9524891
--- /dev/null
+++ b/rc/main.rc
@@ -0,0 +1,14 @@
+RES_MAIN_FXO RCDATA "main.fxo"
+RES_FONT_FXO RCDATA "font.fxo"
+RES_VOLUME_FXO RCDATA "volume.fxo"
+RES_BLOOM_FXO RCDATA "bloom.fxo"
+RES_STATIC_FXO RCDATA "static.fxo"
+//RES_PERLIN RCDATA "texture/perlin.data"
+RES_ROBOT_PLAYER RCDATA "models/robot_player/robot_player.DDS"
+RES_FONT_TERMINUS_6X12 RCDATA "font/terminus_128x64_6x12.data"
+
+RES_COLLADA_FXO RCDATA "collada.fxo"
+
+RES_COLLADA_SCENE_FXO RCDATA "collada_scene.fxo"
+RES_MODELS_CURVE_INTERPOLATION_VTX RCDATA "scenes/curve_interpolation/curve_interpolation.vtx"
+RES_MODELS_CURVE_INTERPOLATION_IDX RCDATA "scenes/curve_interpolation/curve_interpolation.idx"
diff --git a/src/scenes/curve_interpolation/curve_interpolation.cpp b/src/scenes/curve_interpolation/curve_interpolation.cpp
index f7f6775..698ded8 100644
--- a/src/scenes/curve_interpolation/curve_interpolation.cpp
+++ b/src/scenes/curve_interpolation/curve_interpolation.cpp
@@ -1629,9 +1629,9 @@ instance_light const instance_lights_node_geosphere[] = {
 };
 
 channel const * const node_channels_node_geosphere[] = {
-  &node_channel_node_geosphere_scale,
   &node_channel_node_geosphere_inversescaleaxisrotation,
   &node_channel_node_geosphere_scaleaxisrotation,
+  &node_channel_node_geosphere_scale,
 };
 
 node const node_node_geosphere = {
@@ -1669,9 +1669,9 @@ instance_light const instance_lights_node_light[] = {
 };
 
 channel const * const node_channels_node_light[] = {
-  &node_channel_node_light_translation_y,
-  &node_channel_node_light_translation_x,
   &node_channel_node_light_translation_z,
+  &node_channel_node_light_translation_x,
+  &node_channel_node_light_translation_y,
 };
 
 node const node_node_light = {