Skip to content

T
three.js

Ablesons / three.js
与 Fork 源项目一致

从无法访问的项目Fork

通知 2
Star 0
Fork 0
T
three.js

体验新版 GitCode，发现更多精彩内容 >>

提交 1fd2e44d 编写于 作者: M Mr.doob
浏览文件
操作

Clean up.

上级 5720ae4e
展开全部 隐藏空白更改
内联 并排
Showing with 14 addition and 70 deletion
examples/obj/tree/.htaccess 已删除 100644 → 0
浏览文件 @ 5720ae4e
<Files *.js>
SetOutputFilter DEFLATE
</Files>
<Files *.bin>
SetOutputFilter DEFLATE
</Files>
examples/obj/tree/tree.js 已删除 100644 → 0
浏览文件 @ 5720ae4e
此差异已折叠。
examples/webgl_lights_pointlights.html
浏览文件 @ 1fd2e44d
......@@ -80,8 +80,6 @@
loader.load( "obj/walt/WaltHead_bin.js", callback );
scene.add( new THREE.AmbientLight( 0x000000 ) );
var sphere = new THREE.SphereGeometry( 0.5, 16, 8 );
light1 = new THREE.PointLight( 0xff0040, 2, 50 );
......
examples/webgl_postprocessing_godrays.html
浏览文件 @ 1fd2e44d
......@@ -37,6 +37,7 @@
<body>
<script src="../build/three.min.js"></script>
<script src="js/loaders/OBJLoader.js"></script>
<script src="js/ShaderGodRays.js"></script>
<script src="js/Detector.js"></script>
......@@ -54,7 +55,7 @@
var container, stats;
var camera, scene, renderer, materialDepth;
var treeMesh, sphereMesh;
var sphereMesh;
var sunPosition = new THREE.Vector3( 0, 1000, -1000 );
var screenSpacePosition = new THREE.Vector3();
......@@ -94,20 +95,13 @@
// tree
var loader = new THREE.JSONLoader();
var loader = new THREE.OBJLoader();
loader.load( "models/obj/tree.obj", function ( object ) {
loader.load( "obj/tree/tree.js", function( geometry ) {
treeMesh = new THREE.Mesh( geometry, materialScene );
treeMesh.position.set( 0, -150, -150 );
var sc = 400;
treeMesh.scale.set( sc, sc, sc );
treeMesh.matrixAutoUpdate = false;
treeMesh.updateMatrix();
scene.add( treeMesh );
object.material = materialScene;
object.position.set( 0, -150, -150 );
object.scale.multiplyScalar( 400 );
scene.add( object );
} );
......@@ -115,10 +109,7 @@
var geo = new THREE.SphereGeometry( 1, 20, 10 );
sphereMesh = new THREE.Mesh( geo, materialScene );
var sc = 20;
sphereMesh.scale.set( sc, sc, sc );
sphereMesh.scale.multiplyScalar( 20 );
scene.add( sphereMesh );
//
......
src/loaders/JSONLoader.js
浏览文件 @ 1fd2e44d
......@@ -23,7 +23,7 @@ THREE.JSONLoader.prototype = {
constructor: THREE.JSONLoader,
// Deprecated
get statusDomElement () {
if ( this._statusDomElement === undefined ) {
......@@ -451,18 +451,16 @@ THREE.JSONLoader.prototype = {
if ( json.morphTargets !== undefined ) {
var i, l, v, vl, dstVertices, srcVertices;
for ( i = 0, l = json.morphTargets.length; i < l; i ++ ) {
for ( var i = 0, l = json.morphTargets.length; i < l; i ++ ) {
geometry.morphTargets[ i ] = {};
geometry.morphTargets[ i ].name = json.morphTargets[ i ].name;
geometry.morphTargets[ i ].vertices = [];
dstVertices = geometry.morphTargets[ i ].vertices;
srcVertices = json.morphTargets[ i ].vertices;
var dstVertices = geometry.morphTargets[ i ].vertices;
var srcVertices = json.morphTargets[ i ].vertices;
for ( v = 0, vl = srcVertices.length; v < vl; v += 3 ) {
for ( var v = 0, vl = srcVertices.length; v < vl; v += 3 ) {
var vertex = new THREE.Vector3();
vertex.x = srcVertices[ v ] * scale;
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或