Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 7 additions & 7 deletions examples/jsm/modifiers/CurveModifier.js
Original file line number Diff line number Diff line change
Expand Up @@ -139,10 +139,10 @@ export function modifyShader( material, uniforms, numberOfCurves = 1 ) {
// chunk import moved in front of modified shader below
.replace( '#include <beginnormal_vertex>', '' )

// vec3 transformedNormal declaration overriden below
// vec3 transformedNormal declaration overridden below
.replace( '#include <defaultnormal_vertex>', '' )

// vec3 transformed declaration overriden below
// vec3 transformed declaration overridden below
.replace( '#include <begin_vertex>', '' )

// shader override
Expand Down Expand Up @@ -198,7 +198,7 @@ vec3 transformedNormal = normalMatrix * (basis * objectNormal);
}

/**
* A helper class for making meshes bend aroudn curves
* A helper class for making meshes bend around curves
*/
export class Flow {

Expand All @@ -209,8 +209,8 @@ export class Flow {
constructor( mesh, numberOfCurves = 1 ) {

const obj3D = mesh.clone();
const splineTexure = initSplineTexture( numberOfCurves );
const uniforms = getUniforms( splineTexure );
const splineTexture = initSplineTexture( numberOfCurves );
const uniforms = getUniforms( splineTexture );
obj3D.traverse( function ( child ) {

if (
Expand Down Expand Up @@ -247,7 +247,7 @@ export class Flow {
this.curveLengthArray = new Array( numberOfCurves );

this.object3D = obj3D;
this.splineTexure = splineTexure;
this.splineTexture = splineTexture;
this.uniforms = uniforms;

}
Expand All @@ -259,7 +259,7 @@ export class Flow {
this.uniforms.spineLength.value = curveLength;
this.curveLengthArray[ index ] = curveLength;
this.curveArray[ index ] = curve;
updateSplineTexture( this.splineTexure, curve, index );
updateSplineTexture( this.splineTexture, curve, index );

}

Expand Down
10 changes: 5 additions & 5 deletions examples/jsm/modifiers/CurveModifierGPU.js
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ export function modifyShader( material, uniforms, numberOfCurves ) {
}

/**
* A helper class for making meshes bend aroudn curves
* A helper class for making meshes bend around curves
*/
export class Flow {

Expand All @@ -168,8 +168,8 @@ export class Flow {
constructor( mesh, numberOfCurves = 1 ) {

const obj3D = mesh.clone();
const splineTexure = initSplineTexture( numberOfCurves );
const uniforms = getUniforms( splineTexure );
const splineTexture = initSplineTexture( numberOfCurves );
const uniforms = getUniforms( splineTexture );

obj3D.traverse( function ( child ) {

Expand Down Expand Up @@ -207,7 +207,7 @@ export class Flow {
this.curveLengthArray = new Array( numberOfCurves );

this.object3D = obj3D;
this.splineTexure = splineTexure;
this.splineTexture = splineTexture;
this.uniforms = uniforms;

}
Expand All @@ -222,7 +222,7 @@ export class Flow {
this.curveLengthArray[ index ] = curveLength;
this.curveArray[ index ] = curve;

updateSplineTexture( this.splineTexure, curve, index );
updateSplineTexture( this.splineTexture, curve, index );

}

Expand Down
Loading