Home Explore Help
Sign In
javascript
/
three.js
mirror of https://github.com/tazdij/three.js.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Merge pull request #13322 from looeee/move_lightmap_model

EXAMPLES: Move lightmap model to correct folder
Mr.doob 7 years ago
parent
f9acfa090f 2c07cd4d4b
commit
ceab820259
7 changed files with 1 additions and 1 deletions
Split View Show Diff Stats
  1. 0 0
      examples/models/json/lightmap/lightmap-ao-shadow.png
  2. 0 0
      examples/models/json/lightmap/lightmap.json
  3. 0 0
      examples/models/json/lightmap/readme.txt
  4. 0 0
      examples/models/json/lightmap/rocks.jpg
  5. BIN
      examples/models/json/lightmap/stone.jpg
  6. BIN
      examples/obj/lightmap/stone.jpg
  7. 1 1
      examples/webgl_materials_lightmap.html

+ 0 - 0
examples/obj/lightmap/lightmap-ao-shadow.png → examples/models/json/lightmap/lightmap-ao-shadow.png
View File


+ 0 - 0
examples/obj/lightmap/lightmap.js → examples/models/json/lightmap/lightmap.json
View File


+ 0 - 0
examples/obj/lightmap/readme.txt → examples/models/json/lightmap/readme.txt
View File


+ 0 - 0
examples/obj/lightmap/rocks.jpg → examples/models/json/lightmap/rocks.jpg
View File


BIN
examples/models/json/lightmap/stone.jpg
View File


BIN
examples/obj/lightmap/stone.jpg
View File


+ 1 - 1
examples/webgl_materials_lightmap.html
View File 

@@ -141,7 +141,7 @@
 
 				// MODEL
 
 
 				var loader = new THREE.JSONLoader();
 
-				loader.load( "obj/lightmap/lightmap.js", function ( geometry, materials ) {
 
+				loader.load( "models/json/lightmap/lightmap.json", function ( geometry, materials ) {
 
 
 					for ( var i = 0; i < materials.length; i ++ ) {