add away3d to build macro + use cne away3d

Vortex2Oblivion · Mar 23, 2024 · 3521a15 · 3521a15
1 parent 796d022
commit 3521a15
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 8 deletions.
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -41,7 +41,7 @@ jobs:
           haxelib install flixel-addons
           haxelib git linc_luajit https://github.com/Leather128/linc_luajit.git
           haxelib git hscript-improved https://github.com/FNF-CNE-Devs/hscript-improved
-          haxelib install away3d
+          haxelib git away3d https://github.com/FNF-CNE-Devs/away3d
           haxelib install systools
           haxelib git scriptless-polymod https://github.com/swordcube/scriptless-polymod
           haxelib install hxvlc
@@ -104,7 +104,7 @@ jobs:
           haxelib install flixel-screenshot-plugin
           haxelib git flxanimate https://github.com/Dot-Stuff/flxanimate
           haxelib git hxNoise https://github.com/whuop/hxNoise
-          haxelib install away3d
+          haxelib git away3d https://github.com/FNF-CNE-Devs/away3d
           haxelib list
       - name: Create Version Tag
         run: echo "${{github.run_id}}" > VERSION
@@ -143,7 +143,7 @@ jobs:
           haxelib git hscript-improved https://github.com/FNF-CNE-Devs/hscript-improved
           haxelib install HxWebView
           haxelib git scriptless-polymod https://github.com/swordcube/scriptless-polymod
-          haxelib install away3d
+          haxelib git away3d https://github.com/FNF-CNE-Devs/away3d
           haxelib git hxNoise https://github.com/whuop/hxNoise
           haxelib install hxvlc
           haxelib install openfl
@@ -188,7 +188,7 @@ jobs:
           haxelib run lime setup flixel
           haxelib run lime setup
           haxelib install flixel-tools
-          haxelib install away3d
+          haxelib git away3d https://github.com/FNF-CNE-Devs/away3d
           haxelib install flixel-ui
           haxelib install flixel-addons
           haxelib git linc_luajit https://github.com/Leather128/linc_luajit.git

diff --git a/Project.xml b/Project.xml
@@ -112,9 +112,9 @@
 	<haxelib name="flxanimate" />
 	<haxelib name="flixelTextureAtlas" />
 	<haxelib name="discord_rpc" if="desktop" />
-	<haxelib name="linc_luajit" if="LUA_ALLOWED" />
+	<haxelib name="linc_luajit" if="LUA_ALLOWED" version="git" url="https://github.com/Leather128/linc_luajit.git" />
 	<haxelib name="flixel-screenshot-plugin" if="SCREENSHOTS_ALLOWED"/>
-	<haxelib name="away3d" if="THREE_D_ALLOWED" />
+	<haxelib name="away3d" if="THREE_D_ALLOWED" version="git" url="https://github.com/FNF-CNE-Devs/away3d" />
 	<haxelib name="hxvlc" if="VIDEOS_ALLOWED" />
 	<haxelib name="HxWebView" if="windows" unless="linux || mac" />
 	<haxelib name="hxNoise"/>
@@ -155,6 +155,7 @@
 	<haxeflag name="--macro" value="include('flixel.ui')" />
 	<haxeflag name="--macro" value="include('flixel.util')" />
 	<haxeflag name="--macro" value="include('flx3D')" if="THREE_D_ALLOWED" />
+	<haxeflag name="--macro" value="include('away3d')" if="THREE_D_ALLOWED" />
 	<haxeflag name="--macro" value="include('hxvlc')" if="VIDEOS_ALLOWED" />
 	<haxeflag name="--macro" value="include('sys')" if="sys" unless="web" />
 

diff --git a/build/install_libraries.bat b/build/install_libraries.bat
@@ -19,4 +19,5 @@ haxelib git scriptless-polymod https://github.com/swordcube/scriptless-polymod
 haxelib git flixelTextureAtlas https://github.com/Smokey555/Flixel-TextureAtlas.git
 haxelib git fnf-modcharting-tools https://github.com/Vortex2Oblivion/FNF-Modcharting-Tools
 haxelib git flxanimate https://github.com/Dot-Stuff/flxanimate
+haxelib git away3d https://github.com/FNF-CNE-Devs/away3d
 echo done
diff --git a/build/install_libraries.sh b/build/install_libraries.sh
@@ -19,4 +19,5 @@ haxelib git scriptless-polymod https://github.com/swordcube/scriptless-polymod
 haxelib git flixelTextureAtlas https://github.com/Smokey555/Flixel-TextureAtlas.git
 haxelib git fnf-modcharting-tools https://github.com/Vortex2Oblivion/FNF-Modcharting-Tools
 haxelib git flxanimate https://github.com/Dot-Stuff/flxanimate
+haxelib git away3d https://github.com/FNF-CNE-Devs/away3d
 echo done
diff --git a/source/modding/ModchartUtilities.hx b/source/modding/ModchartUtilities.hx
@@ -386,6 +386,7 @@ class ModchartUtilities {
         });
 
 		setLuaFunction("print", function(str:Dynamic = "") {
+			Sys.println(str);
             Logs.debug(str);
         });
 

diff --git a/source/modding/scripts/languages/HScript.hx b/source/modding/scripts/languages/HScript.hx
@@ -195,7 +195,7 @@ class HScript
 				interp.variables.set(classes[classes.length - 1], enum_new);
 			}
 			else
-				trace(class_name + " isn't a valid class or enum!");
+				trace(class_name + " isn't a valid class or enum!", WARNING);
 		});
 
 		interp.variables.set("trace", function(value:Dynamic)

diff --git a/source/states/PlayState.hx b/source/states/PlayState.hx
@@ -2244,7 +2244,9 @@ class PlayState extends MusicBeatState {
 
 		if (!switchedStates) {
 			if (!(Conductor.songPosition > 20 && FlxG.sound.music.time < 20)) {
+				#if debug
 				trace('Resynced Vocals {Conductor.songPosition: ${Conductor.songPosition}, FlxG.sound.music.time: ${FlxG.sound.music.time} / ${FlxG.sound.music.length}}');
+				#end
 
 				vocals.pause();
 				FlxG.sound.music.pause();
@@ -2260,7 +2262,9 @@ class PlayState extends MusicBeatState {
 				vocals.play();
 			} else {
 				while (Conductor.songPosition > 20 && FlxG.sound.music.time < 20) {
+					#if debug
 					trace('Resynced Vocals {Conductor.songPosition: ${Conductor.songPosition}, FlxG.sound.music.time: ${FlxG.sound.music.time} / ${FlxG.sound.music.length}}');
+					#end
 
 					FlxG.sound.music.time = Conductor.songPosition;
 					vocals.time = Conductor.songPosition;
@@ -2470,7 +2474,7 @@ class PlayState extends MusicBeatState {
 			{
 				var midPos = dad.getMainCharacter().getMidpoint();
 
-				if(utilities.Options.getData("cameraTracksDirections") && dad.animation.curAnim != null)
+				if(Options.getData("cameraTracksDirections") && dad.animation.curAnim != null)
 				{
 					switch(dad.animation.curAnim.name.toLowerCase())
 					{
-Original file line number
+Diff line change
@@ Expand Up / @@ -386,6 +386,7 @@ class ModchartUtilities { @@
             });
     		setLuaFunction("print", function(str:Dynamic = "") {
+    			Sys.println(str);
                 Logs.debug(str);
             });
@@ Expand Down @@