Skip to content

T
three.js

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

从无法访问的项目Fork

通知 2
Star 0
Fork 0
T
three.js

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

未验证 提交 0903c174 编写于 作者: M Mr.doob 提交者： GitHub
浏览文件
操作

Merge pull request #15705 from Mugen87/dev27 

Examples: Clean up
上级 4ba0a98e 2bcb3261
隐藏空白更改
内联 并排
Showing with 87 addition and 98 deletion
examples/js/loaders/LDrawLoader.js
浏览文件 @ 0903c174
......@@ -66,13 +66,13 @@ THREE.LDrawLoader = ( function () {
},
getRemainingString: function() {
getRemainingString: function () {
return this.line.substring( this.currentCharIndex, this.lineLength );
},
isAtTheEnd: function() {
isAtTheEnd: function () {
return this.currentCharIndex >= this.lineLength;
......@@ -86,21 +86,27 @@ THREE.LDrawLoader = ( function () {
getLineNumberString: function () {
return this.lineNumber >= 0? " at line " + this.lineNumber: "";
return this.lineNumber >= 0 ? " at line " + this.lineNumber : "";
}
};
function sortByMaterial ( a, b ) {
function sortByMaterial( a, b ) {
if ( a.colourCode === b.colourCode ) {
return 0;
}
if ( a.colourCode < b.colourCode ) {
return -1;
return - 1;
}
return 1;
}
......@@ -149,14 +155,14 @@ THREE.LDrawLoader = ( function () {
index0 = iElem * elementSize;
numGroupVerts = elementSize;
}
else {
} else {
numGroupVerts += elementSize;
}
}
if ( numGroupVerts > 0 ) {
bufferGeometry.addGroup( index0, Infinity, materials.length - 1 );
......@@ -166,12 +172,12 @@ THREE.LDrawLoader = ( function () {
bufferGeometry.addAttribute( 'position', new THREE.Float32BufferAttribute( vertices, 3 ) );
var object3d = null;
if ( elementSize === 2 ) {
object3d = new THREE.LineSegments( bufferGeometry, materials );
}
else if ( elementSize === 3 ) {
} else if ( elementSize === 3 ) {
bufferGeometry.computeVertexNormals();
......@@ -259,7 +265,7 @@ THREE.LDrawLoader = ( function () {
var fileLoader = new THREE.FileLoader( this.manager );
fileLoader.setPath( this.path );
fileLoader.load( url, function( text ) {
fileLoader.load( url, function ( text ) {
processObject( text, onLoad );
......@@ -308,10 +314,10 @@ THREE.LDrawLoader = ( function () {
finalizeObject();
}
}
}
else {
} else {
// No subobjects, finish object
finalizeObject();
......@@ -349,7 +355,7 @@ THREE.LDrawLoader = ( function () {
}
function loadSubobject ( subobject, sync ) {
function loadSubobject( subobject, sync ) {
parseScope.mainColourCode = subobject.material.userData.code;
parseScope.mainEdgeColourCode = subobject.material.userData.edgeMaterial.userData.code;
......@@ -416,8 +422,7 @@ THREE.LDrawLoader = ( function () {
// Try absolute path
newLocationState = LDrawLoader.FILE_LOCATION_NOT_FOUND;
}
else {
} else {
// Next attempt is lower case
subobject.fileName = subobject.fileName.toLowerCase();
......@@ -442,8 +447,7 @@ THREE.LDrawLoader = ( function () {
scope.removeScopeLevel();
onProcessed( objGroup );
}
else {
} else {
// Load next subobject
loadSubobject( parseScope.subobjects[ parseScope.subobjectIndex ] );
......@@ -485,8 +489,7 @@ THREE.LDrawLoader = ( function () {
loadSubobject( parseScope.subobjects[ parseScope.subobjectIndex ] );
}
else {
} else {
finalizeObject();
......@@ -494,7 +497,7 @@ THREE.LDrawLoader = ( function () {
}
function addSubobject ( subobject, subobjectGroup ) {
function addSubobject( subobject, subobjectGroup ) {
if ( scope.separateObjects ) {
......@@ -546,7 +549,7 @@ THREE.LDrawLoader = ( function () {
},
setFileMap: function( fileMap ) {
setFileMap: function ( fileMap ) {
this.fileMap = fileMap;
......@@ -601,7 +604,7 @@ THREE.LDrawLoader = ( function () {
},
removeScopeLevel: function() {
removeScopeLevel: function () {
this.parseScopesStack.pop();
......@@ -641,7 +644,7 @@ THREE.LDrawLoader = ( function () {
}
for ( var i = this.parseScopesStack.length - 1; i >= 0; i-- ) {
for ( var i = this.parseScopesStack.length - 1; i >= 0; i -- ) {
var material = this.parseScopesStack[ i ].lib[ colourCode ];
......@@ -736,9 +739,10 @@ THREE.LDrawLoader = ( function () {
colour = '#' + colour.substring( 2 );
}
else if ( ! colour.startsWith( '#' ) ) {
} else if ( ! colour.startsWith( '#' ) ) {
throw 'LDrawLoader: Invalid colour while parsing material' + lineParser.getLineNumberString() + ".";
}
break;
......@@ -749,8 +753,7 @@ THREE.LDrawLoader = ( function () {
edgeColour = '#' + edgeColour.substring( 2 );
}
else if ( ! edgeColour.startsWith( '#' ) ) {
} else if ( ! edgeColour.startsWith( '#' ) ) {
// Try to see if edge colour is a colour code
edgeMaterial = this.getMaterial( edgeColour );
......@@ -849,13 +852,13 @@ THREE.LDrawLoader = ( function () {
// Default plastic material with shiny specular
hsl.l = Math.min( 1, hsl.l + ( 1 - hsl.l ) * 0.12 );
}
else {
} else {
// Try to imitate pearlescency by setting the specular to the complementary of the color, and low shininess
hsl.h = ( hsl.h + 0.5 ) % 1;
hsl.l = Math.min( 1, hsl.l + ( 1 - hsl.l ) * 0.7 );
shininess = 10;
}
specular.setHSL( hsl.h, hsl.s, hsl.l );
......@@ -891,6 +894,7 @@ THREE.LDrawLoader = ( function () {
default:
// Should not happen
break;
}
// BFC (Back Face Culling) LDraw language meta extension is not implemented, so set all materials double-sided:
......@@ -902,15 +906,19 @@ THREE.LDrawLoader = ( function () {
material.userData.canHaveEnvMap = canHaveEnvMap;
if ( luminance !== 0 ) {
material.emissive.set( material.color ).multiplyScalar( luminance );
}
if ( ! edgeMaterial ) {
// This is the material used for edges
edgeMaterial = new THREE.LineBasicMaterial( { color: edgeColour } );
edgeMaterial.userData.code = code;
edgeMaterial.name = name + " - Edge";
edgeMaterial.userData.canHaveEnvMap = false;
}
material.userData.code = code;
......@@ -948,8 +956,7 @@ THREE.LDrawLoader = ( function () {
triangles = [];
lineSegments = [];
}
else {
} else {
if ( this.currentGroupObject === null ) {
......@@ -1014,7 +1021,7 @@ THREE.LDrawLoader = ( function () {
}
function parseVector ( lp ) {
function parseVector( lp ) {
var v = new THREE.Vector3( parseFloat( lp.getToken() ), parseFloat( lp.getToken() ), parseFloat( lp.getToken() ) );
......@@ -1028,24 +1035,10 @@ THREE.LDrawLoader = ( function () {
}
function findSubobject( fileName ) {
for ( var i = 0, n = subobjects.length; i < n; i ++ ) {
if ( subobjects[ i ].fileName === fileName ) {
return subobjects[ i ];
}
return null;
}
}
// Parse all line commands
for ( lineIndex = 0; lineIndex < numLines; lineIndex ++ ) {
line = lines[ lineIndex ];
var line = lines[ lineIndex ];
if ( line.length === 0 ) continue;
......@@ -1060,8 +1053,7 @@ THREE.LDrawLoader = ( function () {
currentEmbeddedFileName = line.substring( 7 );
currentEmbeddedText = '';
}
else {
} else {
currentEmbeddedText += line + '\n';
......@@ -1076,8 +1068,10 @@ THREE.LDrawLoader = ( function () {
lp.seekNonSpace();
if ( lp.isAtTheEnd() ) {
// Empty line
continue;
}
// Parse the line type
......@@ -1102,10 +1096,9 @@ THREE.LDrawLoader = ( function () {
this.addMaterial( material );
}
else {
} else {
console.warn( 'LDrawLoader: Error parsing material' + lineParser.getLineNumberString() );
console.warn( 'LDrawLoader: Error parsing material' + lp.getLineNumberString() );
}
break;
......@@ -1117,22 +1110,22 @@ THREE.LDrawLoader = ( function () {
case '!KEYWORDS':
var newKeywords = lp.getRemainingString().split( ',' );
if ( newKeywords.length > 0 ) {
var newKeywords = lp.getRemainingString().split( ',' );
if ( newKeywords.length > 0 ) {
if ( ! keywords ) {
if ( ! keywords ) {
keywords = [];
keywords = [];
}
}
newKeywords.forEach( function( keyword ) {
newKeywords.forEach( function ( keyword ) {
keywords.push( keyword.trim() );
keywords.push( keyword.trim() );
} );
} );
}
}
break;
case 'FILE':
......@@ -1190,16 +1183,14 @@ THREE.LDrawLoader = ( function () {
// Found the subobject path in the preloaded file path map
fileName = scope.fileMap[ fileName ];
}
else {
} else {
// Standardized subfolders
if ( fileName.startsWith( 's/' ) ) {
fileName = 'parts/' + fileName;
}
else if ( fileName.startsWith( '48/' ) ) {
} else if ( fileName.startsWith( '48/' ) ) {
fileName = 'p/' + fileName;
......@@ -1316,8 +1307,7 @@ THREE.LDrawLoader = ( function () {
}
}
else {
} else {
groupObject = this.currentGroupObject;
......
examples/webgl_loader_ldraw.html
浏览文件 @ 0903c174
......@@ -42,7 +42,7 @@
<script>
var container, stats, progressBar, progressBarDiv;
var container, progressBarDiv;
var camera, scene, renderer, controls, gui, guiData;
......@@ -92,7 +92,7 @@
scene.add( ambientLight );
var directionalLight = new THREE.DirectionalLight( 0xffffff, 1 );
directionalLight.position.set( -1000, 1200, 1500 );
directionalLight.position.set( - 1000, 1200, 1500 );
scene.add( directionalLight );
//
......@@ -119,7 +119,7 @@
} );
gui.add( guiData , 'envMapActivated' ).name( 'Env. map' ).onChange( function ( value ) {
gui.add( guiData, 'envMapActivated' ).name( 'Env. map' ).onChange( function ( value ) {
envMapActivated = value;
......@@ -146,7 +146,7 @@
}
function reloadObject ( resetCamera ) {
function reloadObject( resetCamera ) {
if ( model ) {
......@@ -188,8 +188,8 @@
// Envmap texture
var r = "textures/cube/Bridge2/";
var urls = [ r + "posx.jpg", r + "negx.jpg",
r + "posy.jpg", r + "negy.jpg",
r + "posz.jpg", r + "negz.jpg" ];
r + "posy.jpg", r + "negy.jpg",
r + "posz.jpg", r + "negz.jpg" ];
textureCube = new THREE.CubeTextureLoader().load( urls );
textureCube.format = THREE.RGBFormat;
textureCube.mapping = THREE.CubeReflectionMapping;
......@@ -202,11 +202,11 @@
if ( material.userData.canHaveEnvMap ) {
material.envMap = textureCube;
material.envMap = textureCube;
}
};
}
}
......@@ -254,7 +254,7 @@
}
function onProgress ( xhr ) {
function onProgress( xhr ) {
if ( xhr.lengthComputable ) {
......@@ -266,7 +266,7 @@
}
function onError ( error ) {
function onError() {
var message = "Error loading model";
progressBarDiv.innerText = message;
......@@ -274,19 +274,19 @@
}
function showProgressBar () {
function showProgressBar() {
document.body.appendChild( progressBarDiv );
}
function hideProgressBar () {
function hideProgressBar() {
document.body.removeChild( progressBarDiv );
}
function updateProgressBar ( fraction ) {
function updateProgressBar( fraction ) {
progressBarDiv.innerText = 'Loading... ' + Math.round( fraction * 100, 2 ) + '%';
......
examples/webgl_materials_nodes.html
浏览文件 @ 0903c174
......@@ -1325,7 +1325,7 @@
break;
case 'dissolve':
// MATERIAL
......@@ -1369,7 +1369,7 @@
threshold.value = val;
}, false, -.3, 1.3 );
}, false, - .3, 1.3 );
addGui( 'borderSize', borderSize.value, function ( val ) {
......@@ -1401,7 +1401,6 @@
var fireStartColor = new THREE.ColorNode( 0xF7CA78 );
var fireEndColor = new THREE.ColorNode( 0xFF0000 );
var burnedColor = new THREE.ColorNode( 0x000000 );
var burnedFinalColor = new THREE.ColorNode( 0x000000 );
var threshold = new THREE.FloatNode( .1 );
var fireSize = new THREE.FloatNode( .16 );
var burnedSize = new THREE.FloatNode( .5 );
......@@ -1432,16 +1431,16 @@
THREE.Math3Node.SMOOTHSTEP
);
var fireStartAnimatedColor = new THREE.ColorAdjustmentNode(
fireStartColor,
cycle,
THREE.ColorAdjustmentNode.SATURATION
var fireStartAnimatedColor = new THREE.ColorAdjustmentNode(
fireStartColor,
cycle,
THREE.ColorAdjustmentNode.SATURATION
);
var fireEndAnimatedColor = new THREE.ColorAdjustmentNode(
fireEndColor,
cycle,
THREE.ColorAdjustmentNode.SATURATION
var fireEndAnimatedColor = new THREE.ColorAdjustmentNode(
fireEndColor,
cycle,
THREE.ColorAdjustmentNode.SATURATION
);
var fireColor = new THREE.Math3Node(
......@@ -1487,7 +1486,7 @@
threshold.value = val;
}, false, -.5, 1.5 );
}, false, - .5, 1.5 );
addGui( 'fireSize', fireSize.value, function ( val ) {
......@@ -2555,7 +2554,7 @@
colorInput,
new THREE.ColorNode( 0x6495ED ).setReadonly( true ),
THREE.OperatorNode.MUL
).setLabel("colorMix");
).setLabel( "colorMix" );
mtl.color = colorMix;
mtl.specular = specularInput;
......@@ -2654,7 +2653,7 @@
"vec4 triplanar_mapping( sampler2D texture, vec3 normal, vec3 position, float scale ) {",
// Blending factor of triplanar mapping
" vec3 bf = normalize( abs( normal ) );",
" vec3 bf = normalize( abs( normal ) );",
" bf /= dot( bf, vec3( 1.0 ) );",
// Triplanar mapping
......
examples/webgl_postprocessing_godrays.html
浏览文件 @ 0903c174
......@@ -129,7 +129,7 @@
document.addEventListener( 'mousemove', onDocumentMouseMove, false );
document.addEventListener( 'touchstart', onDocumentTouchStart, false );
document.addEventListener( 'touchmove', onDocumentTouchMove, false );
window.addEventListener( 'resize', onResize, false );
window.addEventListener( 'resize', onWindowResize, false );
//
......@@ -174,10 +174,10 @@
//
function onResize() {
function onWindowResize() {
renderTargetWidth = window.innerWidth;
renderTargetHeight = window.innerHeight;
var renderTargetWidth = window.innerWidth;
var renderTargetHeight = window.innerHeight;
camera.aspect = renderTargetWidth / renderTargetHeight;
camera.updateProjectionMatrix();
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或