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

AssimpJSONLoader: rename sample to assimp2json.

acgessler 11 years ago
parent
a31350f540
commit
19a71e9bc0
3 changed files with 10 additions and 2 deletions
Unified View Show Diff Stats
  1. 1 1
      examples/index.html
  2. 8 0
      examples/js/loaders/AssimpJSONLoader.js
  3. 1 1
      examples/webgl_loader_assimp2json.html

+ 1 - 1
examples/index.html
View File 

@@ -169,7 +169,7 @@
 
 				"webgl_lines_dashed",
 
 				"webgl_lines_dashed",
 
 				"webgl_lines_sphere",
 
 				"webgl_lines_sphere",
 
 				"webgl_lines_splines",
 
 				"webgl_lines_splines",
 
-				"webgl_loader_assimpjson_any",
 
+				"webgl_loader_assimp2json",
 
 				"webgl_loader_collada",
 
 				"webgl_loader_collada",
 
 				"webgl_loader_collada_keyframe",
 
 				"webgl_loader_collada_keyframe",
 
 				"webgl_loader_ctm",
 
 				"webgl_loader_ctm",

+ 8 - 0
examples/js/loaders/AssimpJSONLoader.js
View File 

@@ -1,6 +1,14 @@
 
 /**
 
 /**
 
  * @author Alexander Gessler / http://www.greentoken.de/
 
  * @author Alexander Gessler / http://www.greentoken.de/
 
  * https://github.com/acgessler
 
  * https://github.com/acgessler
 
+ *
 
+ * Loader for models imported with Open Asset Import Library (http://assimp.sf.net)
 
+ * through assimp2json (https://github.com/acgessler/assimp2json).
 
+ *
 
+ * Supports any input format that assimp supports, including 3ds, obj, dae, blend,
 
+ * fbx, x, ms3d, lwo (and many more).
 
+ *
 
+ * See webgl_loader_assimp2json example.
 
  */
 
  */
 
 
 
 THREE.AssimpJSONLoader = function ( manager ) {
 
 THREE.AssimpJSONLoader = function ( manager ) {

+ 1 - 1
examples/webgl_loader_assimpjson_any.html → examples/webgl_loader_assimp2json.html
View File 

@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 
 <!DOCTYPE html>
 
 <html lang="en">
 
 <html lang="en">
 
 	<head>
 
 	<head>
 
-		<title>three.js webgl - collada - blender</title>
 
+		<title>three.js webgl - Open Asset Import Library (assimp) / assimp2json</title>
 
 		<meta charset="utf-8">
 
 		<meta charset="utf-8">
 
 		<meta name="viewport" content="width=device-width, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0">
 
 		<meta name="viewport" content="width=device-width, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0">
 
 		<style>
 
 		<style>