Merge branch 'main' of https://github.com/YoshiCrafter29/CodenameEngine

buildnumber.txt

@@ -1 +1 @@
-1799
+1799

source/flx3d/Flx3DUtil.hx

@@ -1,6 +1,7 @@
 package flx3d;
 
 import away3d.core.managers.Stage3DManager;
+import away3d.library.assets.IAsset;
 import flixel.FlxG;
 
 /**
@@ -12,11 +13,19 @@ import flixel.FlxG;
  */
 class Flx3DUtil
 {
+	/**
+	 * Returns the total amount of 3D stages (not exculding the ones in use)
+	 * @return Int
+	 */
 	public static inline function getTotal3D():Int
 	{
 		return FlxG.stage.stage3Ds.length;
 	}
 
+	/**
+	 * Returns if a Stage3D is available
+	 * @return Bool
+	 */
 	public static inline function is3DAvailable():Bool
 	{
 		@:privateAccess {
@@ -26,4 +35,17 @@ class Flx3DUtil
 			return Stage3DManager._numStageProxies < Stage3DManager._stageProxies.length;
 		}
 	}
+
+	/**
+	 * Calls dispose() (destroy) on a Away3D asset
+	 * @param obj 
+	 * @return null
+	 */
+	public static inline function dispose<T:IAsset>(obj:Null<T>):T
+	{
+		if (obj != null)
+			obj.dispose();
+
+		return null;
+	}
 }

source/flx3d/Flx3DView.hx

@@ -1,6 +1,7 @@
 package flx3d;
 
-import away3d.loaders.misc.AssetLoaderToken;
+import flixel.FlxG;
+import flx3d.Flx3DUtil;
 import away3d.library.assets.Asset3DType;
 import away3d.events.Asset3DEvent;
 import away3d.loaders.parsers.*;
@@ -15,12 +16,14 @@ import away3d.loaders.Loader3D;
 // FlxView3D with helpers for easier updating
 
 class Flx3DView extends FlxView3D {
+    public var _loader:Loader3D;
 
-    public function new(x:Float = 0, y:Float = 0, width:Int = -1, height:Int = -1, scale:Float = 1) {
+    public function new(x:Float = 0, y:Float = 0, width:Int = -1, height:Int = -1) {
         if (!Flx3DUtil.is3DAvailable())
-            throw "[Flx3DView] 3D is not available on this platform.";
-        super(x, y, width, height, scale);
+            throw "[Flx3DView] 3D is not available on this platform. Stages in use: " + Flx3DUtil.getTotal3D() + ", Max stages allowed: " + FlxG.stage.stage3Ds.length + ".";
+        super(x, y, width, height);
     }
+
     public function initLoader() {
         if (_loader != null) return;
         _loader = new Loader3D();

source/flx3d/FlxView3D.hx

@@ -1,12 +1,7 @@
 package flx3d;
 
-import away3d.entities.Mesh;
-import funkin.system.Main;
 import away3d.containers.View3D;
-import away3d.events.LoaderEvent;
 import away3d.library.assets.IAsset;
-import away3d.loaders.Loader3D;
-import away3d.loaders.misc.AssetLoaderContext;
 import flixel.FlxG;
 import flixel.FlxSprite;
 import openfl.display.BitmapData;
@@ -20,87 +15,104 @@ import openfl.display.BitmapData;
  */
 class FlxView3D extends FlxSprite
 {
-	public var view:View3D;
-
 	@:noCompletion private var bmp:BitmapData;
 
-	private var _loader:Loader3D;
-	private var assetLoaderContext:AssetLoaderContext = new AssetLoaderContext();
+	/**
+	 * The Away3D View 
+	 */
+	public var view:View3D;
 
-	public function new(x:Float = 0, y:Float = 0, width:Int = -1, height:Int = -1, scale:Float = 1)
+	/**
+	 * Set this flag to true to force the View3D to update during the `draw()` call.
+	 */
+	 public var dirty3D:Bool = true;
+
+	/**
+	 * Creates a new instance of a View3D from Away3D and renders it as a FlxSprite
+	 * ! Call Flx3DUtil.is3DAvailable(); to make sure a 3D stage is usable
+	 * @param x 
+	 * @param y 
+	 * @param width Leave as -1 for screen width
+	 * @param height Leave as -1 for screen height
+	 */
+	public function new(x:Float = 0, y:Float = 0, width:Int = -1, height:Int = -1)
 	{
 		super(x, y);
 
-		frameRate = 60;
-
 		view = new View3D();
 		view.visible = false;
-		Main.instance.addChildAt(view, 0);
 
 		view.width = width == -1 ? FlxG.width : width;
 		view.height = height == -1 ? FlxG.height : height;
-		view.backgroundAlpha = 0;
-		view.alpha = 0;
-		bmp = new BitmapData(Std.int(view.width), Std.int(view.height), true, 0x0);
 
+		view.backgroundAlpha = 0;
+		FlxG.stage.addChildAt(view, 0);
+
+		bmp = new BitmapData(Std.int(view.width), Std.int(view.height), true, 0x0);
 		loadGraphic(bmp);
 	}
 
-	private function dispose<T:IAsset>(obj:Null<T>):T // ! CALL THIS WHEN YOU DESTROY YOUR SCENE
+	/**
+	 * Disposes (destroys) the asset and returns null
+	 * @param obj 
+	 * @return T null
+	 */
+	public static function dispose<T:IAsset>(obj:Null<T>):T
 	{
-		if (obj != null)
-			obj.dispose();
-		return null;
+		return Flx3DUtil.dispose(obj);
 	}
 
+	/**
+	 * Disposes of all the Away3D assets associated with the FlxView3D
+	 */
 	override function destroy()
 	{
-		Main.instance.removeChild(view);
-		view.dispose();
-		_loader.disposeWithChildren();
+		FlxG.stage.removeChild(view);
 		super.destroy();
+
 		if (bmp != null)
 		{
 			bmp.dispose();
 			bmp = null;
 		}
-		view = null;
-		assetLoaderContext = null;
+
+		if (view != null) 
+		{
+			view.dispose();
+			view = null;
+		}
+	
 	}
 
-	@:isVar public var frameRate(default, set):Float;
-
-	public function set_frameRate(value:Float)
-	{
-		delay = 1 / value;
-		return frameRate = value;
-	}
-
-	public var renderEveryFrame:Bool = true;
-
-	@:noCompletion private var delay:Float = 0;
-	@:noCompletion private var drawTimer:Float = 0;
-
-	override function update(elapsed:Float)
-	{
-		super.update(elapsed);
-		drawTimer += elapsed;
-	}
-
-	override function draw()
+	@:noCompletion override function draw()
 	{
 		super.draw();
 
-		if (renderEveryFrame || drawTimer > delay)
+		if (dirty3D)
 		{
-			Main.instance.addChildAt(view, 0);
+			view.visible = false;
+			FlxG.stage.addChildAt(view, 0);
+
 			var old = FlxG.game.filters;
 			FlxG.game.filters = null;
+
 			view.renderer.queueSnapshot(bmp);
 			view.render();
-			drawTimer = 0;
+
 			FlxG.game.filters = old;
-			Main.instance.removeChild(view);
+			FlxG.stage.removeChild(view);
 		}
 	}
+
+	@:noCompletion override function set_width(newWidth:Float):Float
+	{
+		super.set_width(newWidth);
+		return view != null ? view.width = width : width;
+	}
+
+	@:noCompletion override function set_height(newHeight:Float):Float
+	{
+		super.set_height(newHeight);
+		return view != null ? view.height = height : height;
+	}
 }