Skip to content

Commit

Permalink
Fixed ShaderChunk issue mrdoob#14446
Browse files Browse the repository at this point in the history
  • Loading branch information
arodic committed Jul 11, 2018
1 parent 4561fa6 commit 9952de1
Show file tree
Hide file tree
Showing 5 changed files with 503 additions and 140 deletions.
52 changes: 32 additions & 20 deletions rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,23 +23,35 @@ function glsl() {

}

export default {
input: 'src/Three.js',
plugins: [
glsl()
],
// sourceMap: true,
output: [
{
format: 'umd',
name: 'THREE',
file: 'build/three.js',
indent: '\t'
},
{
format: 'es',
file: 'build/three.module.js',
indent: '\t'
}
]
};
export default [
{
input: 'src/renderers/shaders/ShaderChunkSrc.js',
plugins: [
glsl()
],
output: [
{
format: 'es',
file: 'src/renderers/shaders/ShaderChunk.js',
indent: '\t'
}
]
},
{
input: 'src/Three.js',
// sourceMap: true,
output: [
{
format: 'umd',
name: 'THREE',
file: 'build/three.js',
indent: '\t'
},
{
format: 'es',
file: 'build/three.module.js',
indent: '\t'
}
]
}
];
2 changes: 1 addition & 1 deletion src/objects/Line.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { Object3D } from '../core/Object3D.js';
import { Vector3 } from '../math/Vector3.js';
import { LineBasicMaterial } from '../materials/LineBasicMaterial.js';
import { BufferGeometry } from '../core/BufferGeometry.js';
import { Float32BufferAttribute } from '../core/BufferAttribute';
import { Float32BufferAttribute } from '../core/BufferAttribute.js';

/**
* @author mrdoob / http://mrdoob.com/
Expand Down
2 changes: 1 addition & 1 deletion src/objects/LineSegments.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Line } from './Line.js';
import { Vector3 } from '../math/Vector3.js';
import { Float32BufferAttribute } from '../core/BufferAttribute';
import { Float32BufferAttribute } from '../core/BufferAttribute.js';

/**
* @author mrdoob / http://mrdoob.com/
Expand Down
Loading

0 comments on commit 9952de1

Please sign in to comment.