set filtering options for voxels images.

armory3d · Mar 22, 2024 · 3a590f9 · 3a590f9
1 parent cae82b1
commit 3a590f9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/Sources/iron/RenderPath.hx b/Sources/iron/RenderPath.hx
@@ -116,7 +116,7 @@ class RenderPath {
 		armory.renderpath.RenderPathCreator.clipmapLevel = (armory.renderpath.RenderPathCreator.clipmapLevel + 1) % Main.voxelgiClipmapCount;
 		var clipmap = armory.renderpath.RenderPathCreator.clipmaps[armory.renderpath.RenderPathCreator.clipmapLevel];
 
-		clipmap.voxelSize = Main.voxelgiVoxelSize * Math.pow(2.0, armory.renderpath.RenderPathCreator.clipmapLevel);
+		clipmap.voxelSize = armory.renderpath.RenderPathCreator.clipmaps[0].voxelSize * Math.pow(2.0, armory.renderpath.RenderPathCreator.clipmapLevel);
 
 		var texelSize = 2.0 * clipmap.voxelSize;
 		var camera = iron.Scene.active.camera;

diff --git a/Sources/iron/object/Uniforms.hx b/Sources/iron/object/Uniforms.hx
@@ -178,9 +178,14 @@ 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.PointFilter, TextureFilter.PointFilter, MipMapFilter.NoMipFilter);
+						g.setImageTexture(context.textureUnits[j], rt.image); // image2D/3D
+						if (rt.raw.depth <= 1) {
+							g.setTextureParameters(context.textureUnits[j], TextureAddressing.Clamp, TextureAddressing.Clamp, TextureFilter.LinearFilter, TextureFilter.LinearFilter, MipMapFilter.LinearMipFilter);
+						}
+						else {
+							g.setTexture3DParameters(context.textureUnits[j], TextureAddressing.Clamp, TextureAddressing.Clamp, TextureAddressing.Clamp, TextureFilter.LinearFilter, TextureFilter.LinearFilter, MipMapFilter.NoMipFilter);
+						}
 						paramsSet = true;
 					}
 					else if (rt.isCubeMap) {