Merging with orgicus' branch.

e72b82cd · Mr.doob · 3f16e363 · e72b82cd · e72b82cd · e72b82cd
39 changed file
--- a/.DS_Store
+++ b/.DS_Store
--- a/build/Three.js
+++ b/build/Three.js
--- a/build/ThreeDebug.js
+++ b/build/ThreeDebug.js
--- a/build/ThreeExtras.js
+++ b/build/ThreeExtras.js
--- a/examples/.DS_Store
+++ b/examples/.DS_Store
--- a/examples/blender249_dice.html
+++ b/examples/blender249_dice.html
--- a/examples/c4d_coloured_box.html
+++ b/examples/c4d_coloured_box.html
+<!DOCTYPE HTML>
+<html lang="en">
+	<head>
+		<title>three.js - geometry - c4d mesh</title>
+		<meta charset="utf-8">
+		<meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;"/>
+		<style type="text/css">
+			body {
+				font-family: Monospace;
+				background-color: #000000;
+				color: #DEDEDE;
+				margin: 0px;
+				overflow: hidden;
+			}
+		</style>
+	</head>
+	<body>
+
+		<script type="text/javascript" src="../build/Three.js"></script>
+
+		<script type="text/javascript" src="geometry/Box6.js"></script>
+
+		<script type="text/javascript" src="js/Stats.js"></script>
+
+		<script type="text/javascript">
+	//*
+			var SCREEN_WIDTH = window.innerWidth;
+			var SCREEN_HEIGHT = window.innerHeight;
+
+			var container;
+			var stats;
+
+			var camera;
+			var scene;
+			var renderer;
+
+			var model,material;
+
+			var targetRotation = 0;
+			var targetRotationOnMouseDown = 0;
+
+			var mouseX = 0;
+			var mouseXOnMouseDown = 0;
+
+			var windowHalfX = window.innerWidth / 2;
+			var windowHalfY = window.innerHeight / 2;
+
+			init();
+			setInterval(loop, 1000/60);
+
+			function init() {
+
+				container = document.createElement('div');
+				document.body.appendChild(container);
+
+				var info = document.createElement('div');
+				info.style.position = 'absolute';
+				info.style.top = '10px';
+				info.style.width = '100%';
+				info.style.textAlign = 'center';
+				info.innerHTML = 'Drag to spin';
+				container.appendChild(info);
+
+				camera = new THREE.Camera( 70, SCREEN_WIDTH / SCREEN_HEIGHT, 1, 10000 );
+				camera.position.y = 250;
+				camera.position.z = 500;
+				camera.target.position.y = 50;
+
+				scene = new THREE.Scene();
+
+				//model
+				var geometry = new Box6();
+				geometry.autoColor();
+				model = new THREE.Mesh( geometry, new THREE.MeshFaceMaterial());
+				model.rotation.x = Math.PI * .5;
+				scene.addObject(model);
+
+				renderer = new THREE.CanvasRenderer();
+				renderer.setSize( SCREEN_WIDTH, SCREEN_HEIGHT );
+
+				container.appendChild( renderer.domElement );
+
+				stats = new Stats();
+				stats.domElement.style.position = 'absolute';
+				stats.domElement.style.top = '0px';
+				container.appendChild( stats.domElement );
+				
+				document.addEventListener( 'mousedown', onDocumentMouseDown, false );
+				document.addEventListener( 'touchstart', onDocumentTouchStart, false );
+				document.addEventListener( 'touchmove', onDocumentTouchMove, false );
+			}
+
+			//
+
+			function onDocumentMouseDown( event ) {
+
+				event.preventDefault();
+
+				document.addEventListener( 'mousemove', onDocumentMouseMove, false );
+				document.addEventListener( 'mouseup', onDocumentMouseUp, false );
+				document.addEventListener( 'mouseout', onDocumentMouseOut, false );
+
+				mouseXOnMouseDown = event.clientX - windowHalfX;
+				targetRotationOnMouseDown = targetRotation;
+			}
+
+			function onDocumentMouseMove( event ) {
+
+				mouseX = event.clientX - windowHalfX;
+
+				targetRotation = targetRotationOnMouseDown + ( mouseX - mouseXOnMouseDown ) * 0.02;
+			}
+
+			function onDocumentMouseUp( event ) {
+
+				document.removeEventListener( 'mousemove', onDocumentMouseMove, false );
+				document.removeEventListener( 'mouseup', onDocumentMouseUp, false );
+				document.removeEventListener( 'mouseout', onDocumentMouseOut, false );
+			}
+
+			function onDocumentMouseOut( event ) {
+
+				document.removeEventListener( 'mousemove', onDocumentMouseMove, false );
+				document.removeEventListener( 'mouseup', onDocumentMouseUp, false );
+				document.removeEventListener( 'mouseout', onDocumentMouseOut, false );
+			}
+
+			function onDocumentTouchStart( event ) {
+
+				if ( event.touches.length == 1 ) {
+
+					event.preventDefault();
+
+					mouseXOnMouseDown = event.touches[ 0 ].pageX - windowHalfX;
+					targetRotationOnMouseDown = targetRotation;
+
+				}
+			}
+
+			function onDocumentTouchMove( event ) {
+
+				if ( event.touches.length == 1 ) {
+
+					event.preventDefault();
+
+					mouseX = event.touches[ 0 ].pageX - windowHalfX;
+					targetRotation = targetRotationOnMouseDown + ( mouseX - mouseXOnMouseDown ) * 0.05;
+
+				}
+			}
+
+			//
+
+			function loop() {
+
+				model.rotation.z += ( targetRotation - model.rotation.z ) * 0.05;
+
+				renderer.render(scene, camera);
+				stats.update();
+			}
+
+		</script>
+
+	</body>
+</html>
--- a/examples/c4d_deltaInc_bot.html
+++ b/examples/c4d_deltaInc_bot.html
--- a/examples/c4d_deltaInc_nano_lights.html
+++ b/examples/c4d_deltaInc_nano_lights.html
--- a/examples/c4d_dice.html
+++ b/examples/c4d_dice.html
--- a/examples/c4d_dodeca.html
+++ b/examples/c4d_dodeca.html
--- a/examples/geometry/.DS_Store
+++ b/examples/geometry/.DS_Store
--- a/examples/geometry/BotArmL.js
+++ b/examples/geometry/BotArmL.js
--- a/examples/geometry/BotArmR.js
+++ b/examples/geometry/BotArmR.js
--- a/examples/geometry/BotLowerBody.js
+++ b/examples/geometry/BotLowerBody.js
--- a/examples/geometry/BotUpperBody.js
+++ b/examples/geometry/BotUpperBody.js
--- a/examples/geometry/Box6.js
+++ b/examples/geometry/Box6.js
--- a/examples/geometry/Dice.js
+++ b/examples/geometry/Dice.js
--- a/examples/geometry/Dice249UV.js
+++ b/examples/geometry/Dice249UV.js
--- a/examples/geometry/DodecaEdges.js
+++ b/examples/geometry/DodecaEdges.js
--- a/examples/geometry/NanoArmL.js
+++ b/examples/geometry/NanoArmL.js
--- a/examples/geometry/NanoArmR.js
+++ b/examples/geometry/NanoArmR.js
--- a/examples/geometry/NanoBody.js
+++ b/examples/geometry/NanoBody.js
--- a/examples/geometry/Q5.js
+++ b/examples/geometry/Q5.js
--- a/examples/geometry/dice.gif
+++ b/examples/geometry/dice.gif
--- a/examples/obj/Q5/Q5.js
+++ b/examples/obj/Q5/Q5.js
--- a/examples/obj/Q5/Q5.obj
+++ b/examples/obj/Q5/Q5.obj
--- a/examples/obj/nano/.DS_Store
+++ b/examples/obj/nano/.DS_Store
--- a/examples/obj/nano/Nano.js
+++ b/examples/obj/nano/Nano.js
--- a/examples/obj/nano/Nano.obj
+++ b/examples/obj/nano/Nano.obj
--- a/examples/obj/nano/nanoBody.js
+++ b/examples/obj/nano/nanoBody.js
--- a/examples/obj/nano/nanoBody.obj
+++ b/examples/obj/nano/nanoBody.obj
--- a/utils/exporters/.DS_Store
+++ b/utils/exporters/.DS_Store
--- a/utils/exporters/blender/.DS_Store
+++ b/utils/exporters/blender/.DS_Store
--- a/utils/exporters/blender/2.49/threejs_export.py
+++ b/utils/exporters/blender/2.49/threejs_export.py
--- a/utils/exporters/cinema4d/.DS_Store
+++ b/utils/exporters/cinema4d/.DS_Store
--- a/utils/exporters/cinema4d/Three.js
+++ b/utils/exporters/cinema4d/Three.js
--- a/utils/exporters/cinema4d/export_to_three.js.py
+++ b/utils/exporters/cinema4d/export_to_three.js.py
--- a/utils/exporters/cinema4d/template.html
+++ b/utils/exporters/cinema4d/template.html