Home Explore Help
Register Sign In
zhangyupeng
/
Babylon.js
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Fixes materials library's testing page

zhutq 8 years ago
parent
849140138c
commit
bb8fc05d01
7 changed files with 6 additions and 5 deletions
Unified View Show Diff Stats
  1. 1 1
      Tools/Gulp/config.json
  2. BIN
      assets/meshes/0.jpg
  3. 1 0
      assets/meshes/Rabbit.babylon.manifest
  4. 1 1
      materialsLibrary/index.html
  5. 1 1
      materialsLibrary/src/fur/readme.md
  6. 1 1
      materialsLibrary/test/addfur.js
  7. 1 1
      materialsLibrary/test/addterrain.js

+ 1 - 1
Tools/Gulp/config.json
View File 

@@ -1266,7 +1266,7 @@
 
             {
 
             {
 
                 "files": [
 
                 "files": [
 
                     "../../canvas2D/src/Tools/babylon.math2D.ts",
 
                     "../../canvas2D/src/Tools/babylon.math2D.ts",
 
-                    "../../canvas2D/src/Tools/babylon.iPropertyChanged.ts",
 
+                    "../../canvas2D/src/Tools/babylon.IPropertyChanged.ts",
 
                     "../../canvas2D/src/Tools/babylon.c2dlogging.ts",
 
                     "../../canvas2D/src/Tools/babylon.c2dlogging.ts",
 
                     "../../canvas2D/src/Tools/babylon.observableArray.ts",
 
                     "../../canvas2D/src/Tools/babylon.observableArray.ts",
 
                     "../../canvas2D/src/Tools/babylon.observableStringDictionary.ts",
 
                     "../../canvas2D/src/Tools/babylon.observableStringDictionary.ts",

BIN
assets/meshes/0.jpg
View File


+ 1 - 0
assets/meshes/Rabbit.babylon.manifest
View File 

@@ -0,0 +1 @@
 
+{"version" : 1,    "enableSceneOffline" : true,    "enableTexturesOffline" : true}

+ 1 - 1
materialsLibrary/index.html
View File 

@@ -3,7 +3,7 @@
 
 <head>
 
 <head>
 
 	<title>Shaders Library</title>
 
 	<title>Shaders Library</title>
 
 	<script src="../assets/refs/dat.gui.min.js"></script>
 
 	<script src="../assets/refs/dat.gui.min.js"></script>
 
-	<script src="../tools/DevLoader/BabylonLoader.js"></script>
 
+	<script src="../Tools/DevLoader/BabylonLoader.js"></script>
 
 
 
 	<style>
 
 	<style>
 
 		html, body {
 
 		html, body {

+ 1 - 1
materialsLibrary/src/fur/readme.md
View File 

@@ -46,7 +46,7 @@ The leopard fur texture used in the test is by Martin Wegmann from [Wikimedia Co
 
 under the [license](https://creativecommons.org/licenses/by-sa/3.0/deed.en)
 
 under the [license](https://creativecommons.org/licenses/by-sa/3.0/deed.en)
 
 
 
 ```
 
 ```
 
-furMaterial.diffuseTexture = new BABYLON.Texture("leopard_fur.jpg", scene); // Set the fur length with a texture.
 
+furMaterial.diffuseTexture = new BABYLON.Texture("leopard_fur.JPG, scene); // Set the fur length with a texture.
 
 ```
 
 ```
 
 
 
 # Using the High Level mode
 
 # Using the High Level mode

+ 1 - 1
materialsLibrary/test/addfur.js
View File 

@@ -2,7 +2,7 @@ window.prepareFur = function() {
 
 	var shells = 30;

 	var shells = 30;

 	var meshes = [];

 	var meshes = [];

 	

 	

-	var diffuseTexture = new BABYLON.Texture("../assets/textures/leopard_fur.jpg", scene);

+	var diffuseTexture = new BABYLON.Texture("../assets/textures/leopard_fur.JPG", scene);

 	var heightTexture = new BABYLON.Texture("../assets/textures/speckles.jpg", scene);

 	var heightTexture = new BABYLON.Texture("../assets/textures/speckles.jpg", scene);

 	var furTexture = BABYLON.FurMaterial.GenerateTexture("furTexture", scene);

 	var furTexture = BABYLON.FurMaterial.GenerateTexture("furTexture", scene);

+ 1 - 1
materialsLibrary/test/addterrain.js
View File 

@@ -7,7 +7,7 @@ window.prepareTerrain = function() {
 
     terrain.diffuseTexture2 = new BABYLON.Texture("../assets/textures/rock.png", scene);

     terrain.diffuseTexture2 = new BABYLON.Texture("../assets/textures/rock.png", scene);

     terrain.diffuseTexture3 = new BABYLON.Texture("../assets/textures/grass.png", scene);

     terrain.diffuseTexture3 = new BABYLON.Texture("../assets/textures/grass.png", scene);

     

     

-    terrain.bumpTexture1 = new BABYLON.Texture("../assets/textures/floor_bump.png", scene);

+    terrain.bumpTexture1 = new BABYLON.Texture("../assets/textures/floor_bump.PNG", scene);

     terrain.bumpTexture2 = new BABYLON.Texture("../assets/textures/rockn.png", scene);

     terrain.bumpTexture2 = new BABYLON.Texture("../assets/textures/rockn.png", scene);

     terrain.bumpTexture3 = new BABYLON.Texture("../assets/textures/grassn.png", scene);

     terrain.bumpTexture3 = new BABYLON.Texture("../assets/textures/grassn.png", scene);