From 3a8a6bc15d14d9d6258ac5d94403089523f0d4a9 Mon Sep 17 00:00:00 2001 From: lunarcleint <88809950+lunarcleint@users.noreply.github.com> Date: Fri, 23 Jun 2023 22:32:56 -0700 Subject: [PATCH] flx3d compilier flag --- project.xml | 7 ++++++- source/away3d/core/managers/Stage3DProxy.hx | 4 +++- source/flx3d/Flx3DCamera.hx | 8 ++++++-- source/flx3d/Flx3DUtil.hx | 4 ++++ source/flx3d/Flx3DView.hx | 7 +++++-- source/flx3d/FlxView3D.hx | 6 +++++- 6 files changed, 29 insertions(+), 7 deletions(-) diff --git a/project.xml b/project.xml index b5b898c5..58fe0406 100644 --- a/project.xml +++ b/project.xml @@ -148,6 +148,9 @@ + + + @@ -170,7 +173,9 @@ - +
+ +
diff --git a/source/away3d/core/managers/Stage3DProxy.hx b/source/away3d/core/managers/Stage3DProxy.hx index 057da05b..5e1263d5 100644 --- a/source/away3d/core/managers/Stage3DProxy.hx +++ b/source/away3d/core/managers/Stage3DProxy.hx @@ -1,5 +1,6 @@ package away3d.core.managers; +#if THREE_D_SUPPORT import away3d.debug.Debug; import away3d.events.Stage3DEvent; @@ -711,4 +712,5 @@ class Stage3DProxy extends EventDispatcher ib.uploadFromVector(data, startOffset, count); _ibUploadCount++; } -} \ No newline at end of file +} +#end \ No newline at end of file diff --git a/source/flx3d/Flx3DCamera.hx b/source/flx3d/Flx3DCamera.hx index 183b7225..e6e10079 100644 --- a/source/flx3d/Flx3DCamera.hx +++ b/source/flx3d/Flx3DCamera.hx @@ -1,5 +1,6 @@ package flx3d; +#if THREE_D_SUPPORT import away3d.entities.SegmentSet; import away3d.cameras.Camera3D; import away3d.entities.TextureProjector; @@ -25,10 +26,12 @@ import openfl.Assets; import away3d.entities.Mesh; import away3d.loaders.Loader3D; import funkin.backend.utils.NativeAPI.ConsoleColor; -import flixel.FlxCamera; import away3d.containers.View3D; +#end +import flixel.FlxCamera; class Flx3DCamera extends FlxCamera { + #if THREE_D_SUPPORT private static var __3DIDS:Int = 0; public var view:View3D; @@ -169,6 +172,7 @@ class Flx3DCamera extends FlxCamera { super.destroy(); } - public inline function addChild(c) + public function addChild(c) view.scene.addChild(c); + #end } \ No newline at end of file diff --git a/source/flx3d/Flx3DUtil.hx b/source/flx3d/Flx3DUtil.hx index f23788ae..9a5e0b53 100644 --- a/source/flx3d/Flx3DUtil.hx +++ b/source/flx3d/Flx3DUtil.hx @@ -1,8 +1,10 @@ package flx3d; +#if THREE_D_SUPPORT import away3d.core.managers.Stage3DManager; import away3d.library.assets.IAsset; import flixel.FlxG; +#end /** * @author lunarclient @@ -13,6 +15,7 @@ import flixel.FlxG; */ class Flx3DUtil { + #if THREE_D_SUPPORT /** * Returns the total amount of 3D stages (not excluding the ones in use) * @return Int @@ -48,4 +51,5 @@ class Flx3DUtil return null; } + #end } diff --git a/source/flx3d/Flx3DView.hx b/source/flx3d/Flx3DView.hx index 98df3181..b034190d 100644 --- a/source/flx3d/Flx3DView.hx +++ b/source/flx3d/Flx3DView.hx @@ -1,5 +1,6 @@ package flx3d; +#if THREE_D_SUPPORT import away3d.entities.SegmentSet; import away3d.cameras.Camera3D; import away3d.entities.TextureProjector; @@ -25,10 +26,11 @@ import openfl.Assets; import away3d.entities.Mesh; import away3d.loaders.Loader3D; import funkin.backend.utils.NativeAPI.ConsoleColor; +#end // FlxView3D with helpers for easier updating - class Flx3DView extends FlxView3D { + #if THREE_D_SUPPORT private static var __3DIDS:Int = 0; var meshes:Array = []; @@ -138,6 +140,7 @@ class Flx3DView extends FlxView3D { super.destroy(); } - public inline function addChild(c) + public function addChild(c) view.scene.addChild(c); + #end } \ No newline at end of file diff --git a/source/flx3d/FlxView3D.hx b/source/flx3d/FlxView3D.hx index 416a87f8..11137eed 100644 --- a/source/flx3d/FlxView3D.hx +++ b/source/flx3d/FlxView3D.hx @@ -1,10 +1,12 @@ package flx3d; +#if THREE_D_SUPPORT import away3d.containers.View3D; import away3d.library.assets.IAsset; import flixel.FlxG; -import flixel.FlxSprite; import openfl.display.BitmapData; +#end +import flixel.FlxSprite; /** * @author Ne_Eo @@ -15,6 +17,7 @@ import openfl.display.BitmapData; */ class FlxView3D extends FlxSprite { + #if THREE_D_SUPPORT @:noCompletion private var bmp:BitmapData; /** @@ -114,4 +117,5 @@ class FlxView3D extends FlxSprite super.set_height(newHeight); return view != null ? view.height = height : height; } + #end }