From f0a65f2a7cb0ad714f94b8fcdb0aa497da9fc79a Mon Sep 17 00:00:00 2001 From: WestLangley Date: Thu, 6 Feb 2014 13:19:59 -0500 Subject: [PATCH] Miscelaneous examples fixes --- examples/obj/male02/male02_dds.mtl | 30 ++++++++++----------- examples/webgl_loader_ctm_materials.html | 8 +++--- examples/webgl_loader_obj_mtl.html | 2 +- examples/webgl_materials_cars_camaro.html | 2 +- examples/webgl_performance_doublesided.html | 2 +- 5 files changed, 23 insertions(+), 21 deletions(-) diff --git a/examples/obj/male02/male02_dds.mtl b/examples/obj/male02/male02_dds.mtl index 4512cc591f..a1666d32fa 100644 --- a/examples/obj/male02/male02_dds.mtl +++ b/examples/obj/male02/male02_dds.mtl @@ -1,9 +1,9 @@ # Material Count: 5 newmtl _01_-_Default1noCulli__01_-_Default1noCulli -Ns 154.901961 -Ka 0.000000 0.000000 0.000000 +Ns 30.0000 +Ka 0.640000 0.640000 0.640000 Kd 0.640000 0.640000 0.640000 -Ks 0.165000 0.165000 0.165000 +Ks 0.050000 0.050000 0.050000 Ni 1.000000 d 1.000000 illum 2 @@ -11,10 +11,10 @@ map_Kd 01_-_Default1noCulling.dds newmtl FrontColorNoCullingID_male-02-1noCulling.JP -Ns 154.901961 -Ka 0.000000 0.000000 0.000000 +Ns 30.0000 +Ka 0.800000 0.800000 0.800000 Kd 0.800000 0.800000 0.800000 -Ks 0.165000 0.165000 0.165000 +Ks 0.050000 0.050000 0.050000 Ni 1.000000 d 1.000000 illum 2 @@ -22,10 +22,10 @@ map_Kd male-02-1noCulling.dds newmtl male-02-1noCullingID_male-02-1noCulling.JP -Ns 154.901961 -Ka 0.000000 0.000000 0.000000 +Ns 30.0000 +Ka 0.640000 0.640000 0.640000 Kd 0.640000 0.640000 0.640000 -Ks 0.165000 0.165000 0.165000 +Ks 0.050000 0.050000 0.050000 Ni 1.000000 d 1.000000 illum 2 @@ -33,10 +33,10 @@ map_Kd male-02-1noCulling.dds newmtl orig_02_-_Defaul1noCu_orig_02_-_Defaul1noCu -Ns 154.901961 -Ka 0.000000 0.000000 0.000000 +Ns 30.0000 +Ka 0.640000 0.640000 0.640000 Kd 0.640000 0.640000 0.640000 -Ks 0.165000 0.165000 0.165000 +Ks 0.050000 0.050000 0.050000 Ni 1.000000 d 1.000000 illum 2 @@ -44,10 +44,10 @@ map_Kd orig_02_-_Defaul1noCulling.dds newmtl FrontColorNoCullingID_orig_02_-_Defaul1noCu -Ns 154.901961 -Ka 0.000000 0.000000 0.000000 +Ns 30.0000 +Ka 0.800000 0.800000 0.800000 Kd 0.800000 0.800000 0.800000 -Ks 0.165000 0.165000 0.165000 +Ks 0.050000 0.050000 0.050000 Ni 1.000000 d 1.000000 illum 2 diff --git a/examples/webgl_loader_ctm_materials.html b/examples/webgl_loader_ctm_materials.html index 3c327d3801..4bdf455ccb 100644 --- a/examples/webgl_loader_ctm_materials.html +++ b/examples/webgl_loader_ctm_materials.html @@ -46,7 +46,7 @@ - + @@ -93,8 +93,10 @@ camera = new THREE.PerspectiveCamera( 25, SCREEN_WIDTH / SCREEN_HEIGHT, 1, 10000 ); camera.position.set( 185, 40, 170 ); - controls = new THREE.TrackballControls( camera ); - controls.dynamicDampingFactor = 0.25; + controls = new THREE.OrbitControls( camera ); + controls.maxPolarAngle = Math.PI / 2; + controls.minDistance = 200; + controls.maxDistance = 500; // SCENE diff --git a/examples/webgl_loader_obj_mtl.html b/examples/webgl_loader_obj_mtl.html index c40bd971b0..a4ef6ee9b0 100644 --- a/examples/webgl_loader_obj_mtl.html +++ b/examples/webgl_loader_obj_mtl.html @@ -66,7 +66,7 @@ scene = new THREE.Scene(); - var ambient = new THREE.AmbientLight( 0x101030 ); + var ambient = new THREE.AmbientLight( 0x444444 ); scene.add( ambient ); var directionalLight = new THREE.DirectionalLight( 0xffeedd ); diff --git a/examples/webgl_materials_cars_camaro.html b/examples/webgl_materials_cars_camaro.html index 969af5b22b..7bb0451313 100644 --- a/examples/webgl_materials_cars_camaro.html +++ b/examples/webgl_materials_cars_camaro.html @@ -18,7 +18,7 @@ a { color:skyblue } canvas { pointer-events:none; z-index:10; position:relative; } - #d { text-align:center; margin:1em 0 -2.5em 0; z-index:0; position:relative; display:block } + #d { text-align:center; margin:1em 0 2.5em 0; z-index:0; position:relative; display:block } #buttons { margin:0.5em 0 0 0 } button { font-family:georgia; border:0; background:#222; color:#fff; padding:0.2em 0.5em; cursor:pointer; border-radius:3px } button:hover { background:#333 } diff --git a/examples/webgl_performance_doublesided.html b/examples/webgl_performance_doublesided.html index e9b47a8511..5727913f4a 100644 --- a/examples/webgl_performance_doublesided.html +++ b/examples/webgl_performance_doublesided.html @@ -81,7 +81,7 @@ var reflectionCube = THREE.ImageUtils.loadTextureCube( urls ); reflectionCube.format = THREE.RGBFormat; - var material = new THREE.MeshPhongMaterial( { specular: 0xffffff, shininess: 100, envMap: reflectionCube, combine: THREE.MixOperation, reflectivity: 0.1, side: THREE.DoubleSide } ); + var material = new THREE.MeshPhongMaterial( { specular: 0x101010, shininess: 100, envMap: reflectionCube, combine: THREE.MixOperation, reflectivity: 0.1, side: THREE.DoubleSide } ); material.wrapAround = true; material.wrapRGB.set( 0.5, 0.5, 0.5 ); -- GitLab