提交 53c36039 编写于 作者: M Mr.doob

Merge pull request #5156 from erich666/dev

Demos with ground planes have consistent up
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
<script src="../build/three.min.js"></script> <script src="../build/three.min.js"></script>
<script src="js/controls/TrackballControls.js"></script> <script src="js/controls/OrbitControls.js"></script>
<script src="js/loaders/VRMLLoader.js"></script> <script src="js/loaders/VRMLLoader.js"></script>
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
camera = new THREE.PerspectiveCamera( 60, window.innerWidth / window.innerHeight, 0.01, 1e10 ); camera = new THREE.PerspectiveCamera( 60, window.innerWidth / window.innerHeight, 0.01, 1e10 );
camera.position.z = 6; camera.position.z = 6;
controls = new THREE.TrackballControls( camera ); controls = new THREE.OrbitControls( camera );
controls.rotateSpeed = 5.0; controls.rotateSpeed = 5.0;
controls.zoomSpeed = 5; controls.zoomSpeed = 5;
......
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
<script src="../build/three.min.js"></script> <script src="../build/three.min.js"></script>
<script src="js/controls/TrackballControls.js"></script> <script src="js/controls/OrbitControls.js"></script>
<script src="js/shaders/CopyShader.js"></script> <script src="js/shaders/CopyShader.js"></script>
<script src="js/shaders/FXAAShader.js"></script> <script src="js/shaders/FXAAShader.js"></script>
...@@ -174,7 +174,7 @@ ...@@ -174,7 +174,7 @@
// CONTROLS // CONTROLS
controls = new THREE.TrackballControls( camera, renderer.domElement ); controls = new THREE.OrbitControls( camera, renderer.domElement );
// STATS // STATS
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<body> <body>
<script src="../build/three.min.js"></script> <script src="../build/three.min.js"></script>
<script src="js/controls/TrackballControls.js"></script> <script src="js/controls/OrbitControls.js"></script>
<script src="js/Detector.js"></script> <script src="js/Detector.js"></script>
<script src="js/libs/stats.min.js"></script> <script src="js/libs/stats.min.js"></script>
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
// CONTROLS // CONTROLS
controls = new THREE.TrackballControls( camera ); controls = new THREE.OrbitControls( camera );
controls.target.z = 150; controls.target.z = 150;
// LIGHTS // LIGHTS
......
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
<script src="../build/three.min.js"></script> <script src="../build/three.min.js"></script>
<script src="js/controls/TrackballControls.js"></script> <script src="js/controls/OrbitControls.js"></script>
<script src='js/MD2Character.js'></script> <script src='js/MD2Character.js'></script>
...@@ -159,7 +159,7 @@ ...@@ -159,7 +159,7 @@
// CONTROLS // CONTROLS
controls = new THREE.TrackballControls( camera, renderer.domElement ); controls = new THREE.OrbitControls( camera, renderer.domElement );
controls.target.set( 0, 50, 0 ); controls.target.set( 0, 50, 0 );
// GUI // GUI
......
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
<script src="../build/three.min.js"></script> <script src="../build/three.min.js"></script>
<script src="js/controls/TrackballControls.js"></script> <script src="js/controls/OrbitControls.js"></script>
<script src='js/MD2CharacterComplex.js'></script> <script src='js/MD2CharacterComplex.js'></script>
...@@ -166,7 +166,7 @@ ...@@ -166,7 +166,7 @@
// CONTROLS // CONTROLS
cameraControls = new THREE.TrackballControls( camera, renderer.domElement ); cameraControls = new THREE.OrbitControls( camera, renderer.domElement );
cameraControls.target.set( 0, 50, 0 ); cameraControls.target.set( 0, 50, 0 );
// CHARACTER // CHARACTER
......
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
<script src="../build/three.min.js"></script> <script src="../build/three.min.js"></script>
<script src="js/controls/TrackballControls.js"></script> <script src="js/controls/OrbitControls.js"></script>
<script src="js/shaders/BleachBypassShader.js"></script> <script src="js/shaders/BleachBypassShader.js"></script>
<script src="js/shaders/ConvolutionShader.js"></script> <script src="js/shaders/ConvolutionShader.js"></script>
...@@ -279,7 +279,7 @@ ...@@ -279,7 +279,7 @@
camera = new THREE.PerspectiveCamera( 40, SCREEN_WIDTH / SCREEN_HEIGHT, 2, 4000 ); camera = new THREE.PerspectiveCamera( 40, SCREEN_WIDTH / SCREEN_HEIGHT, 2, 4000 );
camera.position.set( -1200, 800, 1200 ); camera.position.set( -1200, 800, 1200 );
controls = new THREE.TrackballControls( camera ); controls = new THREE.OrbitControls( camera );
controls.target.set( 0, 0, 0 ); controls.target.set( 0, 0, 0 );
controls.rotateSpeed = 1.0; controls.rotateSpeed = 1.0;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册