fix ps2 textures, ps2 building

hmxmilohax · Oct 4, 2023 · e591e6e · e591e6e
1 parent ea5ebbe
commit e591e6e
Show file tree

Hide file tree

Showing 31 changed files with 2,297 additions and 16 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,3 +1,4 @@
 # Auto detect text files and perform LF normalization
 * text=auto
 *.dta linguist-language=Common-Lisp
+_ark_ps2/songs/afterlife/afterlife.pss filter=lfs diff=lfs merge=lfs -text
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -83,3 +83,110 @@ jobs:
         with:
           name: RB2DX-PS3
           path: '*.pkg'
+
+build_ps2_ce:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Python 3.9
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.9'
+      - name: Download Mackiloha
+        run: |
+          pip install requests
+          python dependencies/dev_scripts/download_mackiloha.py
+      - name: Set env
+        run: |
+          echo "GITHUB_SHA_SHORT=$(echo $GITHUB_SHA | cut -c 1-7)" >> $GITHUB_ENV
+          echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
+          chmod +x dependencies/linux/arkhelper
+          chmod +x dependencies/linux/dtab
+          chmod +x dependencies/linux/superfreq
+          pip install gitpython
+          pip install mido
+      - name: Remove PS3/Xbox files
+        run: |
+          find . -name "*.*_ps3" -type f -delete
+          find . -name "*.*_xbox" -type f -delete
+      - name: Download PS2 files
+        run: |
+          python dependencies/dev_scripts/download_ps2_action.py
+      - name: Add PS2 files to _ark
+        run: |
+          rm -rf ./_ark/songs
+          mv _ps2_files _ark -f
+          mv _ps2_ark _ark -f
+          rm -rf ./_ark/.git
+          rm -rf ./_ark/README.md
+      - name: Build ARK
+        run: |
+          dependencies/linux/arkhelper dir2ark ./_ark ./_build/ps2/gen -n "MAIN" -e -v 4 -s 4073741823
+      - name: Remove Excess files
+        run: |
+          find . -name "*.txt" -type f -delete
+          find . -name "*.zbm" -type f -delete
+      
+      - name: Upload result
+        uses: actions/upload-artifact@v2
+        with:
+          name: RB2DXCE-PS2
+          path: _build/ps2
+
+build_ps2:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Python 3.9
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.9'
+      - name: Download Mackiloha
+        run: |
+          pip install requests
+          python dependencies/dev_scripts/download_mackiloha.py
+      - name: Set env
+        run: |
+          echo "GITHUB_SHA_SHORT=$(echo $GITHUB_SHA | cut -c 1-7)" >> $GITHUB_ENV
+          echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
+          chmod +x dependencies/linux/arkhelper
+          chmod +x dependencies/linux/dtab
+          chmod +x dependencies/linux/superfreq
+          pip install gitpython
+          pip install mido
+      - name: Remove PS3/Xbox files
+        run: |
+          find . -name "*.*_ps3" -type f -delete
+          find . -name "*.*_xbox" -type f -delete
+      - name: Download PS2 files
+        run: |
+          python dependencies/dev_scripts/download_ps2_action.py
+      - name: Add PS2 files to _ark
+        run: |
+          mv _ps2_files _ark -f
+          mv _ps2_ark _ark -f
+          rm -rf ./_ark/.git
+          rm -rf ./_ark/README.md
+          rm -rf ./_ark/songs
+      - name: Download/Copy RB2 Songs
+        run: |
+          chmod +x dependencies/linux/gdrive
+          dependencies/linux/gdrive account import dependencies/linux/gdrive_key.tar
+          dependencies/linux/gdrive files download 1gTMkLScBkENtSk2EHDweMmlfMi9XMUGK --recursive --destination ./
+          mv ./rb2dxsongs/* ./_ark/songs -f
+      - name: Build ARK
+        run: |
+          dependencies/linux/arkhelper dir2ark ./_ark ./_build/ps2/gen -n "MAIN" -e -v 4 -s 4073741823
+      - name: Remove Excess files
+        run: |
+          find . -name "*.txt" -type f -delete
+          find . -name "*.zbm" -type f -delete
+          rm -rf ./_ark
+      
+      - name: Upload result
+        uses: actions/upload-artifact@v2
+        with:
+          name: RB2DX-PS2
+          path: _build/ps2
diff --git a/.gitignore b/.gitignore
@@ -8,8 +8,9 @@ ta_pkg_repacker_tools
 magick
 _xenia
 _build/xbox/videos/*.bik
-_testbuild
-_ps2
+_tmpbuild
+_ps2_files
+_build/ps2/gen/*
 
 main_xbox_9.ark
 main_xbox_8.ark

diff --git a/_ark/dx/config/dx_macros.dta b/_ark/dx/config/dx_macros.dta
@@ -135,7 +135,11 @@
    {unless $texrunonce
       ;{new Tex transparent.tex} ;the new tex doesnt save so i changed it to an unused existing tex -LX
       {{$this find all_icons.tex} set_bitmap "track/custom_track_textures/_no_highway.png"}
+      #ifdef HX_EE
+      {{$this find smasher_wii.tex} set_bitmap "track/rails/rails_warning_rb2.png"}
+      #else
       {{$this find smasher_plate_orange_nomip.tex} set_bitmap "track/rails/rails_warning_rb2.png"}
+      #endif
    }
 
    {unless $dontrungemdividers
@@ -151,7 +155,8 @@
             (guitar {{{get_guitar_panel} find drum_slots_narrow.mat} set diffuse_tex {$this find beat_marker.tex}})
             (drum {{{get_drum_panel} find drum_slots_narrow.mat} set diffuse_tex {$this find beat_marker.tex}})}}
    }}
-
+
+   #ifndef HX_EE
    {if_else $highwaycustomtexture
       {do
       {{$this find track_reflect_warning.tex} set_bitmap {sprint "track_new/highways/" $highway ".png"}}
@@ -164,6 +169,7 @@
       {{$this find track_reflect_warning.tex} iterate_refs $ref {$ref set intensify {!= $highway "_1_none"}}}
       {{$this find track_reflect.tex} iterate_refs $ref {$ref set intensify {! {modifier_mgr is_modifier_active mod_hwalpha}}}}
    }
+   #endif
 
    {if $voxhwcustomtexture 
       {{$this find vocal_bg.tex} set_bitmap {sprint "track/voxhw/vocal_bg_" $voxhw ".png"}}
@@ -176,6 +182,10 @@
    }
 
    {if $gemcustomtexture
+      #ifdef HX_EE
+      {{$this find prism_gems.tex} set_bitmap {sprint "track_ps2/gems/prism_gems_" $gem ".png"}}
+      {{$this find prism_gems_lod.tex} set_bitmap {sprint "track_ps2/gems/prism_gems_lod_" $gem ".png"}}
+      #else
       {{$this find prism_gems.tex} set_bitmap {sprint "track/gems/prism_gems_" $gem ".png"}}
 	   {{$this find prism_gem_emissive.tex} set_bitmap {sprint "track/gems/prism_gem_emissive_" $gem ".png"}}
 	   {{$this find prism_gem_emissive_3_player.tex} set_bitmap {sprint "track/gems/prism_gem_emissive_3_player_" $gem ".png"}}
@@ -184,10 +194,15 @@
 	   {{$this find prism_green.tex} set_bitmap {sprint "track/gems/prism_green_" $gem ".png"}}
 	   {{$this find prism_red.tex} set_bitmap {sprint "track/gems/prism_red_" $gem ".png"}}
       {{$this find prism_spotlight.tex} set_bitmap {sprint "track/gems/prism_spotlight_" $gem ".png"}}
+      #endif
    }
 
    {if $smashercustomtexture
-   {do
+      #ifdef HX_EE
+      {{$this find smasher_color_ps2.tex} set_bitmap {sprint "track_ps2/smashers/smasher_color_" $smasher ".png"}}
+      {{$this find smasher_ps2.tex} set_bitmap {sprint "track_ps2/smashers/smasher_" $smasher ".png"}}
+      {{$this find square_smasher_bright.tex} set_bitmap {sprint "track_ps2/smashers/square_smasher_bright_" $smasher ".png"}}
+      #else
       {{$this find black_smasher_blue_nomip.tex} set_bitmap {sprint "track_new/smashers/black_smasher_blue_" $smasher ".png"}}
       {{$this find black_smasher_green_nomip.tex} set_bitmap {sprint "track_new/smashers/black_smasher_green_" $smasher ".png"}}
       {{$this find black_smasher_norm.tex} set_bitmap {sprint "track_new/smashers/black_smasher_norm_" $smasher ".png"}}
@@ -207,14 +222,16 @@
       {{$this find flare_blue.tex} set_bitmap {sprint "track_new/smashers/flare_blue_" $smasher ".png"}}
       {{$this find flare_orange.tex} set_bitmap {sprint "track_new/smashers/flare_orange_" $smasher ".png"}}
       {{$this find flare_style.tex} set_bitmap {sprint "track_new/smashers/flare_style_" $smasher ".png"}}
-   }
+      #endif
    }
 
    {if $flamescustomtexture
       {{$this find radial_shockwave.tex} set_bitmap {sprint "track_new/flames/radial_shockwave_" $flames ".png"}}
       {{$this find radial_shockwave_subtract.tex} set_bitmap {sprint "track_new/flames/radial_shockwave_subtract_" $flames ".png"}}
       {{$this find shockwave.tex} set_bitmap {sprint "track_new/flames/shockwave_" $flames ".png"}}
+      #ifndef HX_EE
       {{$this find flare_orange_kick_smasher.tex} set_bitmap {sprint "track_new/flames/flare_orange_kick_smasher_" $flames ".png"}}
+      #endif
       {{$this find flare_light_can_star.tex} set_bitmap {sprint "track_new/flames/flare_light_can_star_" $flames ".png"}}
       {{$this find broken_glass01.tex} set_bitmap {sprint "track_new/flames/broken_glass01_" $flames ".png"}}
       {{$this find broken_glass02.tex} set_bitmap {sprint "track_new/flames/broken_glass02_" $flames ".png"}}
@@ -229,25 +246,28 @@
    }
 
    {if $voxnotescustomtexture
-	  {{$this find 3d_tube_pitched.tex} set_bitmap {sprint "track/voxnotes/3d_tube_pitched_" $voxnotes ".png"}}
-	  {{$this find tube_1.tex} set_bitmap {sprint "track/voxnotes/3d_tube_pitched_star_anim1_" $voxnotes ".png"}}
-	  {{$this find tube_2.tex} set_bitmap {sprint "track/voxnotes/3d_tube_pitched_star_anim2_" $voxnotes ".png"}}
-	  {{$this find tube_3.tex} set_bitmap {sprint "track/voxnotes/3d_tube_pitched_star_anim3_" $voxnotes ".png"}}
-	  {{$this find tube_4.tex} set_bitmap {sprint "track/voxnotes/3d_tube_pitched_star_anim4_" $voxnotes ".png"}}
+	   {{$this find 3d_tube_pitched.tex} set_bitmap {sprint "track/voxnotes/3d_tube_pitched_" $voxnotes ".png"}}
+	   {{$this find tube_1.tex} set_bitmap {sprint "track/voxnotes/3d_tube_pitched_star_anim1_" $voxnotes ".png"}}
+	   {{$this find tube_2.tex} set_bitmap {sprint "track/voxnotes/3d_tube_pitched_star_anim2_" $voxnotes ".png"}}
+	   {{$this find tube_3.tex} set_bitmap {sprint "track/voxnotes/3d_tube_pitched_star_anim3_" $voxnotes ".png"}}
+	   {{$this find tube_4.tex} set_bitmap {sprint "track/voxnotes/3d_tube_pitched_star_anim4_" $voxnotes ".png"}}
    }
 
    {if $voxodcustomtexture
-	  {{$this find sunburst.tex} set_bitmap {sprint "track/voxod/sunburst_" $voxod ".png"}}
-	  {{$this find freestyle_nowbar_FX.tex} set_bitmap {sprint "track/voxod/vox_now_bar_effect_" $voxod ".png"}}
+	   {{$this find sunburst.tex} set_bitmap {sprint "track/voxod/sunburst_" $voxod ".png"}}
+	   {{$this find freestyle_nowbar_FX.tex} set_bitmap {sprint "track/voxod/vox_now_bar_effect_" $voxod ".png"}}
    }
 
    {if $scorecustomtexture
       {{$this find indv_player_meter_circle.tex} set_bitmap {sprint "track/score/indv_player_meter_circle_" $scoretex ".png"}}
       {{$this find indv_player_meter_glass.tex} set_bitmap {sprint "track/score/indv_player_meter_glass_" $scoretex ".png"}}
-	  {{$this find indv_player_meter_glow.tex} set_bitmap {sprint "track/score/indv_player_meter_glow_" $scoretex ".png"}}
-	  {{$this find indv_player_meter.png} set_bitmap {sprint "track/score/indv_player_meter_" $scoretex ".png"}}
-	  {{$this find star_sheet.tex} set_bitmap {sprint "track/score/star_power_" $scoretex ".png"}}
-	  {{$this find score_meter_wipe.tex} set_bitmap {sprint "track/score/score_meter_wipe_" $scoretex ".png"}}
+	   {{$this find indv_player_meter_glow.tex} set_bitmap {sprint "track/score/indv_player_meter_glow_" $scoretex ".png"}}
+	   {{$this find indv_player_meter.png} set_bitmap {sprint "track/score/indv_player_meter_" $scoretex ".png"}}
+	   {{$this find star_sheet.tex} set_bitmap {sprint "track/score/star_power_" $scoretex ".png"}}
+	   {{$this find score_meter_wipe.tex} set_bitmap {sprint "track/score/score_meter_wipe_" $scoretex ".png"}}
+      #ifdef HX_EE
+      {{$this find score_meter_wipe.tex} iterate_refs $ref {$ref set color {pack_color 1.0 1.0 1.0}}}
+      #endif
    }
 
    {if $odbarcustomtexture
@@ -270,20 +290,35 @@
 
    {if $railscustomtexture
       {{$this find rails.tex} set_bitmap {sprint "track/rails/rails_" $rails ".png"}}
+      #ifdef HX_EE
+      {{$this find smasher_wii.tex} set_bitmap {sprint "track/rails/rails_warning_" $rails ".png"}}
+      #else
       {{$this find smasher_plate_orange_nomip.tex} set_bitmap {sprint "track/rails/rails_warning_" $rails ".png"}}
+      #endif
       {set $railsset TRUE}
    }
 
    {if $railsset
       {{$this find rails.tex} iterate_refs $ref {$ref set intensify {!= $rails "rb2"}}}
+      #ifdef HX_EE
+      {{$this find smasher_wii.tex} iterate_refs $ref {$ref set intensify {!= $rails "rb2"}}}
+      #else
       {{$this find smasher_plate_orange_nomip.tex} iterate_refs $ref {$ref set intensify {!= $rails "rb2"}}}
+      #endif
       {if {== $rails none}
          {{$this find rails.tex} iterate_refs $ref {$ref set intensify FALSE}}
+         #ifdef HX_EE
+         {{$this find smasher_wii.tex} iterate_refs $ref {$ref set intensify FALSE}}
+         #else
          {{$this find smasher_plate_orange_nomip.tex} iterate_refs $ref {$ref set intensify FALSE}}
+         #endif
       }
    }
 
    {if $spotlightgtrcustomtexture
+      #ifdef HX_EE
+      {{$this find spotlight_guitar_track.tex} set_bitmap {sprint "track_ps2/spotlight/" $spotlightgtr ".png"}}
+      #else
       {{$this find spotlight_guitar_track.tex} set_bitmap {sprint "track_new/spotlight/" $spotlightgtr ".png"}}
       ;{{$this find spotlight_guitar_track.tex} iterate_refs $ref {$ref set color {pack_color 1 0 0}}}
       ; will implement when im done being lazy
@@ -295,9 +330,13 @@
             {{$this find spotlight_guitar_track_emmissive.tex} set_bitmap "track/custom_track_textures/_no_highway.png"}
          }
       }
+      #endif
    }
 
    {if $spotlightbasscustomtexture
+      #ifdef HX_EE
+      {{$this find spotlight_bass_track.tex} set_bitmap {sprint "track_ps2/spotlight/" $spotlightbass ".png"}}
+      #else
       {{$this find spotlight_bass_track.tex} set_bitmap {sprint "track_new/spotlight/" $spotlightbass ".png"}}
       ;{{$this find spotlight_bass_track.tex} iterate_refs $ref {$ref set color {pack_color 1 0 0}}}
       ; will implement when im done being lazy
@@ -309,12 +348,17 @@
             {{$this find spotlight_bass_track_emissive.tex} set_bitmap "track/custom_track_textures/_no_highway.png"}
          }
       }
+      #endif
    }
 
    {if $spotlightdrumcustomtexture
+      #ifdef HX_EE
+      {{$this find spotlight_drums_track.tex} set_bitmap {sprint "track_ps2/spotlight/" $spotlightdrum ".png"}}
+      #else
       {{$this find spotlight_drums_track.tex} set_bitmap {sprint "track_new/spotlight/" $spotlightdrum ".png"}}
       ;{{$this find spotlight_drums_track.tex} iterate_refs $ref {$ref set color {pack_color 1 0 0}}}
       ; will implement when im done being lazy
+      #endif
    }
 
 ;after all of the queued texture updates are completed, set them to false so they do not run again until a new texture is queued via overshell

diff --git a/_ark/dx/ui/dx_init.dta b/_ark/dx/ui/dx_init.dta
@@ -20,8 +20,12 @@
 ;gem texture
 {set $gem "rb2dx"}
 
+#ifndef HX_EE ; this texture doesn't exist on ps2
 ;strikeline texture
 {set $smasher "rb2dx"}
+#else
+{set $smasher "rb2"}
+#endif
 
 ;highway texture
 {set $highway "_1_none"}
@@ -47,8 +51,12 @@
 ;rails texture
 {set $rails "rb2"}
 
+#ifndef HX_EE ; this texture is different on ps2
 ;flames texture
 {set $flames "rb2dx"}
+#else
+{set $flames "rb2"}
+#endif
 
 ;score texture
 {set $scoretex "rb4"}