soft reset (cleanup)

Sources/iron/RenderPath.hx

@@ -73,6 +73,23 @@ class RenderPath {
 	public static var numTrisShadow = 0;
 	#end
 
+	#if (rp_voxels != "Off")
+	static var voxelized = 0;
+	public function voxelize() : Bool {
+		if(iron.Scene.active.camera.transform.diff() && armory.renderpath.RenderPathCreator.clipmapLevel == 0) {
+			voxelized = 0;
+		}
+		else
+			for (mesh in iron.Scene.active.meshes) {
+				if (mesh.transform.diff() && armory.renderpath.RenderPathCreator.clipmapLevel == 0) {
+					voxelized = 0;
+					break;
+				}
+			}
+		return ++voxelized > Main.voxelgiClipmapCount ? false : true;
+	}
+	#end
+
 	public static function setActive(renderPath: RenderPath) {
 		active = renderPath;
 	}
@@ -124,7 +141,6 @@ class RenderPath {
 		commands();
 
 		if (!isProbe) frame++;
-
 	}
 
 	public function setTarget(target: String, additional: Array<String> = null, viewportScale = 1.0) {

Sources/iron/data/ShaderData.hx

@@ -81,7 +81,7 @@ class ShaderContext {
 	public function new(raw: TShaderContext, done: ShaderContext->Void, overrideContext: TShaderOverride = null) {
 		this.raw = raw;
 		#if (rp_voxels == "Off")
-		if (raw.name == "voxel") {
+		if (raw.name == "voxel" || raw.name == "voxelbounce") {
 			done(this);
 			return;
 		}

Sources/iron/object/MeshObject.hx

@@ -25,7 +25,8 @@ class MeshObject extends Object {
 	public var cameraDistance: Float;
 	public var screenSize = 0.0;
 	public var frustumCulling = true;
-	public var tilesheet: Tilesheet = null;
+	public var activeTilesheet: Tilesheet = null;
+	public var tilesheets: Array<Tilesheet> = null;
 	public var skip_context: String = null; // Do not draw this context
 	public var force_context: String = null; // Draw only this context
 	static var lastPipeline: PipelineState = null;
@@ -79,7 +80,8 @@ class MeshObject extends Object {
 			particleSystems = null;
 		}
 		#end
-		if (tilesheet != null) tilesheet.remove();
+		if (activeTilesheet != null) activeTilesheet.remove();
+		if (tilesheets != null) for (ts in tilesheets) { ts.remove(); }
 		if (Scene.active != null) Scene.active.meshes.remove(this);
 		data.refcount--;
 		super.remove();
@@ -115,7 +117,29 @@ class MeshObject extends Object {
 	#end
 
 	public function setupTilesheet(sceneName: String, tilesheet_ref: String, tilesheet_action_ref: String) {
-		tilesheet = new Tilesheet(sceneName, tilesheet_ref, tilesheet_action_ref);
+		activeTilesheet = new Tilesheet(sceneName, tilesheet_ref, tilesheet_action_ref);
+		if(tilesheets == null) tilesheets = new Array<Tilesheet>();
+		tilesheets.push(activeTilesheet);
+	}
+
+	public function setActiveTilesheet(sceneName: String, tilesheet_ref: String, tilesheet_action_ref: String) {
+		var set = false;
+		// Check if tilesheet already created
+		if (tilesheets != null) {
+			for (ts in tilesheets) {
+				if (ts.raw.name == tilesheet_ref) {
+					activeTilesheet = ts;
+					activeTilesheet.play(tilesheet_action_ref);
+					set = true;
+					break;
+				}
+			}
+		}
+		// If not already created
+		if (!set) {
+			setupTilesheet(sceneName, tilesheet_ref, tilesheet_action_ref);
+		}
+
 	}
 
 	inline function isLodMaterial(): Bool {
@@ -157,7 +181,7 @@ class MeshObject extends Object {
 			// particleSystems for update, particleOwner for render
 			if (particleSystems != null || particleOwner != null) radiusScale *= 1000;
 			#end
-			if (context == "voxel") radiusScale *= 100;
+			if (context == "voxel" || context == "voxelbounce") radiusScale *= 100;
 			if (data.geom.instanced) radiusScale *= 100;
 			var isShadow = context == "shadowmap";
 			var frustumPlanes = isShadow ? light.frustumPlanes : camera.frustumPlanes;
@@ -242,7 +266,7 @@ class MeshObject extends Object {
 		if (raw != null && raw.lods != null && raw.lods.length > 0) {
 			computeScreenSize(Scene.active.camera);
 			initLods();
-			if (context == "voxel") {
+			if (context == "voxel" || context == "voxelbounce") {
 				// Voxelize using the lowest lod
 				lod = cast lods[lods.length - 1];
 			}

Sources/iron/object/ParticleSystem.hx

@@ -101,10 +101,10 @@ class ParticleSystem {
 		dimx = object.transform.dim.x;
 		dimy = object.transform.dim.y;
 
-		if (object.tilesheet != null) {
-			tilesx = object.tilesheet.raw.tilesx;
-			tilesy = object.tilesheet.raw.tilesy;
-			tilesFramerate = object.tilesheet.raw.framerate;
+		if (object.activeTilesheet != null) {
+			tilesx = object.activeTilesheet.raw.tilesx;
+			tilesy = object.activeTilesheet.raw.tilesy;
+			tilesFramerate = object.activeTilesheet.raw.framerate;
 		}
 
 		// Animate

Sources/iron/object/Tilesheet.hx

@@ -59,6 +59,23 @@ class Tilesheet {
 		Scene.active.tilesheets.remove(this);
 	}
 
+	/**
+	 * Set the frame of the current active tilesheet action. Automatically un-pauses action.
+	 * @param frame Frame offset with 0 as the first frame of the active action.
+	 **/
+	public function setFrameOffset(frame: Int) {
+		setFrame(action.start + frame);
+		paused = false;
+	}
+
+	/**
+	 * Returns the current frame.
+	 * @return Frame offset with 0 as the first frame of the active action.
+	 */
+	public function getFrameOffset(): Int {
+		return frame - action.start;
+	}
+
 	function update() {
 		if (!ready || paused || action.start >= action.end) return;
 

Sources/iron/object/Uniforms.hx

@@ -939,6 +939,34 @@ class Uniforms {
 					helpMat3.setFrom4(helpMat);
 					m = helpMat3;
 				}
+				case "_normalMatrixSphere": {
+					helpMat.setFrom(object.transform.world);
+					// Align to camera..
+					helpMat.multmat(camera.V);
+					helpMat._00 = 1.0; helpMat._10 = 0.0; helpMat._20 = 0.0;
+					helpMat._01 = 0.0; helpMat._11 = 1.0; helpMat._21 = 0.0;
+					helpMat._02 = 0.0; helpMat._12 = 0.0; helpMat._22 = 1.0;
+					helpMat2.getInverse(camera.V);
+					helpMat.multmat(helpMat2);
+					helpMat2.getInverse(helpMat);
+					helpMat2.transpose3x3();
+					helpMat3.setFrom4(helpMat2);
+					m = helpMat3;
+				}
+				case "_normalMatrixCylinder": {
+					helpMat.setFrom(object.transform.world);
+					// Align to camera..
+					helpMat.multmat(camera.V);
+					helpMat._00 = 1.0; helpMat._20 = 0.0;
+					helpMat._01 = 0.0; helpMat._21 = 0.0;
+					helpMat._02 = 0.0; helpMat._22 = 1.0;
+					helpMat2.getInverse(camera.V);
+					helpMat.multmat(helpMat2);
+					helpMat2.getInverse(helpMat);
+					helpMat2.transpose3x3();
+					helpMat3.setFrom4(helpMat2);
+					m = helpMat3;
+				}
 				case "_viewMatrix3": {
 					#if arm_centerworld
 					helpMat3.setFrom4(vmat(camera.V));
@@ -1016,10 +1044,15 @@ class Uniforms {
 			var vy: Null<kha.FastFloat> = null;
 			switch (c.link) {
 				case "_tilesheetOffset": {
-					var ts = cast(object, MeshObject).tilesheet;
+					var ts = cast(object, MeshObject).activeTilesheet;
 					vx = ts.tileX;
 					vy = ts.tileY;
 				}
+				case "_tilesheetTiles": {
+					var ts = cast(object, MeshObject).activeTilesheet;
+					vx = ts.raw.tilesx;
+					vy = ts.raw.tilesy;
+				}
 				#if arm_morph_target
 				case "_morphScaleOffset": {
 					var mt = cast(object, MeshObject).morphTarget;