Skip to content

Commit 08cf0f1

Browse files
committed
change params
1 parent c9b6c61 commit 08cf0f1

File tree

2 files changed

+71
-96
lines changed

2 files changed

+71
-96
lines changed

test/test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ class CubeRotateSample {
151151
const material = new ShaderMaterial({
152152
vertexShader: vertexShader,
153153
fragmentShader: fragmentShader,
154-
uniforms: this.uniforms,
154+
uniforms: {map: { value: texture }},
155155
defines: {
156156
USE_UV: false,
157157
USE_MAP: false,

test/vertex_full.glsl

Lines changed: 70 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -306,147 +306,122 @@ vec3 getBatchingColor(const in float i) {
306306

307307
// ********************* #include <uv_pars_vertex>
308308
#if defined( USE_UV ) || defined( USE_ANISOTROPY )
309-
310-
varying vec2 vUv;
311-
309+
varying vec2 vUv;
312310
#endif
313-
#ifdef USE_MAP
314-
315-
uniform mat3 mapTransform;
316-
varying vec2 vMapUv;
317311

312+
#ifdef USE_MAP
313+
uniform mat3 mapTransform;
314+
varying vec2 vMapUv;
318315
#endif
319-
#ifdef USE_ALPHAMAP
320-
321-
uniform mat3 alphaMapTransform;
322-
varying vec2 vAlphaMapUv;
323316

317+
#ifdef USE_ALPHAMAP
318+
uniform mat3 alphaMapTransform;
319+
varying vec2 vAlphaMapUv;
324320
#endif
325-
#ifdef USE_LIGHTMAP
326-
327-
uniform mat3 lightMapTransform;
328-
varying vec2 vLightMapUv;
329321

322+
#ifdef USE_LIGHTMAP
323+
uniform mat3 lightMapTransform;
324+
varying vec2 vLightMapUv;
330325
#endif
331-
#ifdef USE_AOMAP
332-
333-
uniform mat3 aoMapTransform;
334-
varying vec2 vAoMapUv;
335326

327+
#ifdef USE_AOMAP
328+
uniform mat3 aoMapTransform;
329+
varying vec2 vAoMapUv;
336330
#endif
337-
#ifdef USE_BUMPMAP
338-
339-
uniform mat3 bumpMapTransform;
340-
varying vec2 vBumpMapUv;
341331

332+
#ifdef USE_BUMPMAP
333+
uniform mat3 bumpMapTransform;
334+
varying vec2 vBumpMapUv;
342335
#endif
343-
#ifdef USE_NORMALMAP
344-
345-
uniform mat3 normalMapTransform;
346-
varying vec2 vNormalMapUv;
347336

337+
#ifdef USE_NORMALMAP
338+
uniform mat3 normalMapTransform;
339+
varying vec2 vNormalMapUv;
348340
#endif
349-
#ifdef USE_DISPLACEMENTMAP
350-
351-
uniform mat3 displacementMapTransform;
352-
varying vec2 vDisplacementMapUv;
353341

342+
#ifdef USE_DISPLACEMENTMAP
343+
uniform mat3 displacementMapTransform;
344+
varying vec2 vDisplacementMapUv;
354345
#endif
355-
#ifdef USE_EMISSIVEMAP
356-
357-
uniform mat3 emissiveMapTransform;
358-
varying vec2 vEmissiveMapUv;
359346

347+
#ifdef USE_EMISSIVEMAP
348+
uniform mat3 emissiveMapTransform;
349+
varying vec2 vEmissiveMapUv;
360350
#endif
361-
#ifdef USE_METALNESSMAP
362-
363-
uniform mat3 metalnessMapTransform;
364-
varying vec2 vMetalnessMapUv;
365351

352+
#ifdef USE_METALNESSMAP
353+
uniform mat3 metalnessMapTransform;
354+
varying vec2 vMetalnessMapUv;
366355
#endif
367-
#ifdef USE_ROUGHNESSMAP
368-
369-
uniform mat3 roughnessMapTransform;
370-
varying vec2 vRoughnessMapUv;
371356

357+
#ifdef USE_ROUGHNESSMAP
358+
uniform mat3 roughnessMapTransform;
359+
varying vec2 vRoughnessMapUv;
372360
#endif
373-
#ifdef USE_ANISOTROPYMAP
374-
375-
uniform mat3 anisotropyMapTransform;
376-
varying vec2 vAnisotropyMapUv;
377361

362+
#ifdef USE_ANISOTROPYMAP
363+
uniform mat3 anisotropyMapTransform;
364+
varying vec2 vAnisotropyMapUv;
378365
#endif
379-
#ifdef USE_CLEARCOATMAP
380-
381-
uniform mat3 clearcoatMapTransform;
382-
varying vec2 vClearcoatMapUv;
383366

367+
#ifdef USE_CLEARCOATMAP
368+
uniform mat3 clearcoatMapTransform;
369+
varying vec2 vClearcoatMapUv;
384370
#endif
385-
#ifdef USE_CLEARCOAT_NORMALMAP
386-
387-
uniform mat3 clearcoatNormalMapTransform;
388-
varying vec2 vClearcoatNormalMapUv;
389371

372+
#ifdef USE_CLEARCOAT_NORMALMAP
373+
uniform mat3 clearcoatNormalMapTransform;
374+
varying vec2 vClearcoatNormalMapUv;
390375
#endif
391-
#ifdef USE_CLEARCOAT_ROUGHNESSMAP
392-
393-
uniform mat3 clearcoatRoughnessMapTransform;
394-
varying vec2 vClearcoatRoughnessMapUv;
395376

377+
#ifdef USE_CLEARCOAT_ROUGHNESSMAP
378+
uniform mat3 clearcoatRoughnessMapTransform;
379+
varying vec2 vClearcoatRoughnessMapUv;
396380
#endif
397-
#ifdef USE_SHEEN_COLORMAP
398-
399-
uniform mat3 sheenColorMapTransform;
400-
varying vec2 vSheenColorMapUv;
401381

382+
#ifdef USE_SHEEN_COLORMAP
383+
uniform mat3 sheenColorMapTransform;
384+
varying vec2 vSheenColorMapUv;
402385
#endif
403-
#ifdef USE_SHEEN_ROUGHNESSMAP
404-
405-
uniform mat3 sheenRoughnessMapTransform;
406-
varying vec2 vSheenRoughnessMapUv;
407386

387+
#ifdef USE_SHEEN_ROUGHNESSMAP
388+
uniform mat3 sheenRoughnessMapTransform;
389+
varying vec2 vSheenRoughnessMapUv;
408390
#endif
409-
#ifdef USE_IRIDESCENCEMAP
410-
411-
uniform mat3 iridescenceMapTransform;
412-
varying vec2 vIridescenceMapUv;
413391

392+
#ifdef USE_IRIDESCENCEMAP
393+
uniform mat3 iridescenceMapTransform;
394+
varying vec2 vIridescenceMapUv;
414395
#endif
415-
#ifdef USE_IRIDESCENCE_THICKNESSMAP
416-
417-
uniform mat3 iridescenceThicknessMapTransform;
418-
varying vec2 vIridescenceThicknessMapUv;
419396

397+
#ifdef USE_IRIDESCENCE_THICKNESSMAP
398+
uniform mat3 iridescenceThicknessMapTransform;
399+
varying vec2 vIridescenceThicknessMapUv;
420400
#endif
421-
#ifdef USE_SPECULARMAP
422-
423-
uniform mat3 specularMapTransform;
424-
varying vec2 vSpecularMapUv;
425401

402+
#ifdef USE_SPECULARMAP
403+
uniform mat3 specularMapTransform;
404+
varying vec2 vSpecularMapUv;
426405
#endif
427-
#ifdef USE_SPECULAR_COLORMAP
428-
429-
uniform mat3 specularColorMapTransform;
430-
varying vec2 vSpecularColorMapUv;
431406

407+
#ifdef USE_SPECULAR_COLORMAP
408+
uniform mat3 specularColorMapTransform;
409+
varying vec2 vSpecularColorMapUv;
432410
#endif
433-
#ifdef USE_SPECULAR_INTENSITYMAP
434-
435-
uniform mat3 specularIntensityMapTransform;
436-
varying vec2 vSpecularIntensityMapUv;
437411

412+
#ifdef USE_SPECULAR_INTENSITYMAP
413+
uniform mat3 specularIntensityMapTransform;
414+
varying vec2 vSpecularIntensityMapUv;
438415
#endif
439-
#ifdef USE_TRANSMISSIONMAP
440-
441-
uniform mat3 transmissionMapTransform;
442-
varying vec2 vTransmissionMapUv;
443416

417+
#ifdef USE_TRANSMISSIONMAP
418+
uniform mat3 transmissionMapTransform;
419+
varying vec2 vTransmissionMapUv;
444420
#endif
445-
#ifdef USE_THICKNESSMAP
446-
447-
uniform mat3 thicknessMapTransform;
448-
varying vec2 vThicknessMapUv;
449421

422+
#ifdef USE_THICKNESSMAP
423+
uniform mat3 thicknessMapTransform;
424+
varying vec2 vThicknessMapUv;
450425
#endif
451426

452427
// ********************* #include <displacementmap_pars_vertex>

0 commit comments

Comments
 (0)