MD2 Clean up.

examples/index.html

@@ -258,6 +258,8 @@
 				"webgl_loader_gltf",
 				"webgl_loader_json_blender",
 				"webgl_loader_json_objconverter",
+				"webgl_loader_md2",
+				"webgl_loader_md2_control",
 				"webgl_loader_msgpack",
 				"webgl_loader_obj",
 				"webgl_loader_obj_mtl",
@@ -315,8 +317,6 @@
 				"webgl_morphtargets",
 				"webgl_morphtargets_horse",
 				"webgl_morphtargets_human",
-				"webgl_morphtargets_md2",
-				"webgl_morphtargets_md2_control",
 				"webgl_multiple_canvases_circle",
 				"webgl_multiple_canvases_complex",
 				"webgl_multiple_canvases_grid",

examples/js/MD2Character.js

@@ -39,7 +39,7 @@ THREE.MD2Character = function () {
 
 		// BODY
 
-		var loader = new THREE.JSONLoader();
+		var loader = new THREE.MD2Loader();
 
 		loader.load( config.baseUrl + config.body, function( geo ) {
 
@@ -199,8 +199,8 @@ THREE.MD2Character = function () {
 
 	function createPart( geometry, skinMap ) {
 
-		var materialWireframe = new THREE.MeshBasicMaterial( { color: 0xffaa00, wireframe: true, shading: THREE.SmoothShading, morphTargets: true } );
-		var materialTexture = new THREE.MeshBasicMaterial( { color: 0xffffff, wireframe: false, shading: THREE.SmoothShading, map: skinMap, morphTargets: true } );
+		var materialWireframe = new THREE.MeshLambertMaterial( { color: 0xffaa00, wireframe: true, shading: THREE.SmoothShading, morphTargets: true, morphNormals: true } );
+		var materialTexture = new THREE.MeshLambertMaterial( { color: 0xffffff, wireframe: false, shading: THREE.SmoothShading, map: skinMap, morphTargets: true, morphNormals: true } );
 
 		//
 

examples/js/MD2CharacterComplex.js

@@ -152,7 +152,7 @@ THREE.MD2CharacterComplex = function () {
 
 		// BODY
 
-		var loader = new THREE.JSONLoader();
+		var loader = new THREE.MD2Loader();
 
 		loader.load( config.baseUrl + config.body, function( geo ) {
 
@@ -522,8 +522,8 @@ THREE.MD2CharacterComplex = function () {
 
 	function createPart( geometry, skinMap ) {
 
-		var materialWireframe = new THREE.MeshBasicMaterial( { color: 0xffaa00, wireframe: true, shading: THREE.SmoothShading, morphTargets: true } );
-		var materialTexture = new THREE.MeshBasicMaterial( { color: 0xffffff, wireframe: false, shading: THREE.SmoothShading, map: skinMap, morphTargets: true } );
+		var materialWireframe = new THREE.MeshLambertMaterial( { color: 0xffaa00, wireframe: true, shading: THREE.SmoothShading, morphTargets: true, morphNormals: true } );
+		var materialTexture = new THREE.MeshLambertMaterial( { color: 0xffffff, wireframe: false, shading: THREE.SmoothShading, map: skinMap, morphTargets: true, morphNormals: true } );
 
 		//
 

examples/models/animated/ratamahatta/ratamahatta.txt

@@ -1,73 +0,0 @@
-11-02-98
-
-================================================================
-
-Model Name              : Ratamahatta
-
-installation directory  : quake2/baseq2/players/Ratamahatta
-
-Author                  : Brian "EvilBastard" Collins
-
-additional skins by     :
-
-	'Gearwhore'  by MrRogers
-	'Jaws'       by Claudius Brunnecker
-
-Email Address           : [email protected]
-
-Website Address         : http://www.deviousassassins.com/EvilBastard/
-
-Model description       : 
-
-	It's been a long time in the making, but he's finaly done. This PPM is the prize of the Bodyshop Q2 tournament won by Tank Abbot. I hope he likes it  ;P
-
-Model Info	        :
-	Ratamahatta is a fun loving guy, who like to pull the wings off files, and similarly amusing things. After a long day of gratuitous destruction and rolling around in his own filth, Rat always enjoys a spot of tea.
-
-Additional Credits to   : 
-	
-	* Idsoftware 
-	* NST!!! Know it and love it
-
-Thanks to               :
-
-	Npherno and MrRogers for all the help
-	Virus[DA] for hosting my website.
-	Rogue13 and John McPherson for the advise and input.
-
-================================================================
-
-* Play Information *
-
-New Sounds              : NO
-
-CTF Skins               : YES
-
-VWEP Support            : No
-
-
-* Construction *
-
-Poly Count              : 666 tris.md2 / 119 weapon.md2
-
-Vert Count              : 344 tris.md2 / 85 weapon.md2
-
-Skin Count              : 4 DM, 2 CTF
-
-Base		        : Forgotten One
-
-Editor used             : 
-		Modeling - lightwave	
-		Animation- lightwave + puppetmaster
-		Skining  - NST 
-		Painting - Photoshop, NST
-		Viewing  - Skin View 
-		
-Known Bugs              : None that i know of.
-
-
-* Copyright / Permissions *
-QUAKE(R) and QUAKE II(R) are registered trademarks of id Software, Inc.
-Feel free to edit my model as you see fit, just be sure to mention me
-in the readme file. This model is not to be distributed as part of any
-commercial product.

examples/models/animated/ratamahatta/readme.txt

@@ -1,2 +0,0 @@
-Ratamahatta character by Brian Collins
-From http://planetquake.gamespy.com/View.php?view=Quake2.Detail&id=368

examples/webgl_morphtargets_md2.html → examples/webgl_loader_md2.html

@@ -36,15 +36,15 @@
 
 	<body>
 		<div id="info">
-			<a href="http://threejs.org" target="_blank">three.js</a> - morphtargets -
-			MD2 character by <a href="http://planetquake.gamespy.com/View.php?view=Quake2.Detail&id=368">Brian Collins</a><br />
-			converted by <a href="https://twitter.com/#!/oosmoxiecode">@oosmoxiecode</a>'s <a href="http://oos.moxiecode.com/blog/2012/01/md2-to-json-converter/">MD2 converter<a>
+			<a href="http://threejs.org" target="_blank">three.js</a> - MD2 Loader -
+			Character by <a href="http://planetquake.gamespy.com/View.php?view=Quake2.Detail&id=368">Brian Collins</a>
 		</div>
 
 		<script src="../build/three.min.js"></script>
 
 		<script src="js/controls/OrbitControls.js"></script>
 
+		<script src='js/loaders/MD2Loader.js'></script>
 		<script src='js/MD2Character.js'></script>
 
 		<script src='js/Detector.js'></script>
@@ -179,21 +179,21 @@
 
 				var config = {
 
-					baseUrl: "models/animated/ratamahatta/",
+					baseUrl: "models/md2/ratamahatta/",
 
-					body: "ratamahatta.js",
+					body: "ratamahatta.md2",
 					skins: [ "ratamahatta.png", "ctf_b.png", "ctf_r.png", "dead.png", "gearwhore.png" ],
-					weapons:  [  [ "weapon.js", "weapon.png" ],
-								 [ "w_bfg.js", "w_bfg.png" ],
-								 [ "w_blaster.js", "w_blaster.png" ],
-								 [ "w_chaingun.js", "w_chaingun.png" ],
-								 [ "w_glauncher.js", "w_glauncher.png" ],
-								 [ "w_hyperblaster.js", "w_hyperblaster.png" ],
-								 [ "w_machinegun.js", "w_machinegun.png" ],
-								 [ "w_railgun.js", "w_railgun.png" ],
-								 [ "w_rlauncher.js", "w_rlauncher.png" ],
-								 [ "w_shotgun.js", "w_shotgun.png" ],
-								 [ "w_sshotgun.js", "w_sshotgun.png" ]
+					weapons:  [  [ "weapon.md2", "weapon.png" ],
+								 [ "w_bfg.md2", "w_bfg.png" ],
+								 [ "w_blaster.md2", "w_blaster.png" ],
+								 [ "w_chaingun.md2", "w_chaingun.png" ],
+								 [ "w_glauncher.md2", "w_glauncher.png" ],
+								 [ "w_hyperblaster.md2", "w_hyperblaster.png" ],
+								 [ "w_machinegun.md2", "w_machinegun.png" ],
+								 [ "w_railgun.md2", "w_railgun.png" ],
+								 [ "w_rlauncher.md2", "w_rlauncher.png" ],
+								 [ "w_shotgun.md2", "w_shotgun.png" ],
+								 [ "w_sshotgun.md2", "w_sshotgun.png" ]
 								]
 
 				};

examples/webgl_morphtargets_md2_control.html → examples/webgl_loader_md2_control.html

@@ -36,9 +36,8 @@
 
 	<body>
 		<div id="info">
-			<a href="http://threejs.org" target="_blank">three.js</a> - morphtargets -
-			Ogro by <a href="http://planetquake.gamespy.com/View.php?view=Quake2.Detail&id=556">Magarnigal</a> -
-			converted by <a href="https://twitter.com/#!/oosmoxiecode">@oosmoxiecode</a>'s <a href="http://oos.moxiecode.com/blog/2012/01/md2-to-json-converter/">MD2 converter</a><br />
+			<a href="http://threejs.org" target="_blank">three.js</a> - MD2 Loader -
+			Ogro by <a href="http://planetquake.gamespy.com/View.php?view=Quake2.Detail&id=556">Magarnigal</a><br />
 			use arrows to control characters, mouse for camera
 		</div>
 
@@ -46,6 +45,7 @@
 
 		<script src="js/controls/OrbitControls.js"></script>
 
+		<script src='js/loaders/MD2Loader.js'></script>
 		<script src='js/MD2CharacterComplex.js'></script>
 		<script src='js/Gyroscope.js'></script>
 
@@ -173,13 +173,13 @@
 
 				var configOgro = {
 
-					baseUrl: "models/animated/ogro/",
+					baseUrl: "models/md2/ogro/",
 
-					body: "ogro-light.js",
+					body: "ogro.md2",
 					skins: [ "grok.jpg", "ogrobase.png", "arboshak.png", "ctf_r.png", "ctf_b.png", "darkam.png", "freedom.png",
 							 "gib.png", "gordogh.png", "igdosh.png", "khorne.png", "nabogro.png",
 							 "sharokh.png" ],
-					weapons:  [ [ "weapon-light.js", "weapon.jpg" ] ],
+					weapons:  [ [ "weapon.md2", "weapon.jpg" ] ],
 					animations: {
 						move: "run",
 						idle: "stand",