Skip to content

Commit ecf3030

Browse files
MasatoMakinoMasatoMakino
committed
update : dependencies
1 parent bfc82e7 commit ecf3030

29 files changed

+6799
-664
lines changed

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
> Collection of shader materials for three.js
44
5-
[![ReadMe Card](https://github-readme-stats.vercel.app/api/pin/?username=MasatoMakino&repo=threejs-shader-materials&show_owner=true)](https://github.com/MasatoMakino/threejs-shader-materials)
5+
[![ReadMe Card](https://github-readme-stats.vercel.app/api/pin/?username=MasatoMakino&repo=threejs-shader-materials)](https://github.com/MasatoMakino/threejs-shader-materials)
66

77
## Demo
88

9-
[![Demo Page](https://github.com/MasatoMakino/threejs-shader-materials/blob/main/readme/demo.gif)](https://masatomakino.github.io/threejs-shader-materials/demo/)
9+
[![Demo Page ](./readme/demo.gif)](https://masatomakino.github.io/threejs-shader-materials/demo/)
1010

1111
[Demo page](https://masatomakino.github.io/threejs-shader-materials/demo/)
1212

‎demoSrc/CommonGUI.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { TextureLoader } from "three";
2-
import { Directions } from "../lib";
2+
import { Directions } from "..";
33

44
export class CommonGUI {
55
static initColorGUI(folder, mat, propName = "color") {

‎demoSrc/demoCellular.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
import { Common } from "./Common";
2-
import GUI from 'lil-gui';
2+
import GUI from "lil-gui";
33
import {
44
Color,
55
Fog,
66
Mesh,
77
PointLight,
88
PointLightHelper,
9-
SphereGeometry
9+
SphereGeometry,
1010
} from "three";
11-
import { CellularNoiseMaterial } from "../lib/";
11+
import { CellularNoiseMaterial } from "..";
1212
import { CommonGUI } from "./CommonGUI";
13-
import { RAFTicker, RAFTickerEventType } from "raf-ticker";
13+
import { RAFTicker, RAFTickerEventType } from "@masatomakino/raf-ticker";
1414

1515
export class Study {
1616
constructor() {
@@ -25,7 +25,7 @@ export class Study {
2525
const control = Common.initControl(camera, renderer);
2626
Common.initHelper(scene);
2727
const mat = this.initObject(scene);
28-
RAFTicker.addEventListener(RAFTickerEventType.tick, e => {
28+
RAFTicker.addEventListener(RAFTickerEventType.tick, (e) => {
2929
renderer.render(scene, camera);
3030
});
3131

@@ -43,7 +43,7 @@ export class Study {
4343
const geo = new SphereGeometry(30, seg, seg);
4444

4545
const mat = new CellularNoiseMaterial({
46-
fog: scene.fog !== undefined
46+
fog: scene.fog !== undefined,
4747
});
4848
mat.color = new Color(0x0055ff);
4949
mat.transparent = true;

‎demoSrc/demoContour.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ import {
44
Mesh,
55
PointLight,
66
PointLightHelper,
7-
TorusGeometry
7+
TorusGeometry,
88
} from "three";
99
import { Common } from "./Common";
10-
import { ContourMaterial } from "../lib/contour/ContourMaterial";
11-
import { RAFTicker, RAFTickerEventType } from "raf-ticker";
10+
import { ContourMaterial } from "..";
11+
import { RAFTicker, RAFTickerEventType } from "@masatomakino/raf-ticker";
1212

1313
export class StudyContourMap {
1414
constructor() {
@@ -23,7 +23,7 @@ export class StudyContourMap {
2323
const control = Common.initControl(camera, renderer);
2424
Common.initHelper(scene);
2525
this.initObject(scene);
26-
RAFTicker.addEventListener(RAFTickerEventType.tick, e => {
26+
RAFTicker.addEventListener(RAFTickerEventType.tick, (e) => {
2727
renderer.render(scene, camera);
2828
});
2929
}
@@ -39,7 +39,7 @@ export class StudyContourMap {
3939

4040
const mat = new ContourMaterial({
4141
opacity: 0.75,
42-
fog: scene.fog !== undefined
42+
fog: scene.fog !== undefined,
4343
});
4444
mat.loadMap("./textures/contour_glow.png", geo);
4545
mat.startGlow();

‎demoSrc/demoCrossGrid.js‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
1-
import GUI from 'lil-gui';
1+
import GUI from "lil-gui";
22
import { Common } from "./Common";
33
import {
44
Color,
55
Fog,
66
Mesh,
77
PointLight,
88
PointLightHelper,
9-
SphereGeometry
9+
SphereGeometry,
1010
} from "three";
11-
import { Directions } from "../lib/chunk/WavyAnimationChunk";
12-
import { CrossGridMaterial } from "../lib/crossGrid/CrossGridMaterial";
11+
import { CrossGridMaterial, Directions } from "..";
1312
import { CommonGUI } from "./CommonGUI";
14-
import { RAFTicker, RAFTickerEventType } from "raf-ticker";
13+
import { RAFTicker, RAFTickerEventType } from "@masatomakino/raf-ticker";
1514

1615
export class StudyCrossGrid {
1716
constructor() {
@@ -26,7 +25,7 @@ export class StudyCrossGrid {
2625
const control = Common.initControl(camera, renderer);
2726
Common.initHelper(scene);
2827
const mat = this.initObject(scene);
29-
RAFTicker.addEventListener(RAFTickerEventType.tick, e => {
28+
RAFTicker.addEventListener(RAFTickerEventType.tick, (e) => {
3029
renderer.render(scene, camera);
3130
});
3231
this.initGUI(mat);
@@ -42,7 +41,7 @@ export class StudyCrossGrid {
4241
const geo = new SphereGeometry(10, 64, 64);
4342

4443
const mat = new CrossGridMaterial({
45-
fog: scene.fog !== undefined
44+
fog: scene.fog !== undefined,
4645
});
4746
mat.color = new Color(0xff6666);
4847
mat.direction = Directions.vertical;

‎demoSrc/demoExpansion.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ import {
44
Mesh,
55
PointLight,
66
PointLightHelper,
7-
TorusGeometry
7+
TorusGeometry,
88
} from "three";
99
import { Common } from "./Common";
10-
import { ExpansionMaterial } from "../lib/expansion/ExpansionMaterial";
11-
import GUI from 'lil-gui';
10+
import { ExpansionMaterial } from "..";
11+
import GUI from "lil-gui";
1212
import { CommonGUI } from "./CommonGUI";
13-
import { RAFTicker, RAFTickerEventType } from "raf-ticker";
13+
import { RAFTicker, RAFTickerEventType } from "@masatomakino/raf-ticker";
1414

1515
export class Study {
1616
constructor() {
@@ -25,7 +25,7 @@ export class Study {
2525
const control = Common.initControl(camera, renderer);
2626
Common.initHelper(scene);
2727
const mat = this.initObject(scene);
28-
RAFTicker.addEventListener(RAFTickerEventType.tick, e => {
28+
RAFTicker.addEventListener(RAFTickerEventType.tick, (e) => {
2929
renderer.render(scene, camera);
3030
});
3131
this.initGUI(mat);
@@ -43,7 +43,7 @@ export class Study {
4343
const geoExp = new TorusGeometry(10, 4, seg, seg);
4444

4545
const mat = new ExpansionMaterial({
46-
fog: scene.fog !== undefined
46+
fog: scene.fog !== undefined,
4747
});
4848
mat.color = new Color(0xff0000);
4949

‎demoSrc/demoExpansionDissolve.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
import { Common } from "./Common";
2-
import GUI from 'lil-gui';
2+
import GUI from "lil-gui";
33
import {
44
Color,
55
Fog,
66
Mesh,
77
PointLight,
88
PointLightHelper,
99
SphereGeometry,
10-
TextureLoader
10+
TextureLoader,
1111
} from "three";
1212
import { CommonGUI } from "./CommonGUI";
13-
import { ExpansionDissolveMaterial } from "../lib/expansionDissolve/ExpansionDissolveMaterial";
14-
import { RAFTicker, RAFTickerEventType } from "raf-ticker";
13+
import { ExpansionDissolveMaterial } from "..";
14+
import { RAFTicker, RAFTickerEventType } from "@masatomakino/raf-ticker";
1515

1616
export class Study {
1717
constructor() {
@@ -26,7 +26,7 @@ export class Study {
2626
const control = Common.initControl(camera, renderer);
2727
Common.initHelper(scene);
2828
const mat = this.initObject(scene);
29-
RAFTicker.addEventListener(RAFTickerEventType.tick, e => {
29+
RAFTicker.addEventListener(RAFTickerEventType.tick, (e) => {
3030
renderer.render(scene, camera);
3131
});
3232

@@ -44,7 +44,7 @@ export class Study {
4444
const geo = new SphereGeometry(30, seg, seg);
4545

4646
const mat = new ExpansionDissolveMaterial({
47-
fog: scene.fog !== undefined
47+
fog: scene.fog !== undefined,
4848
});
4949
mat.color = new Color(0x334466);
5050
mat.tiles = 2;

‎demoSrc/demoFBMDissolve.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
import { Common } from "./Common";
2-
import GUI from 'lil-gui';
2+
import GUI from "lil-gui";
33
import {
44
Color,
55
Fog,
66
Mesh,
77
PointLight,
88
PointLightHelper,
9-
SphereGeometry
9+
SphereGeometry,
1010
} from "three";
11-
import { FBMDissolveMaterial } from "../lib/fbmDissolve/FBMDissolveMaterial";
11+
import { FBMDissolveMaterial } from "..";
1212
import { CommonGUI } from "./CommonGUI";
13-
import { RAFTicker, RAFTickerEventType } from "raf-ticker";
13+
import { RAFTicker, RAFTickerEventType } from "@masatomakino/raf-ticker";
1414

1515
export class Study {
1616
constructor() {
@@ -25,7 +25,7 @@ export class Study {
2525
const control = Common.initControl(camera, renderer);
2626
Common.initHelper(scene);
2727
const mat = this.initObject(scene);
28-
RAFTicker.addEventListener(RAFTickerEventType.tick, e => {
28+
RAFTicker.addEventListener(RAFTickerEventType.tick, (e) => {
2929
renderer.render(scene, camera);
3030
});
3131

@@ -43,7 +43,7 @@ export class Study {
4343
const geo = new SphereGeometry(30, seg, seg);
4444

4545
const mat = new FBMDissolveMaterial({
46-
fog: scene.fog !== undefined
46+
fog: scene.fog !== undefined,
4747
});
4848
mat.color = new Color(0x334466);
4949
mat.edgeColor = new Color(0x88ff77);

‎demoSrc/demoFBMFire.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
import { Common } from "./Common";
2-
import GUI from 'lil-gui';
2+
import GUI from "lil-gui";
33
import {
44
Color,
55
Fog,
66
Mesh,
77
PointLight,
88
PointLightHelper,
9-
SphereGeometry
9+
SphereGeometry,
1010
} from "three";
11-
import { FBMFireMaterial } from "../lib/";
11+
import { FBMFireMaterial } from "..";
1212
import { CommonGUI } from "./CommonGUI";
13-
import { RAFTicker, RAFTickerEventType } from "raf-ticker";
13+
import { RAFTicker, RAFTickerEventType } from "@masatomakino/raf-ticker";
1414

1515
export class Study {
1616
constructor() {
@@ -26,7 +26,7 @@ export class Study {
2626
Common.initHelper(scene);
2727
const mat = this.initObject(scene);
2828

29-
RAFTicker.addEventListener(RAFTickerEventType.tick, e => {
29+
RAFTicker.addEventListener(RAFTickerEventType.tick, (e) => {
3030
renderer.render(scene, camera);
3131
});
3232

@@ -43,7 +43,7 @@ export class Study {
4343
const geo = new SphereGeometry(30, 32, 32);
4444

4545
const mat = new FBMFireMaterial({
46-
fog: scene.fog !== undefined
46+
fog: scene.fog !== undefined,
4747
});
4848
mat.color = new Color(0xcc3300);
4949
mat.tiles = 1;

‎demoSrc/demoHalftoneGrid.js‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
import { Common } from "./Common";
22
import { CommonGUI } from "./CommonGUI";
3-
import GUI from 'lil-gui';
3+
import GUI from "lil-gui";
44
import {
55
Color,
66
Fog,
77
Mesh,
88
PointLight,
99
PointLightHelper,
10-
SphereGeometry
10+
SphereGeometry,
1111
} from "three";
12-
import { HalftoneGridMaterial } from "../lib/halftoneGrid/HalftoneGridMaterial";
13-
import { Directions } from "../lib/chunk/WavyAnimationChunk";
14-
import { RAFTicker, RAFTickerEventType } from "raf-ticker";
12+
import { Directions, HalftoneGridMaterial } from "..";
13+
import { RAFTicker, RAFTickerEventType } from "@masatomakino/raf-ticker";
1514

1615
export class StudyHalftoneGrid {
1716
constructor() {
@@ -26,7 +25,7 @@ export class StudyHalftoneGrid {
2625
const control = Common.initControl(camera, renderer);
2726
Common.initHelper(scene);
2827
const mat = this.initObject(scene);
29-
RAFTicker.addEventListener(RAFTickerEventType.tick, e => {
28+
RAFTicker.addEventListener(RAFTickerEventType.tick, (e) => {
3029
renderer.render(scene, camera);
3130
});
3231
this.initGUI(mat);
@@ -43,7 +42,7 @@ export class StudyHalftoneGrid {
4342

4443
const mat = new HalftoneGridMaterial({
4544
// side:DoubleSide,
46-
fog: scene.fog !== undefined
45+
fog: scene.fog !== undefined,
4746
});
4847
mat.color = new Color(0xff6666);
4948
mat.direction = Directions.vertical;

0 commit comments

Comments
 (0)