remove check for voxelize() in Scene.

armory3d · Jan 29, 2024 · 6514b6a · 6514b6a
1 parent 3bc780c
commit 6514b6a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/Sources/iron/RenderPath.hx b/Sources/iron/RenderPath.hx
@@ -302,11 +302,6 @@ class RenderPath {
 
 		if (!drawn) submitDraw(context);
 
-		#if (rp_voxels != "Off")
-		if (context == "voxel")
-			armory.renderpath.RenderPathCreator.clipmapLevel = (armory.renderpath.RenderPathCreator.clipmapLevel + 1) % Main.voxelgiClipmapCount;
-		#end
-
 		#if arm_debug
 		// Callbacks to specific context
 		if (contextEvents != null) {

diff --git a/Sources/iron/Scene.hx b/Sources/iron/Scene.hx
@@ -213,9 +213,6 @@ class Scene {
 		Data.getSceneRaw(sceneName, function(format: TSceneFormat) {
 			Scene.create(format, function(o: Object) {
 				if (done != null) done(o);
-				#if rp_voxels // Revoxelize
-				RenderPath.active.voxelized = 0;
-				#end
 
 				#if (rp_background == "World")
 				if (removeWorldShader != null) {

diff --git a/Sources/iron/object/MeshObject.hx b/Sources/iron/object/MeshObject.hx
@@ -359,6 +359,11 @@ class MeshObject extends Object {
 		#if arm_veloc
 		prevMatrix.setFrom(transform.worldUnpack);
 		#end
+
+		#if (rp_voxels != "Off")
+		if (context == "voxel")
+			armory.renderpath.RenderPathCreator.clipmapLevel = (armory.renderpath.RenderPathCreator.clipmapLevel + 1) % Main.voxelgiClipmapCount;
+		#end
 	}
 
 	function validContext(mats: Vector<MaterialData>, context: String): Bool {

diff --git a/Sources/iron/object/Uniforms.hx b/Sources/iron/object/Uniforms.hx
@@ -180,7 +180,7 @@ class Uniforms {
 					if (isImage) {
 						g.setImageTexture(context.textureUnits[j], rt.image); // image2D/3D
 						// Multiple voxel volumes, always set params
-						g.setTexture3DParameters(context.textureUnits[j], TextureAddressing.Clamp, TextureAddressing.Clamp, TextureAddressing.Clamp, TextureFilter.LinearFilter, TextureFilter.PointFilter, MipMapFilter.LinearMipFilter);
+						g.setTexture3DParameters(context.textureUnits[j], TextureAddressing.Clamp, TextureAddressing.Clamp, TextureAddressing.Clamp, TextureFilter.LinearFilter, TextureFilter.LinearFilter, MipMapFilter.LinearMipFilter);
 						paramsSet = true;
 					}
 					else if (rt.isCubeMap) {