Add support for metallic-roughness textures

mokiat · Sep 29, 2024 · b080ced · b080ced
1 parent b9895a0
commit b080ced
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 7 deletions.
diff --git a/game/asset/dsl/provider_model.go b/game/asset/dsl/provider_model.go
@@ -213,6 +213,8 @@ func BuildModelResource(gltfDoc *gltf.Document, forceCollision bool) (*mdl.Model
 			}
 			if texIndex := gltfutil.MetallicRoughnessTextureIndex(gltfDoc, gltfPBR); texIndex != nil {
 				metallicRoughnessTextureIndex = texIndex
+				sampler := samplersFromIndex[*texIndex]
+				sampler.Texture().SetLinear(true)
 			}
 		} else {
 			color = sprec.NewVec4(1.0, 1.0, 1.0, 1.0)
@@ -771,17 +773,26 @@ func createPBRShader(cfg pbrShaderConfig) string {
 
 	if cfg.hasAlphaTesting {
 		sourceCode += `
-				if #color.a < alphaThreshold {
-					discard
-				}
+			if #color.a < alphaThreshold {
+				discard
+			}
 		`
 	}
 
-	sourceCode += `
+	if cfg.hasMetallicRoughnessTexture {
+		sourceCode += `
+			var metallicRoughness vec4 = sample(metallicRoughnessSampler, #vertexUV)
+			#metallic = metallicRoughness.b
+			#roughness = metallicRoughness.g
+		`
+	} else {
+		sourceCode += `
 			#metallic = metallic
 			#roughness = roughness
-		}
-	`
+		`
+	}
+
+	sourceCode += `}`
 
 	return sourceCode
 }

diff --git a/game/asset/mdl/converter.go b/game/asset/mdl/converter.go
@@ -837,7 +837,7 @@ func (c *Converter) convertTexture(texture *Texture) (uint32, error) {
 	default:
 		return 0, fmt.Errorf("unsupported texture kind %d", texture.Kind())
 	}
-	if isLikelyLinearSpace(texture.format) {
+	if isLikelyLinearSpace(texture.format) || texture.isLinear {
 		flags |= asset.TextureFlagLinearSpace
 	}
 	if texture.generateMipmaps {

diff --git a/game/asset/mdl/texture.go b/game/asset/mdl/texture.go
@@ -45,6 +45,7 @@ type Texture struct {
 	height          int
 	format          TextureFormat
 	generateMipmaps bool
+	isLinear        bool
 	layers          []TextureLayer
 }
 
@@ -83,6 +84,14 @@ func (t *Texture) SetFormat(format TextureFormat) {
 	}
 }
 
+func (t *Texture) Linear() bool {
+	return t.isLinear
+}
+
+func (t *Texture) SetLinear(isLinear bool) {
+	t.isLinear = isLinear
+}
+
 func (t *Texture) GenerateMipmaps() bool {
 	return t.generateMipmaps
 }