Skip to content

Examples: More clean up. #16963

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 2, 2019
Merged

Examples: More clean up. #16963

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions examples/js/exporters/GLTFExporter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2224,8 +2224,6 @@ THREE.GLTFExporter.Utils = {

}

var mergedKeyframeIndex = 0;
var sourceKeyframeIndex = 0;
var sourceInterpolant = sourceTrack.createInterpolant( new sourceTrack.ValueBufferType( 1 ) );

mergedTrack = mergedTracks[ sourceTrackNode.uuid ];
Expand Down
2 changes: 0 additions & 2 deletions examples/js/loaders/LDrawLoader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1045,8 +1045,6 @@ THREE.LDrawLoader = ( function () {
// Retrieve data from the parent parse scope
var parentParseScope = this.getParentParseScope();

var isRoot = ! parentParseScope.isFromParse;

// Main colour codes passed to this subobject (or default codes 16 and 24 if it is the root object)
var mainColourCode = parentParseScope.mainColourCode;
var mainEdgeColourCode = parentParseScope.mainEdgeColourCode;
Expand Down
18 changes: 6 additions & 12 deletions examples/js/loaders/SVGLoader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -881,19 +881,15 @@ THREE.SVGLoader.prototype = {

var transform = parseNodeTransform( node );

if ( transform ) {

if ( transformStack.length > 0 ) {
if ( transformStack.length > 0 ) {

transform.premultiply( transformStack[ transformStack.length - 1 ] );

}

currentTransform.copy( transform );
transformStack.push( transform );
transform.premultiply( transformStack[ transformStack.length - 1 ] );

}

currentTransform.copy( transform );
transformStack.push( transform );

return transform;

}
Expand Down Expand Up @@ -1178,19 +1174,17 @@ THREE.SVGLoader.prototype = {

};

THREE.SVGLoader.getStrokeStyle = function ( width, color, opacity, lineJoin, lineCap, miterLimit ) {
THREE.SVGLoader.getStrokeStyle = function ( width, color, lineJoin, lineCap, miterLimit ) {

// Param width: Stroke width
// Param color: As returned by THREE.Color.getStyle()
// Param opacity: 0 (transparent) to 1 (opaque)
// Param lineJoin: One of "round", "bevel", "miter" or "miter-limit"
// Param lineCap: One of "round", "square" or "butt"
// Param miterLimit: Maximum join length, in multiples of the "width" parameter (join is truncated if it exceeds that distance)
// Returns style object

width = width !== undefined ? width : 1;
color = color !== undefined ? color : '#000';
opacity = opacity !== undefined ? opacity : 1;
lineJoin = lineJoin !== undefined ? lineJoin : 'miter';
lineCap = lineCap !== undefined ? lineCap : 'butt';
miterLimit = miterLimit !== undefined ? miterLimit : 4;
Expand Down
2 changes: 0 additions & 2 deletions examples/jsm/exporters/GLTFExporter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2248,8 +2248,6 @@ GLTFExporter.Utils = {

}

var mergedKeyframeIndex = 0;
var sourceKeyframeIndex = 0;
var sourceInterpolant = sourceTrack.createInterpolant( new sourceTrack.ValueBufferType( 1 ) );

mergedTrack = mergedTracks[ sourceTrackNode.uuid ];
Expand Down
2 changes: 0 additions & 2 deletions examples/jsm/loaders/LDrawLoader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1063,8 +1063,6 @@ var LDrawLoader = ( function () {
// Retrieve data from the parent parse scope
var parentParseScope = this.getParentParseScope();

var isRoot = ! parentParseScope.isFromParse;

// Main colour codes passed to this subobject (or default codes 16 and 24 if it is the root object)
var mainColourCode = parentParseScope.mainColourCode;
var mainEdgeColourCode = parentParseScope.mainEdgeColourCode;
Expand Down
2 changes: 1 addition & 1 deletion examples/jsm/loaders/SVGLoader.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export class SVGLoader {

parse(text: string) : SVGResult;

static getStrokeStyle(width: number, color: string, opacity: number, lineJoin: string, lineCap: string, miterLimit: number): StrokeStyle;
static getStrokeStyle(width: number, color: string, lineJoin: string, lineCap: string, miterLimit: number): StrokeStyle;
static pointsToStroke(points: Vector3[], style: StrokeStyle, arcDivisions: number, minDistance: number ): BufferGeometry;
static pointsToStrokeWithBuffers(points: Vector3[], style: StrokeStyle, arcDivisions: number, minDistance: number, vertices: number[], normals: number[], uvs: number[], vertexOffset: number): number;
}
18 changes: 6 additions & 12 deletions examples/jsm/loaders/SVGLoader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -894,19 +894,15 @@ SVGLoader.prototype = {

var transform = parseNodeTransform( node );

if ( transform ) {

if ( transformStack.length > 0 ) {
if ( transformStack.length > 0 ) {

transform.premultiply( transformStack[ transformStack.length - 1 ] );

}

currentTransform.copy( transform );
transformStack.push( transform );
transform.premultiply( transformStack[ transformStack.length - 1 ] );

}

currentTransform.copy( transform );
transformStack.push( transform );

return transform;

}
Expand Down Expand Up @@ -1191,19 +1187,17 @@ SVGLoader.prototype = {

};

SVGLoader.getStrokeStyle = function ( width, color, opacity, lineJoin, lineCap, miterLimit ) {
SVGLoader.getStrokeStyle = function ( width, color, lineJoin, lineCap, miterLimit ) {

// Param width: Stroke width
// Param color: As returned by Color.getStyle()
// Param opacity: 0 (transparent) to 1 (opaque)
// Param lineJoin: One of "round", "bevel", "miter" or "miter-limit"
// Param lineCap: One of "round", "square" or "butt"
// Param miterLimit: Maximum join length, in multiples of the "width" parameter (join is truncated if it exceeds that distance)
// Returns style object

width = width !== undefined ? width : 1;
color = color !== undefined ? color : '#000';
opacity = opacity !== undefined ? opacity : 1;
lineJoin = lineJoin !== undefined ? lineJoin : 'miter';
lineCap = lineCap !== undefined ? lineCap : 'butt';
miterLimit = miterLimit !== undefined ? miterLimit : 4;
Expand Down
2 changes: 1 addition & 1 deletion examples/webgl_gpgpu_water.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,7 +520,7 @@
var x = i * 128 / WIDTH;
var y = j * 128 / WIDTH;

pixels[ p + 0 ] = noise( x, y, 123.4 );
pixels[ p + 0 ] = noise( x, y );
pixels[ p + 1 ] = pixels[ p + 0 ];
pixels[ p + 2 ] = 0;
pixels[ p + 3 ] = 1;
Expand Down
2 changes: 1 addition & 1 deletion examples/webgl_shaders_vector.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@

hole = subshape.holes[ i ];

process = processShape( hole.curves, true );
process = processShape( hole.curves );

pts = process.pts;
pts2 = process.pts2;
Expand Down