瀏覽代碼

last fixes

Julien MOREAU-MATHIS 7 年之前
父節點
當前提交
0311f01481

二進制
Playground/textures/mixMap_2.png


+ 1 - 1
materialsLibrary/src/mix/babylon.mixMaterial.ts

@@ -329,7 +329,7 @@ module BABYLON {
                         }
                         }
                         if (this._diffuseTexture6) {
                         if (this._diffuseTexture6) {
                             this._activeEffect.setTexture("diffuse6Sampler", this._diffuseTexture6);
                             this._activeEffect.setTexture("diffuse6Sampler", this._diffuseTexture6);
-                            this._activeEffect.setFloat2("diffuse66nfos", this._diffuseTexture6.uScale, this._diffuseTexture6.vScale);
+                            this._activeEffect.setFloat2("diffuse6Infos", this._diffuseTexture6.uScale, this._diffuseTexture6.vScale);
                         }
                         }
                         if (this._diffuseTexture7) {
                         if (this._diffuseTexture7) {
                             this._activeEffect.setTexture("diffuse7Sampler", this._diffuseTexture7);
                             this._activeEffect.setTexture("diffuse7Sampler", this._diffuseTexture7);

+ 1 - 1
materialsLibrary/src/mix/mix.fragment.fx

@@ -132,7 +132,7 @@ void main(void) {
    	diffuse7Color.rgb = mix(diffuse6Color.rgb, diffuse7Color.rgb, mixColor.b);
    	diffuse7Color.rgb = mix(diffuse6Color.rgb, diffuse7Color.rgb, mixColor.b);
 	mixColor.rgb = mix(diffuse7Color.rgb, diffuse8Color.rgb, 1.0 - mixColor.a);
 	mixColor.rgb = mix(diffuse7Color.rgb, diffuse8Color.rgb, 1.0 - mixColor.a);
 
 
-	finalMixColor.rgb = mix(finalMixColor.rgb, mixColor.rgb, 1.0);
+	finalMixColor.rgb = mix(finalMixColor.rgb, mixColor.rgb, 0.5);
 #endif
 #endif
 	
 	
 #endif
 #endif

+ 2 - 2
materialsLibrary/test/addMix.js

@@ -16,13 +16,13 @@ window.prepareMix = function() {
     mix.diffuseTexture4.uScale = mix.diffuseTexture4.vScale = 10;
     mix.diffuseTexture4.uScale = mix.diffuseTexture4.vScale = 10;
 
 
     mix.diffuseTexture5 = new BABYLON.Texture("/playground/textures/leopard_fur.jpg", scene);
     mix.diffuseTexture5 = new BABYLON.Texture("/playground/textures/leopard_fur.jpg", scene);
-    mix.diffuseTexture6 = new BABYLON.Texture("/playground/textures/wood.jpg", scene);
+    mix.diffuseTexture6 = new BABYLON.Texture("/playground/textures/fur.jpg", scene);
     mix.diffuseTexture7 = new BABYLON.Texture("/playground/textures/sand.jpg", scene);
     mix.diffuseTexture7 = new BABYLON.Texture("/playground/textures/sand.jpg", scene);
     mix.diffuseTexture8 = new BABYLON.Texture("/playground/textures/crate.png", scene);
     mix.diffuseTexture8 = new BABYLON.Texture("/playground/textures/crate.png", scene);
 
 
     mix.diffuseTexture5.uScale = mix.diffuseTexture5.vScale = 10;
     mix.diffuseTexture5.uScale = mix.diffuseTexture5.vScale = 10;
     mix.diffuseTexture6.uScale = mix.diffuseTexture6.vScale = 10;
     mix.diffuseTexture6.uScale = mix.diffuseTexture6.vScale = 10;
-    mix.diffuseTexture7.uScale = mix.diffuseTexture7.vScale = 10;
+    mix.diffuseTexture7.uScale = mix.diffuseTexture7.vScale = 5;
     mix.diffuseTexture8.uScale = mix.diffuseTexture8.vScale = 10;
     mix.diffuseTexture8.uScale = mix.diffuseTexture8.vScale = 10;
     
     
     return mix;
     return mix;