language stringclasses 1
value | owner stringlengths 2 15 | repo stringlengths 2 21 | sha stringlengths 45 45 | message stringlengths 7 36.3k | path stringlengths 1 199 | patch stringlengths 15 102k | is_multipart bool 2
classes |
|---|---|---|---|---|---|---|---|
Other | mrdoob | three.js | 8bfe403c00b09093bcf7082888696e371671a789.json | Add dispose method to all controls | examples/js/controls/FlyControls.js | @@ -254,18 +254,38 @@ THREE.FlyControls = function ( object, domElement ) {
}
- this.domElement.addEventListener( 'contextmenu', function ( event ) {
+ function contextmenu( event ) {
event.preventDefault();
- }, false );
+ }
+
+ this.dispose = function() {
+
+ this.domElement.removeEventListener( 'contex... | true |
Other | mrdoob | three.js | 8bfe403c00b09093bcf7082888696e371671a789.json | Add dispose method to all controls | examples/js/controls/MouseControls.js | @@ -50,6 +50,12 @@ THREE.MouseControls = function ( object ) {
};
+ this.dispose = function() {
+
+ document.removeEventListener( 'mousemove', onMouseMove, false );
+
+ }
+
document.addEventListener( 'mousemove', onMouseMove, false );
}; | true |
Other | mrdoob | three.js | 8bfe403c00b09093bcf7082888696e371671a789.json | Add dispose method to all controls | examples/js/controls/OrbitControls.js | @@ -750,11 +750,31 @@
}
- this.domElement.addEventListener( 'contextmenu', function ( event ) {
+ function contextmenu( event ) {
event.preventDefault();
- }, false );
+ }
+
+ this.dispose = function() {
+
+ this.domElement.removeEventListener( 'contextmenu', contextmenu, false );
+ this.domElem... | true |
Other | mrdoob | three.js | 8bfe403c00b09093bcf7082888696e371671a789.json | Add dispose method to all controls | examples/js/controls/OrthographicTrackballControls.js | @@ -606,14 +606,34 @@ THREE.OrthographicTrackballControls = function ( object, domElement ) {
}
- this.domElement.addEventListener( 'contextmenu', function ( event ) {
+ function contextmenu( event ) {
event.preventDefault();
- }, false );
+ }
- this.domElement.addEventListener( 'mousedown', mousedown, f... | true |
Other | mrdoob | three.js | 8bfe403c00b09093bcf7082888696e371671a789.json | Add dispose method to all controls | examples/js/controls/PointerLockControls.js | @@ -31,6 +31,12 @@ THREE.PointerLockControls = function ( camera ) {
};
+ this.dispose = function() {
+
+ document.removeEventListener( 'mousemove', onMouseMove, false );
+
+ }
+
document.addEventListener( 'mousemove', onMouseMove, false );
this.enabled = false; | true |
Other | mrdoob | three.js | 8bfe403c00b09093bcf7082888696e371671a789.json | Add dispose method to all controls | examples/js/controls/TrackballControls.js | @@ -586,14 +586,33 @@ THREE.TrackballControls = function ( object, domElement ) {
}
- this.domElement.addEventListener( 'contextmenu', function ( event ) {
+ function contextmenu( event ) {
event.preventDefault();
- }, false );
+ }
- this.domElement.addEventListener( 'mousedown', mousedown, false );
+ th... | true |
Other | mrdoob | three.js | 8bfe403c00b09093bcf7082888696e371671a789.json | Add dispose method to all controls | examples/js/controls/VRControls.js | @@ -116,4 +116,10 @@ THREE.VRControls = function ( object, onError ) {
};
+ this.dispose = function () {
+
+ vrInputs = [];
+
+ };
+
}; | true |
Other | mrdoob | three.js | 90ac81fdaa853308a5f4f68c7a258a8f3caa51f2.json | Fix a tiny typo | docs/api/core/BufferAttribute.html | @@ -17,7 +17,7 @@ <h1>[name]</h1>
<h2>Constructor</h2>
<h3>[name]([page:Array array], [page:Integer itemSize])</h3>
<div>
- Instantiates this attibute with data from the associated buffer. The array can either be a regular Array or a Typed Array.
+ Instantiates this attribute with data from the associated bu... | false |
Other | mrdoob | three.js | 86523359e466eec6cfefa7549a9843c691927c21.json | remove debugging output. | src/animation/AnimationClip.js | @@ -12,7 +12,7 @@ THREE.AnimationClip = function ( name, duration, tracks ) {
this.tracks = tracks;
this.duration = duration || 1;
- // TODO: maybe only do these on demand, as doing them here could potentially slow down loading
+ // maybe only do these on demand, as doing them here could potentially slow down loa... | true |
Other | mrdoob | three.js | 86523359e466eec6cfefa7549a9843c691927c21.json | remove debugging output. | src/animation/AnimationMixer.js | @@ -2,7 +2,6 @@
*
* Mixes together the AnimationClips scheduled by AnimationActions and applies them to the root and subtree
*
- * TODO: MUST add support for blending between AnimationActions based on their weights, right now only the last AnimationAction is applied at full weight.
*
* @author Ben Houston / h... | true |
Other | mrdoob | three.js | 86523359e466eec6cfefa7549a9843c691927c21.json | remove debugging output. | src/animation/AnimationUtils.js | @@ -53,15 +53,13 @@
if( exemplarValue.lerp ) {
return function( a, b, alpha ) {
- //console.log( a, b );
return a.lerp( b, alpha );
}
}
if( exemplarValue.slerp ) {
return function( a, b, alpha ) {
- //console.log( a, b );
return a.slerp( b, alpha );
}... | true |
Other | mrdoob | three.js | 86523359e466eec6cfefa7549a9843c691927c21.json | remove debugging output. | src/animation/KeyframeTrack.js | @@ -1,8 +1,6 @@
/**
*
- * A Track that returns a keyframe interpolated value.
- *
- * TODO: Add cubic in addition to linear interpolation.
+ * A Track that returns a keyframe interpolated value, currently linearly interpolated
*
* @author Ben Houston / http://clara.io/
* @author David Sarno / http://lighthau... | true |
Other | mrdoob | three.js | 86523359e466eec6cfefa7549a9843c691927c21.json | remove debugging output. | src/animation/PropertyBinding.js | @@ -15,7 +15,6 @@ THREE.PropertyBinding = function ( rootNode, trackName ) {
var parseResults = THREE.PropertyBinding.parseTrackName( trackName );
- //console.log( parseResults );
this.directoryName = parseResults.directoryName;
this.nodeName = parseResults.nodeName;
this.objectName = parseResults.objectNam... | true |
Other | mrdoob | three.js | e9cd1a28124456ee10d080ac1e311e047cdb61de.json | memorize the KeyframeTrack.setResult() | src/animation/KeyframeTrack.js | @@ -19,6 +19,8 @@ THREE.KeyframeTrack = function ( name, keys ) {
this.result = THREE.AnimationUtils.clone( this.keys[0].value );
//console.log( 'constructor result', this.result )
+ // the index of the last result, used as a starting point for local search.
+ // TODO: this is okay in the keyframetrack, but it wo... | false |
Other | mrdoob | three.js | 457f64b976e1403ffcd844159079e6371a4f0c1a.json | fix ObjectLoader for cached images | src/loaders/ImageLoader.js | @@ -20,14 +20,22 @@ THREE.ImageLoader.prototype = {
if ( cached !== undefined ) {
+ scope.manager.itemStart( url );
+
if ( onLoad ) {
setTimeout( function () {
onLoad( cached );
+ scope.manager.itemEnd( url );
+
}, 0 );
+ } else {
+
+ scope.manager.itemEnd( url );
+
}
... | false |
Other | mrdoob | three.js | 5e2d24d08cdfc453f44aa232ae7be5236f41dfbc.json | Fix broken link to Canvas 2D Context specification | docs/api/renderers/CanvasRenderer.html | @@ -1,162 +1,162 @@
-<!DOCTYPE html>
-<html lang="en">
- <head>
+<!DOCTYPE html>
+<html lang="en">
+ <head>
<meta charset="utf-8" />
- <base href="../../" />
- <script src="list.js"></script>
- <script src="page.js"></script>
- <link type="text/css" rel="stylesheet" href="page.css" />
- </head>
- <body>
- <... | false |
Other | mrdoob | three.js | 91dfdffddd7e2875ea12d21816bd0c333ecdd972.json | Implement normals loading | examples/js/loaders/AMFLoader.js | @@ -275,6 +275,7 @@ THREE.AMFLoader.prototype = {
function loadMeshVertices( node ) {
var vertArray = [];
+ var normalArray = [];
var currVerticesNode = node.firstElementChild;
while ( currVerticesNode ) {
@@ -303,7 +304,18 @@ THREE.AMFLoader.prototype = {
}
+ } else if ( vNode.nod... | false |
Other | mrdoob | three.js | 262fb39e67cdd95208ceed82277a258ce408a7c6.json | Implement normals loading | examples/js/loaders/AMFLoader.js | @@ -267,7 +267,7 @@ THREE.AMFLoader.prototype = {
function loadMeshVertices( node ) {
var vertArray = [];
-
+ var normalArray = [];
var currVerticesNode = node.firstElementChild;
while ( currVerticesNode ) {
@@ -288,7 +288,18 @@ THREE.AMFLoader.prototype = {
vertArray.push(y);
vertA... | false |
Other | mrdoob | three.js | fcd853dad665ffa76218d1233468782f9992a997.json | Enforce order of x, y, z and v1, v2, v3 elements | examples/js/loaders/AMFLoader.js | @@ -246,21 +246,13 @@ THREE.AMFLoader.prototype = {
} else if ( currVolumeNode.nodeName === "triangle" ) {
- var triangleNode = currVolumeNode.firstElementChild;
+ var v1 = currVolumeNode.getElementsByTagName("v1")[0].textContent;
+ var v2 = currVolumeNode.getElementsByTagName("v2")[0].textContent;... | false |
Other | mrdoob | three.js | 914c4bdcccd265d8c5f31df7f3f50dcba2e133da.json | remove useless foreground | examples/webgl_read_float_buffer.html | @@ -89,7 +89,7 @@
var container, stats;
- var cameraRTT, camera, sceneRTT, sceneScreen, scene, renderer, zmesh1, zmesh2;
+ var cameraRTT, sceneRTT, sceneScreen, renderer, zmesh1, zmesh2;
var mouseX = 0, mouseY = 0;
@@ -108,15 +108,11 @@
container = document.getElementById( 'container' );
- ... | false |
Other | mrdoob | three.js | 4985ed03dbfa59fb722af18fa66f4c347d034ae9.json | update morphanimmesh to work with the new mixer. | examples/js/MD2Character.js | @@ -52,7 +52,7 @@ THREE.MD2Character = function () {
scope.root.add( mesh );
scope.meshBody = mesh;
- scope.activeAnimationClipName = geo.firstAnimationClip.name;
+ scope.activeAnimationClipName = mesh.firstAnimationClip.name;
checkLoadingComplete();
| true |
Other | mrdoob | three.js | 4985ed03dbfa59fb722af18fa66f4c347d034ae9.json | update morphanimmesh to work with the new mixer. | src/animation/PropertyBinding.js | @@ -23,8 +23,8 @@ THREE.PropertyBinding = function ( rootNode, trackName ) {
this.propertyName = parseResults.propertyName;
this.propertyIndex = parseResults.propertyIndex;
- this.node = THREE.PropertyBinding.findNode( rootNode, this.nodeName );
-
+ this.node = THREE.PropertyBinding.findNode( rootNode, this.nodeN... | true |
Other | mrdoob | three.js | 4985ed03dbfa59fb722af18fa66f4c347d034ae9.json | update morphanimmesh to work with the new mixer. | src/objects/MorphAnimMesh.js | @@ -36,7 +36,7 @@ THREE.MorphAnimMesh.prototype.parseAnimations = function () {
};
-THREE.MorphAnimMesh.prototype.playAnimation = function ( label ) {
+THREE.MorphAnimMesh.prototype.playAnimation = function ( label, fps ) {
this.mixer.removeAllActions();
@@ -50,7 +50,9 @@ THREE.MorphAnimMesh.prototype.playAn... | true |
Other | mrdoob | three.js | 9583d29532fa647c261579e1b9b40190f971d03a.json | fix skeleton in example, better comments. | examples/webgl_animation_skinning_morph.html | @@ -285,6 +285,7 @@
if( mixer ) {
mixer.update( delta );
+ helper.update();
}
renderer.render( scene, camera ); | true |
Other | mrdoob | three.js | 9583d29532fa647c261579e1b9b40190f971d03a.json | fix skeleton in example, better comments. | src/animation/AnimationUtils.js | @@ -41,7 +41,6 @@
},
- // TODO/OPTIMIZATION: Accumulator should be writable and it will get rid of the *.clone() calls that are likely slow.
getLerpFunc: function( exemplarValue, interTrack ) {
if( exemplarValue === undefined || exemplarValue === null ) throw new Error( "examplarValue is null" ); | true |
Other | mrdoob | three.js | 9583d29532fa647c261579e1b9b40190f971d03a.json | fix skeleton in example, better comments. | src/animation/KeyframeTrack.js | @@ -30,8 +30,6 @@ THREE.KeyframeTrack.prototype = {
constructor: THREE.KeyframeTrack,
- // TODO: this is a straight forward linear search for the key that corresponds to this time, this
- // should be optimized.
getAt: function( time ) {
//if( /morph/i.test( this.name ) ) {
// console.log( 'KeyframeTra... | true |
Other | mrdoob | three.js | e3b2c7593c1a415db6a8892a1b7a8806f361c9b8.json | introduce time awareness in AnimationAction. | src/animation/AnimationAction.js | @@ -14,6 +14,8 @@ THREE.AnimationAction = function ( clip, startTime, timeScale, weight, loop ) {
this.weight = weight || 1;
this.loop = loop || clip.loop || false;
this.enabled = true; // allow for easy disabling of the action.
+
+ this.time = 0;
};
THREE.AnimationAction.prototype = {
@@ -24,7 +26,7 @@ THREE... | true |
Other | mrdoob | three.js | e3b2c7593c1a415db6a8892a1b7a8806f361c9b8.json | introduce time awareness in AnimationAction. | src/animation/AnimationMixer.js | @@ -142,7 +142,7 @@ THREE.AnimationMixer.prototype = {
var endStartRatio = 1.0 / startEndRatio;
this.wrap( fadeOutAction, 1.0, startEndRatio, duration );
- this.wrap( fadeInAction, endStartRatio, 1.0, duration );
+ this.wrap( action, endStartRatio, 1.0, duration );
}
| true |
Other | mrdoob | three.js | 0ffea7b8f2a80eff8e8c4d90880b8c75e01a40f5.json | fix MorphBlendMesh setAnimationFps()
bugfix for: When setAnimationFPS then animation.duration is NaN. | src/extras/objects/MorphBlendMesh.js | @@ -33,8 +33,8 @@ THREE.MorphBlendMesh.prototype.createAnimation = function ( name, start, end, fp
var animation = {
- startFrame: start,
- endFrame: end,
+ start: start,
+ end: end,
length: end - start + 1,
@@ -280,7 +280,7 @@ THREE.MorphBlendMesh.prototype.update = function ( delta ) {
... | false |
Other | mrdoob | three.js | c35c65b4778f39c0896712fdc7bde380c4577629.json | fix wrong constructor | src/renderers/WebGLRenderer.js | @@ -213,7 +213,7 @@ THREE.WebGLRenderer = function ( parameters ) {
var state = new THREE.WebGLState( _gl, extensions, paramThreeToGL );
var properties = new THREE.WebGLProperties();
var objects = new THREE.WebGLObjects( _gl, properties, this.info );
- var programCache = new THREE.WebGLPrograms( this, _gl, extens... | false |
Other | mrdoob | three.js | aa7aac30757a13c075e557cfa28ae72e7b6c3f7c.json | use tab instead of whitespace | test/unit/cameras/Camera.js | @@ -5,8 +5,8 @@
module( "Camera" );
test( "lookAt", function() {
- var obj = new THREE.Camera();
- obj.lookAt(new THREE.Vector3(0, 1, -1));
+ var obj = new THREE.Camera();
+ obj.lookAt(new THREE.Vector3(0, 1, -1));
ok( obj.rotation.x * (180 / Math.PI) === 45 , "x is equal" );
}); | true |
Other | mrdoob | three.js | aa7aac30757a13c075e557cfa28ae72e7b6c3f7c.json | use tab instead of whitespace | test/unit/core/Object3D.js | @@ -7,96 +7,96 @@ module( "Object3D" );
var RadToDeg = 180 / Math.PI;
test( "rotateX", function() {
- var obj = new THREE.Object3D();
+ var obj = new THREE.Object3D();
- var angleInRad = 1.562;
- obj.rotateX(angleInRad);
+ var angleInRad = 1.562;
+ obj.rotateX(angleInRad);
- // should calculate the correct ... | true |
Other | mrdoob | three.js | e9d593b78ac841a6eb10d04cf92283fbfb532ce4.json | fix two broken examples. | examples/webgl_loader_scene.html | @@ -92,6 +92,7 @@
</div>
<script src="../build/three.min.js"></script>
+ <script src="js/MorphAnimMesh.js"></script>
<script src="js/loaders/collada/Animation.js"></script>
<script src="js/loaders/collada/AnimationHandler.js"></script>
<script src="js/loaders/collada/KeyFrameAnimation.js"></script> | true |
Other | mrdoob | three.js | e9d593b78ac841a6eb10d04cf92283fbfb532ce4.json | fix two broken examples. | examples/webgl_shadowmap_performance.html | @@ -237,7 +237,7 @@
scene.add( mesh );
- mixer = new THREE.AnimationMixer( scene );
+ //mixer = new THREE.AnimationMixer( scene );
// MORPHS
@@ -254,8 +254,10 @@
var mesh = new THREE.Mesh( geometry, material );
mesh.speed = speed;
+ var mixer = new THREE.AnimationMixer( th... | true |
Other | mrdoob | three.js | a73bd4341d144c68aa14be04b492f09635ae4475.json | Convert canvas horse morph to Mixer. | examples/canvas_morphtargets_horse.html | @@ -26,7 +26,7 @@
var container, stats;
var camera, scene, projector, renderer;
- var mesh, animation;
+ var mesh, mixer;
init();
animate();
@@ -69,8 +69,10 @@
mesh.scale.set( 1.5, 1.5, 1.5 );
scene.add( mesh );
- animation = new THREE.MorphAnimation( mesh );
- animation.pl... | false |
Other | mrdoob | three.js | a1fb6c3134d6dd68035aecab72bfaf58ff3a3c20.json | fix bug, not calling AnimationAction.init. | src/animation/AnimationMixer.js | @@ -26,6 +26,7 @@ THREE.AnimationMixer.prototype = {
// TODO: check for duplicate action names? Or provide each action with a UUID?
this.actions.push( action );
+ action.init( this.time );
action.mixer = this;
var tracks = action.clip.tracks; | false |
Other | mrdoob | three.js | 3a24fca91de0b174b09292dd888625561e13ed64.json | use a single mixer for shadow map performance. | examples/webgl_shadowmap_performance.html | @@ -57,7 +57,7 @@
var NEAR = 5, FAR = 3000;
- var morph, morphs = [];
+ var morph, morphs = [], mixer;
var light;
@@ -237,6 +237,8 @@
scene.add( mesh );
+ mixer = new THREE.AnimationMixer( scene );
+
// MORPHS
function addMorph( geometry, speed, duration, x, y, z, fudgeC... | false |
Other | mrdoob | three.js | e29f28d6486eb2d49f62122d9cc7d7f92e05fac1.json | Extract updateAttribute from updateObject | src/renderers/webgl/WebGLObjects.js | @@ -168,60 +168,67 @@ THREE.WebGLObjects = function ( gl, properties, info ) {
for ( var name in attributes ) {
var attribute = attributes[ name ];
+ updateAttribute( attribute, name );
- var bufferType = ( name === 'index' ) ? gl.ELEMENT_ARRAY_BUFFER : gl.ARRAY_BUFFER;
+ }
- var data = ( attribute ... | false |
Other | mrdoob | three.js | 48a4d9de1bb57bfd58626bd4ccb0b6e249afec39.json | Verify all faces of cubemap with DDSCAPS2_CUBEMAP | examples/js/loaders/DDSLoader.js | @@ -16,7 +16,7 @@ THREE.DDSLoader.parse = function ( buffer, loadMipmaps ) {
var dds = { mipmaps: [], width: 0, height: 0, format: null, mipmapCount: 1 };
// Adapted from @toji's DDS utils
- // https://github.com/toji/webgl-texture-utils/blob/master/texture-util/dds.js
+ // https://github.com/toji/webgl-texture-u... | false |
Other | mrdoob | three.js | eeb750bdd3ac9d120913d51678610a24f1e63b09.json | remove dat GUI, not needed. | examples/webgl_animation_scene.html | @@ -44,7 +44,6 @@
<script src="js/Detector.js"></script>
<script src="js/libs/stats.min.js"></script>
- <script src="js/libs/dat.gui.min.js"></script>
<script>
@@ -136,12 +135,6 @@
} );
- // GUI
-
- initGUI();
-
- //
-
window.addEventListener( 'resize', onWindowResize, false );
... | false |
Other | mrdoob | three.js | 4cc67551a7d0a1fc8874d36271e9a3cd676a075a.json | add more authors. | utils/exporters/blender/addons/io_three/__init__.py | @@ -38,7 +38,7 @@
bl_info = {
'name': "Three.js Format",
- 'author': "repsac, mrdoob, yomotsu, mpk, jpweeks, rkusa, tschw",
+ 'author': "repsac, mrdoob, yomotsu, mpk, jpweeks, rkusa, tschw, jackcaron, bhouston",
'version': (1, 5, 0),
'blender': (2, 74, 0),
'location': "File > Export", | false |
Other | mrdoob | three.js | d4f5a1f4456da6efef4e106f0e9ea305a491f4f8.json | remove supports in WebGLCapabilities | src/renderers/webgl/WebGLCapabilities.js | @@ -47,7 +47,7 @@ THREE.WebGLCapabilities = function( gl, extensions, parameters ) {
this.vertexTextures = this.maxVertexTextures > 0;
this.floatFragmentTextures = !! extensions.get( 'OES_texture_float' );
- this.floatVertexTextures = this.supportsVertexTextures && this.supportsFloatFragmentTextures;
+ this.float... | false |
Other | mrdoob | three.js | 42520325677e0ae51c157e87ffd0c065ff8770c6.json | remove getMaxPrecision from webglstate | src/renderers/webgl/WebGLState.js | @@ -142,36 +142,6 @@ THREE.WebGLState = function ( gl, extensions, paramThreeToGL ) {
};
- this.getMaxPrecision = function ( precision ) {
-
- if ( precision === 'highp' ) {
-
- if ( gl.getShaderPrecisionFormat( gl.VERTEX_SHADER, gl.HIGH_FLOAT ).precision > 0 &&
- gl.getShaderPrecisionFormat( gl.FRAGMEN... | false |
Other | mrdoob | three.js | 5af00a5efc88f431deed5d4dcba292c973d336fb.json | Use parameter setup
Done similar to what CircleGeometry does. | examples/js/geometries/TeapotGeometry.js | @@ -395,18 +395,28 @@ THREE.TeapotGeometry = function ( size, segments, bottom, lid, body, fitLid, bli
this.type = 'TeapotGeometry';
- this.size = size || 50;
+ this.parameters = {
+ size: size,
+ segments: segments,
+ bottom: bottom,
+ lid: lid,
+ body: body,
+ fitLid: fitLid,
+ blinn: blinn
+ };
+
+ size... | false |
Other | mrdoob | three.js | f017384f1d7541cfebd270c3a9ae05560ee589e9.json | fix issue with parameterName | src/renderers/webgl/WebGLProgramCache.js | @@ -15,7 +15,7 @@ THREE.WebGLProgramCache = function ( renderer1, gl, extensions ) {
PointCloudMaterial: 'particle_basic'
};
- var parameterNames = [ " precision", "supportsVertexTextures", "map", "envMap", "envMapMode", "lightMap", "aoMap", "emissiveMap", "bumpMap", "normalMap", "specularMap", "alphaMap", "comb... | false |
Other | mrdoob | three.js | 47ef34ec9dd5d2684348a25c35263ed8a18ccb0e.json | Fix broken ellipses | src/extras/core/Path.js | @@ -168,7 +168,13 @@ THREE.Path.prototype.ellipse = function ( aX, aY, xRadius, yRadius,
THREE.Path.prototype.absellipse = function ( aX, aY, xRadius, yRadius,
aStartAngle, aEndAngle, aClockwise, aRotation ) {
- var args = Array.prototype.slice.call( arguments );
+ var args = [
+ aX, aY,
+ xRadius, yRa... | true |
Other | mrdoob | three.js | 47ef34ec9dd5d2684348a25c35263ed8a18ccb0e.json | Fix broken ellipses | src/extras/curves/EllipseCurve.js | @@ -49,9 +49,11 @@ THREE.EllipseCurve.prototype.getPoint = function ( t ) {
var cos = Math.cos( this.aRotation );
var sin = Math.sin( this.aRotation );
+ var tx = x, ty = y;
+
// Rotate the point about the center of the ellipse.
- x = ( x - this.aX ) * cos - ( y - this.aY ) * sin + this.aX;
- y = ( x - th... | true |
Other | mrdoob | three.js | 1a4762f0c535fd8fcd4a4dfdc7925bdf0098f412.json | fix slidertime start position | utils/exporters/max/ThreeJSAnimationExporter.ms | @@ -1526,6 +1526,7 @@ rollout ThreeJSExporter "ThreeJSExporter"
function ExportScene =
(
+ slidertime = animationrange.start
-- Extract meshes
| false |
Other | mrdoob | three.js | a15ffe8dd987fba876da6c14e37ee0506f01b771.json | fix bug in ObjectLoader. | src/loaders/ObjectLoader.js | @@ -621,7 +621,7 @@ THREE.ObjectLoader.prototype = {
for ( var child in data.children ) {
- object.add( this.parseObject( data.children[ child ], geometries, materials ) );
+ object.add( this.parseObject( data.children[ child ], geometries, materials, tracks ) );
}
@@ -633,19 +633,19 @@ THREE.... | false |
Other | mrdoob | three.js | 62f3060ace5b53cb0bf8174ad8d83c06cfa1ea40.json | Add Utah teapot as a geometry object; doc cleanup
Add the Utah teapot geometry object, along with a demo showing its
options. Also fix Matrix* documentation: match current constructor code,
and clean up style. | docs/api/math/Matrix3.html | @@ -16,26 +16,9 @@ <h1>[name]</h1>
<h2>Constructor</h2>
- <h3>[name]([page:Float n11], [page:Float n12], [page:Float n13], [page:Float n21], [page:Float n22], [page:Float n23], [page:Float n31], [page:Float n32], [page:Float n33])</h3>
+ <h3>[name]()</h3>
<div>
- n11 -- [page:Float] <br />
- n12 -- [page:... | true |
Other | mrdoob | three.js | 62f3060ace5b53cb0bf8174ad8d83c06cfa1ea40.json | Add Utah teapot as a geometry object; doc cleanup
Add the Utah teapot geometry object, along with a demo showing its
options. Also fix Matrix* documentation: match current constructor code,
and clean up style. | docs/api/math/Matrix4.html | @@ -39,10 +39,10 @@ <h2>Example</h2>
<h2>Constructor</h2>
- <h3>[name]( [page:Float n11], [page:Float n12], [page:Float n13], [page:Float n14], [page:Float n21], [page:Float n22], [page:Float n23], [page:Float n24], [page:Float n31], [page:Float n32], [page:Float n33], [page:Float n34], [page:Float n41], [page:... | true |
Other | mrdoob | three.js | 62f3060ace5b53cb0bf8174ad8d83c06cfa1ea40.json | Add Utah teapot as a geometry object; doc cleanup
Add the Utah teapot geometry object, along with a demo showing its
options. Also fix Matrix* documentation: match current constructor code,
and clean up style. | examples/index.html | @@ -219,6 +219,7 @@ <h1><a href="http://threejs.org">three.js</a> / examples</h1>
"webgl_geometry_nurbs",
"webgl_geometry_shapes",
"webgl_geometry_spline_editor",
+ "webgl_geometry_teapot",
"webgl_geometry_terrain",
"webgl_geometry_terrain_fog",
"webgl_geometry_terrain_raycast", | true |
Other | mrdoob | three.js | 62f3060ace5b53cb0bf8174ad8d83c06cfa1ea40.json | Add Utah teapot as a geometry object; doc cleanup
Add the Utah teapot geometry object, along with a demo showing its
options. Also fix Matrix* documentation: match current constructor code,
and clean up style. | examples/js/geometries/TeapotGeometry.js | @@ -0,0 +1,634 @@
+/**
+ * @author Eric Haines / http://erichaines.com/
+ *
+ * Tessellates the famous Utah teapot database by Martin Newell into triangles.
+ *
+ * THREE.TeapotGeometry = function ( size, segments, bottom, lid, body, fitLid, blinn )
+ *
+ * defaults: size = 50, segments = 10, bottom = true, lid = true... | true |
Other | mrdoob | three.js | 62f3060ace5b53cb0bf8174ad8d83c06cfa1ea40.json | Add Utah teapot as a geometry object; doc cleanup
Add the Utah teapot geometry object, along with a demo showing its
options. Also fix Matrix* documentation: match current constructor code,
and clean up style. | examples/webgl_geometry_teapot.html | @@ -0,0 +1,383 @@
+<!DOCTYPE html>
+<html lang="en">
+ <head>
+ <title>three.js webgl - teapot geometry</title>
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0">
+ <style>
+ body {
+ color: #fff;
+ font-family: Monospace;
+... | true |
Other | mrdoob | three.js | 13febe3f3d9fd9c9a3762baaa02e5069303837f8.json | Add reference to materials to OBJ Loader | examples/js/loaders/OBJLoader.js | @@ -5,6 +5,8 @@
THREE.OBJLoader = function ( manager ) {
this.manager = ( manager !== undefined ) ? manager : THREE.DefaultLoadingManager;
+
+ this.materials = null;
};
@@ -31,6 +33,12 @@ THREE.OBJLoader.prototype = {
this.crossOrigin = value;
},
+
+ setMaterials: function ( materials ) {
+
+ this... | false |
Other | mrdoob | three.js | 194cbacaf7d34ff5568a34e6a1612385bc096c8f.json | add unit tests for event dispatcher | test/unit/core/EventDispatcher.js | @@ -0,0 +1,88 @@
+/**
+ * @author simonThiele / https://github.com/simonThiele
+ */
+
+module( "EventDispatcher" );
+
+test( "apply", function() {
+ var innocentObject = {};
+ var eventDispatcher = new THREE.EventDispatcher();
+
+ eventDispatcher.apply( innocentObject );
+
+ ok( innocentObject.addEventListener !== unde... | true |
Other | mrdoob | three.js | 194cbacaf7d34ff5568a34e6a1612385bc096c8f.json | add unit tests for event dispatcher | test/unit/unittests_three.html | @@ -25,6 +25,7 @@
<script src="core/BufferAttribute.js"></script>
<script src="core/BufferGeometry.js"></script>
<script src="core/Clock.js"></script>
+ <script src="core/EventDispatcher.js"></script>
<script src="core/Object3D.js"></script>
<script src="math/Constants.js"></script> | true |
Other | mrdoob | three.js | 7cb97cf7e3eba3da8ec668faa5841f311e83c8d4.json | change whitespace to tab | test/unit/core/Clock.js | @@ -5,48 +5,48 @@
module( "Clock" );
function mockPerformance() {
- self.performance = {
- deltaTime: 0,
+ self.performance = {
+ deltaTime: 0,
- next: function( delta ) {
- this.deltaTime += delta;
- },
+ next: function( delta ) {
+ this.deltaTime += delta;
+ },
- now: function() {
- ... | false |
Other | mrdoob | three.js | d73576afd43d4c571ac70c4087c7c11afd230a91.json | add unit tests for clock | test/unit/core/Clock.js | @@ -0,0 +1,52 @@
+/**
+ * @author simonThiele / https://github.com/simonThiele
+ */
+
+module( "Clock" );
+
+function mockPerformance() {
+ self.performance = {
+ deltaTime: 0,
+
+ next: function( delta ) {
+ this.deltaTime += delta;
+ },
+
+ now: function() {
+ return this.deltaTime;
+ }
+ }... | true |
Other | mrdoob | three.js | d73576afd43d4c571ac70c4087c7c11afd230a91.json | add unit tests for clock | test/unit/unittests_three.html | @@ -24,6 +24,7 @@
<script src="core/BufferAttribute.js"></script>
<script src="core/BufferGeometry.js"></script>
+ <script src="core/Clock.js"></script>
<script src="core/Object3D.js"></script>
<script src="math/Constants.js"></script> | true |
Other | mrdoob | three.js | 43bedce7868cc5786641e8b32333af2e0249a046.json | Remove reference to `diffuse` parameter
`kD` is set to the `color` parameter directly. | examples/js/loaders/MTLLoader.js | @@ -319,7 +319,7 @@ THREE.MTLLoader.MaterialCreator.prototype = {
// Diffuse color (color under white light) using RGB values
- params[ 'diffuse' ] = new THREE.Color().fromArray( value );
+ params[ 'color' ] = new THREE.Color().fromArray( value );
break;
@@ -390,12 +390,6 @@ THREE.MTLLoader.... | false |
Other | mrdoob | three.js | 94d8f1ad06934e21220c6eaf7ed35566c0c82f98.json | remove some left over console.log statements. | examples/webgl_animation_scene.html | @@ -125,7 +125,6 @@
loader.load( "models/json/scene-animation.json", function ( loadedScene ) {
sceneAnimationClip = loadedScene.animations[0];
- console.log('sceneAnimationClip', sceneAnimationClip);
scene = loadedScene;
scene.add( camera );
scene.fog = new THREE.Fog( 0xffffff, 2000,... | true |
Other | mrdoob | three.js | 94d8f1ad06934e21220c6eaf7ed35566c0c82f98.json | remove some left over console.log statements. | src/loaders/ObjectLoader.js | @@ -61,9 +61,8 @@ THREE.ObjectLoader.prototype = {
var object = this.parseObject( json.object, geometries, materials );
if( json.animations ) {
- console.log( json.animations );
+
object.animations = this.parseAnimations( json.animations );
- console.log( object.animations );
}
| true |
Other | mrdoob | three.js | 8ee9c980007eca2ff0cd8bdd6c06a59236ad3f64.json | write animations at the root | utils/exporters/blender/addons/io_three/exporter/api/mesh.py | @@ -458,7 +458,7 @@ def blend_shapes(mesh, options):
return manifest
@_mesh
-def animated_blend_shapes(mesh, options):
+def animated_blend_shapes(mesh, name, options):
"""
:param mesh:
@@ -473,7 +473,7 @@ def animated_blend_shapes(mesh, options):
animCurves = animCurves.action.fcurves
... | true |
Other | mrdoob | three.js | 8ee9c980007eca2ff0cd8bdd6c06a59236ad3f64.json | write animations at the root | utils/exporters/blender/addons/io_three/exporter/api/object.py | @@ -180,6 +180,8 @@ def animated_xform(obj, options):
return []
fcurves = fcurves.action.fcurves
+ objName = obj.name
+
tracks = []
i = 0
nb_curves = len(fcurves)
@@ -202,7 +204,7 @@ def animated_xform(obj, options):
track = []
track_loc.append(track)
tracks.... | true |
Other | mrdoob | three.js | 8ee9c980007eca2ff0cd8bdd6c06a59236ad3f64.json | write animations at the root | utils/exporters/blender/addons/io_three/exporter/geometry.py | @@ -568,9 +568,12 @@ def _parse_geometry(self):
logger.info("Parsing %s", constants.BLEND_SHAPES)
mt = api.mesh.blend_shapes(self.node, self.options) or []
self[constants.MORPH_TARGETS] = mt
- if len(mt) > 0: # there's blend shapes, let check for animation
- ... | true |
Other | mrdoob | three.js | 8ee9c980007eca2ff0cd8bdd6c06a59236ad3f64.json | write animations at the root | utils/exporters/blender/addons/io_three/exporter/object.py | @@ -124,7 +124,12 @@ def _node_setup(self):
no_anim = (None, False, constants.OFF)
if self.options.get(constants.KEYFRAMES) not in no_anim:
logger.info("Export Transform Animation for %s", self.node)
- self[constants.CLIPS] = api.object.animated_xform(self.node, self.options)
+... | true |
Other | mrdoob | three.js | 8ee9c980007eca2ff0cd8bdd6c06a59236ad3f64.json | write animations at the root | utils/exporters/blender/addons/io_three/exporter/scene.py | @@ -10,7 +10,7 @@
io,
api
)
-
+from bpy import context
class Scene(base_classes.BaseScene):
"""Class that handles the contruction of a Three scene"""
@@ -22,13 +22,23 @@ def __init__(self, filepath, options=None):
constants.GEOMETRIES: [],
constants.MATERIALS: [],
... | true |
Other | mrdoob | three.js | a99f5f8f686fd1de274fbe9007e6158eef20dc3a.json | add tests for bufferGeometry | test/unit/core/BufferGeometry.js | @@ -0,0 +1,319 @@
+/**
+ * @author simonThiele / https://github.com/simonThiele
+ */
+
+module( "BufferGeometry" );
+
+var DegToRad = Math.PI / 180;
+
+test( "add / delete Attribute", function() {
+ var geometry = new THREE.BufferGeometry();
+ var attributeName = "position";
+
+ ok ( geometry.attributes[attributeName] ... | true |
Other | mrdoob | three.js | a99f5f8f686fd1de274fbe9007e6158eef20dc3a.json | add tests for bufferGeometry | test/unit/unittests_three.html | @@ -23,6 +23,7 @@
<script src="cameras/PerspectiveCamera.js"></script>
<script src="core/BufferAttribute.js"></script>
+ <script src="core/BufferGeometry.js"></script>
<script src="core/Object3D.js"></script>
<script src="math/Constants.js"></script> | true |
Other | mrdoob | three.js | a8021bedfdff485e7d8bedad510a44563bdd6583.json | add tests for BufferAttribute | test/unit/core/BufferAttribute.js | @@ -0,0 +1,117 @@
+/**
+ * @author simonThiele / https://github.com/simonThiele
+ */
+
+module( "BufferAttribute" );
+
+test( "count", function() {
+ ok(
+ new THREE.BufferAttribute( new Float32Array( [1, 2, 3, 4, 5, 6] ), 3 ).count === 2,
+ 'count is equal to the number of chunks'
+ );
+});
+
+test( "copy", function... | true |
Other | mrdoob | three.js | a8021bedfdff485e7d8bedad510a44563bdd6583.json | add tests for BufferAttribute | test/unit/unittests_three.html | @@ -22,6 +22,7 @@
<script src="cameras/OrthographicCamera.js"></script>
<script src="cameras/PerspectiveCamera.js"></script>
+ <script src="core/BufferAttribute.js"></script>
<script src="core/Object3D.js"></script>
<script src="math/Constants.js"></script> | true |
Other | mrdoob | three.js | 1d12f6167fea809fff93df45429c57d0d4d3db2b.json | add tests for perspective camera | test/unit/cameras/PerspectiveCamera.js | @@ -0,0 +1,56 @@
+/**
+ * @author simonThiele / https://github.com/simonThiele
+ */
+
+module( "PerspectiveCamera" );
+
+test( "updateProjectionMatrix", function() {
+ var near = 1,
+ far = 3,
+ bottom = -1,
+ top = 1,
+ aspect = 16 / 9,
+ left = -top * aspect,
+ right = -bottom * aspect,
+ fov = 90;
+
+ ... | true |
Other | mrdoob | three.js | 1d12f6167fea809fff93df45429c57d0d4d3db2b.json | add tests for perspective camera | test/unit/unittests_three.html | @@ -20,6 +20,7 @@
<script src="cameras/Camera.js"></script>
<script src="cameras/OrthographicCamera.js"></script>
+ <script src="cameras/PerspectiveCamera.js"></script>
<script src="core/Object3D.js"></script>
| true |
Other | mrdoob | three.js | aaa0df093590184adf246e9d8d424db7126d70f6.json | add tests for orthographic camera | test/unit/cameras/OrthographicCamera.js | @@ -0,0 +1,41 @@
+/**
+ * @author simonThiele / https://github.com/simonThiele
+ */
+
+module( "OrthographicCamera" );
+
+test( "updateProjectionMatrix", function() {
+ var left = -1, right = 1, top = 1, bottom = -1, near = 1, far = 3;
+ cam = new THREE.OrthographicCamera(left, right, top, bottom, near, far);
+
+ // up... | true |
Other | mrdoob | three.js | aaa0df093590184adf246e9d8d424db7126d70f6.json | add tests for orthographic camera | test/unit/unittests_three.html | @@ -18,9 +18,10 @@
<!-- add class-based unit tests below -->
- <script src="core/Object3D.js"></script>
+ <script src="cameras/Camera.js"></script>
+ <script src="cameras/OrthographicCamera.js"></script>
- <script src="Cameras/Camera.js"></script>
+ <script src="core/Object3D.js"></script>
<script sr... | true |
Other | mrdoob | three.js | 760252a56043ef0031f08d4e56b6582c9224b6a2.json | add space after comma | examples/js/Cloth.js | @@ -35,7 +35,7 @@ var pins = [];
var wind = true;
var windStrength = 2;
-var windForce = new THREE.Vector3( 0,0,0 );
+var windForce = new THREE.Vector3( 0, 0, 0 );
var ballPosition = new THREE.Vector3( 0, - 45, 0 );
var ballSize = 60; //40
@@ -239,7 +239,7 @@ function simulate( time ) {
particles = cloth.p... | true |
Other | mrdoob | three.js | 760252a56043ef0031f08d4e56b6582c9224b6a2.json | add space after comma | examples/js/Sparks.js | @@ -487,7 +487,7 @@ SPARKS.ActionZone.prototype.update = function( emitter, particle, time ) {
/*
* Accelerate action affects velocity in specified 3d direction
*/
-SPARKS.Accelerate = function( x,y,z ) {
+SPARKS.Accelerate = function( x, y, z ) {
if ( x instanceof THREE.Vector3 ) {
@@ -496,7 +496,7 @@ SPARK... | true |
Other | mrdoob | three.js | 760252a56043ef0031f08d4e56b6582c9224b6a2.json | add space after comma | examples/js/controls/TransformControls.js | @@ -382,23 +382,23 @@
this.handleGizmos = {
X: [
- [ new THREE.Line( new CircleGeometry( 1,'x',0.5 ), new GizmoLineMaterial( { color: 0xff0000 } ) ) ]
+ [ new THREE.Line( new CircleGeometry( 1, 'x', 0.5 ), new GizmoLineMaterial( { color: 0xff0000 } ) ) ]
],
Y: [
- [ new THREE.Line( new Circl... | true |
Other | mrdoob | three.js | 760252a56043ef0031f08d4e56b6582c9224b6a2.json | add space after comma | examples/js/loaders/AssimpJSONLoader.js | @@ -123,7 +123,7 @@ THREE.AssimpJSONLoader.prototype = {
for ( in_data = json.faces, i = 0, e = in_data.length; i < e; ++ i ) {
src = in_data[ i ];
- face = new THREE.Face3( src[ 0 ],src[ 1 ],src[ 2 ] );
+ face = new THREE.Face3( src[ 0 ], src[ 1 ], src[ 2 ] );
geometry.faces.push( face );
} | true |
Other | mrdoob | three.js | 760252a56043ef0031f08d4e56b6582c9224b6a2.json | add space after comma | examples/js/loaders/ColladaLoader.js | @@ -4398,8 +4398,8 @@
// TODO - this might be a good place to choose greatest 4 weights
for ( var i = 0; i < weights.length; i ++ ) {
- var indicies = new THREE.Vector4( weights[ i ][ 0 ] ? weights[ i ][ 0 ].joint : 0,weights[ i ][ 1 ] ? weights[ i ][ 1 ].joint : 0,weights[ i ][ 2 ] ? weights[ i ][ 2 ].joint... | true |
Other | mrdoob | three.js | 760252a56043ef0031f08d4e56b6582c9224b6a2.json | add space after comma | examples/js/loaders/PDBLoader.js | @@ -81,8 +81,8 @@ THREE.PDBLoader.prototype = {
}
- var CPK = { "h": [ 255,255,255 ],"he": [ 217,255,255 ],"li": [ 204,128,255 ],"be": [ 194,255,0 ],"b": [ 255,181,181 ],"c": [ 144,144,144 ],"n": [ 48,80,248 ],"o": [ 255,13,13 ],"f": [ 144,224,80 ],"ne": [ 179,227,245 ],"na": [ 171,92,242 ],"mg": [ 138,255,0 ],... | true |
Other | mrdoob | three.js | 760252a56043ef0031f08d4e56b6582c9224b6a2.json | add space after comma | examples/js/loaders/RGBELoader.js | @@ -327,7 +327,7 @@ THREE.RGBELoader.prototype._parser = function( buffer ) {
var w = rgbe_header_info.width,
h = rgbe_header_info.height
- ,image_rgba_data = RGBE_ReadPixels_RLE( byteArray.subarray( byteArray.pos ), w, h )
+ , image_rgba_data = RGBE_ReadPixels_RLE( byteArray.subarray( byteArray.pos ), w, ... | true |
Other | mrdoob | three.js | 760252a56043ef0031f08d4e56b6582c9224b6a2.json | add space after comma | examples/js/loaders/STLLoader.js | @@ -302,7 +302,7 @@ if ( typeof DataView === 'undefined' ) {
DataView.prototype = {
- _getCharCodes: function( buffer,start,length ) {
+ _getCharCodes: function( buffer, start, length ) {
start = start || 0;
length = length || buffer.length; | true |
Other | mrdoob | three.js | 760252a56043ef0031f08d4e56b6582c9224b6a2.json | add space after comma | examples/js/loaders/VRMLLoader.js | @@ -509,7 +509,7 @@ THREE.VRMLLoader.prototype = {
// first subpattern should match the Node name
- var block = { 'nodeType' : matches[ 1 ], 'string': line, 'parent': current, 'children': [],'comment' : comment };
+ var block = { 'nodeType' : matches[ 1 ], 'string': line, 'parent': current, 'childr... | true |
Other | mrdoob | three.js | 760252a56043ef0031f08d4e56b6582c9224b6a2.json | add space after comma | src/extras/geometries/OctahedronGeometry.js | @@ -5,7 +5,7 @@
THREE.OctahedronGeometry = function ( radius, detail ) {
var vertices = [
- 1, 0, 0, - 1, 0, 0, 0, 1, 0, 0,- 1, 0, 0, 0, 1, 0, 0,- 1
+ 1, 0, 0, - 1, 0, 0, 0, 1, 0, 0, - 1, 0, 0, 0, 1, 0, 0, - 1
];
var indices = [ | true |
Other | mrdoob | three.js | 760252a56043ef0031f08d4e56b6582c9224b6a2.json | add space after comma | src/math/Quaternion.js | @@ -18,7 +18,7 @@ THREE.Quaternion.prototype = {
constructor: THREE.Quaternion,
- _x: 0,_y: 0, _z: 0, _w: 0,
+ _x: 0, _y: 0, _z: 0, _w: 0,
get x () {
| true |
Other | mrdoob | three.js | 760252a56043ef0031f08d4e56b6582c9224b6a2.json | add space after comma | src/math/Ray.js | @@ -356,7 +356,7 @@ THREE.Ray.prototype = {
// http://www.scratchapixel.com/lessons/3d-basic-lessons/lesson-7-intersecting-simple-shapes/ray-box-intersection/
- var tmin,tmax,tymin,tymax,tzmin,tzmax;
+ var tmin, tmax, tymin, tymax, tzmin, tzmax;
var invdirx = 1 / this.direction.x,
invdiry = 1 / this.d... | true |
Other | mrdoob | three.js | 760252a56043ef0031f08d4e56b6582c9224b6a2.json | add space after comma | utils/codestyle/config.json | @@ -1,6 +1,7 @@
{
"preset": "mdcs",
"disallowNewlineBeforeBlockStatements": true,
+ "requireSpaceAfterBinaryOperators": [","],
"excludeFiles": [
"../../.c9/",
"../../.c9version/", | true |
Other | mrdoob | three.js | fb210eb85e9a4baaefc20109a9b41e134c0568df.json | add new rule disallowNewlineBeforeBlockStatements | examples/js/Octree.js | @@ -1929,8 +1929,7 @@
tmin;
// ray would intersect in reverse direction, i.e. this is behind ray
- if ( tmax < 0 )
- {
+ if ( tmax < 0 ) {
return false;
| true |
Other | mrdoob | three.js | fb210eb85e9a4baaefc20109a9b41e134c0568df.json | add new rule disallowNewlineBeforeBlockStatements | examples/js/SimplexNoise.js | @@ -168,8 +168,7 @@ SimplexNoise.prototype.noise3d = function( xin, yin, zin ) {
var i2, j2, k2; // Offsets for third corner of simplex in (i,j,k) coords
if ( x0 >= y0 ) {
- if ( y0 >= z0 )
- {
+ if ( y0 >= z0 ) {
i1 = 1; j1 = 0; k1 = 0; i2 = 1; j2 = 1; k2 = 0;
| true |
Other | mrdoob | three.js | fb210eb85e9a4baaefc20109a9b41e134c0568df.json | add new rule disallowNewlineBeforeBlockStatements | examples/js/Sparks.js | @@ -125,8 +125,7 @@ SPARKS.Emitter.prototype = {
// Update activities
len = this._activities.length;
- for ( i = 0; i < len; i ++ )
- {
+ for ( i = 0; i < len; i ++ ) {
this._activities[ i ].update( this, time );
@@ -139,12 +138,10 @@ SPARKS.Emitter.prototype = {
var action;
var len2 = this._par... | true |
Other | mrdoob | three.js | fb210eb85e9a4baaefc20109a9b41e134c0568df.json | add new rule disallowNewlineBeforeBlockStatements | examples/js/WaterShader.js | @@ -141,8 +141,7 @@ THREE.Water = function ( renderer, camera, scene, options ) {
if ( camera instanceof THREE.PerspectiveCamera )
this.camera = camera;
- else
- {
+ else {
this.camera = new THREE.PerspectiveCamera();
console.log( this.name + ': camera is not a Perspective Camera!' )
@@ -178,8 +177,7 @... | true |
Other | mrdoob | three.js | fb210eb85e9a4baaefc20109a9b41e134c0568df.json | add new rule disallowNewlineBeforeBlockStatements | examples/js/crossfade/scenes.js | @@ -38,17 +38,15 @@ function generateGeometry( objectType, numObjects ) {
scale.x = Math.random() * 200 + 100;
- if ( objectType == "cube" )
- {
+ if ( objectType == "cube" ) {
geom = new THREE.BoxGeometry( 1, 1, 1 );
scale.y = Math.random() * 200 + 100;
scale.z = Math.random() * 200 + 100;
... | true |
Other | mrdoob | three.js | fb210eb85e9a4baaefc20109a9b41e134c0568df.json | add new rule disallowNewlineBeforeBlockStatements | examples/js/crossfade/transition.js | @@ -120,18 +120,15 @@ function Transition ( sceneA, sceneB ) {
this.render = function( delta ) {
// Transition animation
- if ( transitionParams.animateTransition )
- {
+ if ( transitionParams.animateTransition ) {
var t = ( 1 + Math.sin( transitionParams.transitionSpeed * clock.getElapsedTime() / Mat... | true |
Other | mrdoob | three.js | fb210eb85e9a4baaefc20109a9b41e134c0568df.json | add new rule disallowNewlineBeforeBlockStatements | examples/js/loaders/AWDLoader.js | @@ -55,15 +55,13 @@
AWDProperties = function() {}
AWDProperties.prototype = {
- set : function( key, value )
- {
+ set : function( key, value ) {
this[ key ] = value;
},
- get : function( key, fallback )
- {
+ get : function( key, fallback ) {
if ( this.hasOwnProperty( key ) )
return... | true |
Other | mrdoob | three.js | fb210eb85e9a4baaefc20109a9b41e134c0568df.json | add new rule disallowNewlineBeforeBlockStatements | examples/js/loaders/AssimpJSONLoader.js | @@ -37,8 +37,7 @@ THREE.AssimpJSONLoader.prototype = {
// This header is used to disambiguate between
// different JSON-based file formats.
metadata = json.__metadata__;
- if ( typeof metadata !== 'undefined' )
- {
+ if ( typeof metadata !== 'undefined' ) {
// Check if assimp2json at all
i... | true |
Other | mrdoob | three.js | fb210eb85e9a4baaefc20109a9b41e134c0568df.json | add new rule disallowNewlineBeforeBlockStatements | examples/js/postprocessing/GlitchPass.js | @@ -42,15 +42,13 @@ THREE.GlitchPass = function ( dt_size ) {
THREE.GlitchPass.prototype = {
- render: function ( renderer, writeBuffer, readBuffer, delta )
- {
+ render: function ( renderer, writeBuffer, readBuffer, delta ) {
this.uniforms[ "tDiffuse" ].value = readBuffer;
this.uniforms[ 'seed' ].value =... | true |
Other | mrdoob | three.js | 740d0ea5fad17f6e543a177b1ea9ddb053b5e176.json | set config for codestyle | utils/codestyle/codestyle.sh | @@ -1,5 +1,2 @@
-
-jscs "../../src" --fix --preset=mdcs
-jscs "../../examples/js" --fix --preset=mdcs
-
+jscs "../.." --fix --config=./config.json --max-errors=1000000
| true |
Other | mrdoob | three.js | 740d0ea5fad17f6e543a177b1ea9ddb053b5e176.json | set config for codestyle | utils/codestyle/config.json | @@ -1,13 +1,26 @@
{
"preset": "mdcs",
"excludeFiles": [
- "build/**",
- "docs/**",
- "editor/**",
- "examples/**",
- "node_modules/**",
- "test/**",
- "utils/**"
+ "../../.c9/",
+ "../../.c9version/",
+ "../../.git/",
+ "../../... | true |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.