Skip to content

Commit 70255db

Browse files
mrdoobmrdoob
committed
ShaderLib and UniformsLib clean up.
1 parent e0beb97 commit 70255db

File tree

2 files changed

+171
-178
lines changed

2 files changed

+171
-178
lines changed

‎src/renderers/shaders/ShaderLib.js

Lines changed: 94 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -4,239 +4,234 @@ import { Vector3 } from '../../math/Vector3';
44
import { UniformsLib } from './UniformsLib';
55
import { Color } from '../../math/Color';
66

7-
var ShaderLib;
8-
97
/**
10-
* Webgl Shader Library for three.js
11-
*
128
* @author alteredq / http://alteredqualia.com/
139
* @author mrdoob / http://mrdoob.com/
1410
* @author mikael emtinger / http://gomo.se/
1511
*/
1612

13+
var ShaderLib = {
1714

18-
ShaderLib = {
19-
20-
'basic': {
15+
basic: {
2116

2217
uniforms: UniformsUtils.merge( [
2318

24-
UniformsLib[ 'common' ],
25-
UniformsLib[ 'aomap' ],
26-
UniformsLib[ 'fog' ]
19+
UniformsLib.common,
20+
UniformsLib.aomap,
21+
UniformsLib.fog
2722

2823
] ),
2924

30-
vertexShader: ShaderChunk[ 'meshbasic_vert' ],
31-
fragmentShader: ShaderChunk[ 'meshbasic_frag' ]
25+
vertexShader: ShaderChunk.meshbasic_vert,
26+
fragmentShader: ShaderChunk.meshbasic_frag
3227

3328
},
3429

35-
'lambert': {
30+
lambert: {
3631

3732
uniforms: UniformsUtils.merge( [
3833

39-
UniformsLib[ 'common' ],
40-
UniformsLib[ 'aomap' ],
41-
UniformsLib[ 'lightmap' ],
42-
UniformsLib[ 'emissivemap' ],
43-
UniformsLib[ 'fog' ],
44-
UniformsLib[ 'lights' ],
34+
UniformsLib.common,
35+
UniformsLib.aomap,
36+
UniformsLib.lightmap,
37+
UniformsLib.emissivemap,
38+
UniformsLib.fog,
39+
UniformsLib.lights,
4540

4641
{
47-
"emissive" : { value: new Color( 0x000000 ) }
42+
emissive : { value: new Color( 0x000000 ) }
4843
}
4944

5045
] ),
5146

52-
vertexShader: ShaderChunk[ 'meshlambert_vert' ],
53-
fragmentShader: ShaderChunk[ 'meshlambert_frag' ]
47+
vertexShader: ShaderChunk.meshlambert_vert,
48+
fragmentShader: ShaderChunk.meshlambert_frag
5449

5550
},
5651

57-
'phong': {
52+
phong: {
5853

5954
uniforms: UniformsUtils.merge( [
6055

61-
UniformsLib[ 'common' ],
62-
UniformsLib[ 'aomap' ],
63-
UniformsLib[ 'lightmap' ],
64-
UniformsLib[ 'emissivemap' ],
65-
UniformsLib[ 'bumpmap' ],
66-
UniformsLib[ 'normalmap' ],
67-
UniformsLib[ 'displacementmap' ],
68-
UniformsLib[ 'fog' ],
69-
UniformsLib[ 'lights' ],
56+
UniformsLib.common,
57+
UniformsLib.aomap,
58+
UniformsLib.lightmap,
59+
UniformsLib.emissivemap,
60+
UniformsLib.bumpmap,
61+
UniformsLib.normalmap,
62+
UniformsLib.displacementmap,
63+
UniformsLib.fog,
64+
UniformsLib.lights,
7065

7166
{
72-
"emissive" : { value: new Color( 0x000000 ) },
73-
"specular" : { value: new Color( 0x111111 ) },
74-
"shininess": { value: 30 }
67+
emissive : { value: new Color( 0x000000 ) },
68+
specular : { value: new Color( 0x111111 ) },
69+
shininess: { value: 30 }
7570
}
7671

7772
] ),
7873

79-
vertexShader: ShaderChunk[ 'meshphong_vert' ],
80-
fragmentShader: ShaderChunk[ 'meshphong_frag' ]
74+
vertexShader: ShaderChunk.meshphong_vert,
75+
fragmentShader: ShaderChunk.meshphong_frag
8176

8277
},
8378

84-
'standard': {
79+
standard: {
8580

8681
uniforms: UniformsUtils.merge( [
8782

88-
UniformsLib[ 'common' ],
89-
UniformsLib[ 'aomap' ],
90-
UniformsLib[ 'lightmap' ],
91-
UniformsLib[ 'emissivemap' ],
92-
UniformsLib[ 'bumpmap' ],
93-
UniformsLib[ 'normalmap' ],
94-
UniformsLib[ 'displacementmap' ],
95-
UniformsLib[ 'roughnessmap' ],
96-
UniformsLib[ 'metalnessmap' ],
97-
UniformsLib[ 'fog' ],
98-
UniformsLib[ 'lights' ],
83+
UniformsLib.common,
84+
UniformsLib.aomap,
85+
UniformsLib.lightmap,
86+
UniformsLib.emissivemap,
87+
UniformsLib.bumpmap,
88+
UniformsLib.normalmap,
89+
UniformsLib.displacementmap,
90+
UniformsLib.roughnessmap,
91+
UniformsLib.metalnessmap,
92+
UniformsLib.fog,
93+
UniformsLib.lights,
9994

10095
{
101-
"emissive" : { value: new Color( 0x000000 ) },
102-
"roughness": { value: 0.5 },
103-
"metalness": { value: 0 },
104-
"envMapIntensity" : { value: 1 }, // temporary
96+
emissive : { value: new Color( 0x000000 ) },
97+
roughness: { value: 0.5 },
98+
metalness: { value: 0 },
99+
envMapIntensity : { value: 1 }, // temporary
105100
}
106101

107102
] ),
108103

109-
vertexShader: ShaderChunk[ 'meshphysical_vert' ],
110-
fragmentShader: ShaderChunk[ 'meshphysical_frag' ]
104+
vertexShader: ShaderChunk.meshphysical_vert,
105+
fragmentShader: ShaderChunk.meshphysical_frag
111106

112107
},
113108

114-
'points': {
109+
points: {
115110

116111
uniforms: UniformsUtils.merge( [
117112

118-
UniformsLib[ 'points' ],
119-
UniformsLib[ 'fog' ]
113+
UniformsLib.points,
114+
UniformsLib.fog
120115

121116
] ),
122117

123-
vertexShader: ShaderChunk[ 'points_vert' ],
124-
fragmentShader: ShaderChunk[ 'points_frag' ]
118+
vertexShader: ShaderChunk.points_vert,
119+
fragmentShader: ShaderChunk.points_frag
125120

126121
},
127122

128-
'dashed': {
123+
dashed: {
129124

130125
uniforms: UniformsUtils.merge( [
131126

132-
UniformsLib[ 'common' ],
133-
UniformsLib[ 'fog' ],
127+
UniformsLib.common,
128+
UniformsLib.fog,
134129

135130
{
136-
"scale" : { value: 1 },
137-
"dashSize" : { value: 1 },
138-
"totalSize": { value: 2 }
131+
scale : { value: 1 },
132+
dashSize : { value: 1 },
133+
totalSize: { value: 2 }
139134
}
140135

141136
] ),
142137

143-
vertexShader: ShaderChunk[ 'linedashed_vert' ],
144-
fragmentShader: ShaderChunk[ 'linedashed_frag' ]
138+
vertexShader: ShaderChunk.linedashed_vert,
139+
fragmentShader: ShaderChunk.linedashed_frag
145140

146141
},
147142

148-
'depth': {
143+
depth: {
149144

150145
uniforms: UniformsUtils.merge( [
151146

152-
UniformsLib[ 'common' ],
153-
UniformsLib[ 'displacementmap' ]
147+
UniformsLib.common,
148+
UniformsLib.displacementmap
154149

155150
] ),
156151

157-
vertexShader: ShaderChunk[ 'depth_vert' ],
158-
fragmentShader: ShaderChunk[ 'depth_frag' ]
152+
vertexShader: ShaderChunk.depth_vert,
153+
fragmentShader: ShaderChunk.depth_frag
159154

160155
},
161156

162-
'normal': {
157+
normal: {
163158

164159
uniforms: {
165160

166-
"opacity" : { value: 1.0 }
161+
opacity : { value: 1.0 }
167162

168163
},
169164

170-
vertexShader: ShaderChunk[ 'normal_vert' ],
171-
fragmentShader: ShaderChunk[ 'normal_frag' ]
165+
vertexShader: ShaderChunk.normal_vert,
166+
fragmentShader: ShaderChunk.normal_frag
172167

173168
},
174169

175170
/* -------------------------------------------------------------------------
176171
// Cube map shader
177172
------------------------------------------------------------------------- */
178173

179-
'cube': {
174+
cube: {
180175

181176
uniforms: {
182-
"tCube": { value: null },
183-
"tFlip": { value: - 1 },
184-
"opacity": { value: 1.0 }
177+
tCube: { value: null },
178+
tFlip: { value: - 1 },
179+
opacity: { value: 1.0 }
185180
},
186181

187-
vertexShader: ShaderChunk[ 'cube_vert' ],
188-
fragmentShader: ShaderChunk[ 'cube_frag' ]
182+
vertexShader: ShaderChunk.cube_vert,
183+
fragmentShader: ShaderChunk.cube_frag
189184

190185
},
191186

192187
/* -------------------------------------------------------------------------
193188
// Cube map shader
194189
------------------------------------------------------------------------- */
195190

196-
'equirect': {
191+
equirect: {
197192

198193
uniforms: {
199-
"tEquirect": { value: null },
200-
"tFlip": { value: - 1 }
194+
tEquirect: { value: null },
195+
tFlip: { value: - 1 }
201196
},
202197

203-
vertexShader: ShaderChunk[ 'equirect_vert' ],
204-
fragmentShader: ShaderChunk[ 'equirect_frag' ]
198+
vertexShader: ShaderChunk.equirect_vert,
199+
fragmentShader: ShaderChunk.equirect_frag
205200

206201
},
207202

208-
'distanceRGBA': {
203+
distanceRGBA: {
209204

210205
uniforms: {
211206

212-
"lightPos": { value: new Vector3() }
207+
lightPos: { value: new Vector3() }
213208

214209
},
215210

216-
vertexShader: ShaderChunk[ 'distanceRGBA_vert' ],
217-
fragmentShader: ShaderChunk[ 'distanceRGBA_frag' ]
211+
vertexShader: ShaderChunk.distanceRGBA_vert,
212+
fragmentShader: ShaderChunk.distanceRGBA_frag
218213

219214
}
220215

221216
};
222217

223-
ShaderLib[ 'physical' ] = {
218+
ShaderLib.physical = {
224219

225220
uniforms: UniformsUtils.merge( [
226221

227-
ShaderLib[ 'standard' ].uniforms,
222+
ShaderLib.standard.uniforms,
228223

229224
{
230-
"clearCoat": { value: 0 },
231-
"clearCoatRoughness": { value: 0 }
225+
clearCoat: { value: 0 },
226+
clearCoatRoughness: { value: 0 }
232227
}
233228

234229
] ),
235230

236-
vertexShader: ShaderChunk[ 'meshphysical_vert' ],
237-
fragmentShader: ShaderChunk[ 'meshphysical_frag' ]
231+
vertexShader: ShaderChunk.meshphysical_vert,
232+
fragmentShader: ShaderChunk.meshphysical_frag
238233

239234
};
240235

241236

242-
export { ShaderLib };
237+
export { ShaderLib };

0 commit comments

Comments
 (0)