Merge pull request #211 from e2002e/gi_clipmaps

Gi clipmaps
armory3d · Apr 25, 2024 · 6b61f10 · 6b61f10
2 parents 99922de + 1f95083
commit 6b61f10
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
@@ -689,7 +689,7 @@ class RenderPath {
 			// Image only
 			var img = Image.create3D(width, height, depth,
 				t.format != null ? getTextureFormat(t.format) : TextureFormat.RGBA32);
-			if (t.mipmaps) img.generateMipmaps(1000); // Allocate mipmaps
+			if (t.mipmaps) img.generateMipmaps(Main.voxelgiClipmapCount); // Allocate mipmaps
 				return img;
 		}
 		else { // 2D texture

diff --git a/Sources/iron/object/Uniforms.hx b/Sources/iron/object/Uniforms.hx
@@ -183,8 +183,13 @@ class Uniforms {
 						if (rt.raw.name.startsWith("voxels_")) {
 							g.setTextureParameters(context.textureUnits[j], TextureAddressing.Clamp, TextureAddressing.Clamp, TextureFilter.LinearFilter, TextureFilter.LinearFilter, MipMapFilter.LinearMipFilter);
 						}
-						else if (rt.raw.name.startsWith("voxels")) {
-							g.setTexture3DParameters(context.textureUnits[j], TextureAddressing.Mirror, TextureAddressing.Mirror, TextureAddressing.Mirror, TextureFilter.LinearFilter, TextureFilter.PointFilter, MipMapFilter.NoMipFilter);
+						else if (rt.raw.name.startsWith("voxelsOut"))
+						{
+							g.setTexture3DParameters(context.textureUnits[j], TextureAddressing.Clamp, TextureAddressing.Clamp, TextureAddressing.Clamp, TextureFilter.PointFilter, TextureFilter.PointFilter, MipMapFilter.LinearMipFilter);
+						}
+						else if (rt.raw.name.startsWith("voxels"))
+						{
+							g.setTexture3DParameters(context.textureUnits[j], TextureAddressing.Clamp, TextureAddressing.Clamp, TextureAddressing.Clamp, TextureFilter.LinearFilter, TextureFilter.LinearFilter, MipMapFilter.NoMipFilter);
 						}
 						paramsSet = true;
 					}