This commit is contained in:
ad044 2020-09-21 02:38:51 +04:00
parent c5fdf65e17
commit 858822af47
7 changed files with 109 additions and 54 deletions

View file

@ -2,5 +2,5 @@ import { atom } from 'recoil'
export const currentBlueOrbAtom = atom({ export const currentBlueOrbAtom = atom({
key: 'currentBlueOrbAtom', key: 'currentBlueOrbAtom',
default: "0422" default: "0520"
}) })

View file

@ -44,33 +44,34 @@ const GrayPlanes = memo(() => {
}); });
return ( return (
<a.group // separate wrapper group to make it rotate around [0,0,0]
position={[0.1, 0, -2]} <a.group rotation-y={grayPlaneState.grayPlaneRotY}>
position-y={grayPlaneState.grayPlanePosY} <a.group
rotation={[0, 0, 0]} position={[0.1, 0, -2]}
rotation-y={grayPlaneState.grayPlaneRotY} position-y={grayPlaneState.grayPlanePosY}
ref={grayPlaneGroupRef} ref={grayPlaneGroupRef}
visible={grayPlanesVisible} visible={grayPlanesVisible}
> >
{grayPlaneRefs.map((ref, idx: number) => { {grayPlaneRefs.map((ref, idx: number) => {
return ( return (
<mesh <mesh
scale={[0.04, 10, 0.04]} scale={[0.04, 10, 0.04]}
position={grayPlanePoses[idx] as [number, number, number]} position={grayPlanePoses[idx] as [number, number, number]}
ref={ref} ref={ref}
key={idx} key={idx}
> >
<planeBufferGeometry attach="geometry" /> <planeBufferGeometry attach="geometry" />
<meshBasicMaterial <meshBasicMaterial
attach="material" attach="material"
color={0xd3d3d3} color={0xd3d3d3}
opacity={0.2} opacity={0.2}
transparent={true} transparent={true}
side={THREE.DoubleSide} side={THREE.DoubleSide}
/> />
</mesh> </mesh>
); );
})} })}
</a.group>
</a.group> </a.group>
); );
}); });

View file

@ -62,8 +62,9 @@ const GrayRing = memo((props: GrayRingProps) => {
vec4 color(vec2 vUv, int quadnum, bool textureexists, int thinperiod, int quadlen, float step) { vec4 color(vec2 vUv, int quadnum, bool textureexists, int thinperiod, int quadlen, float step) {
if (!textureexists) { if (!textureexists) {
return vec4(0.259,0.259,0.322, 1); return vec4(0.259,0.259,0.322, 1);
} else if (quadnum % 2 == 1) { } else if (uint(quadnum) % uint(2) == uint(1)) {
return texture2D(hole, vec2(tolocal(vUv.x, quadlen-thinperiod, step), vUv.y)); return texture2D(hole, vec2(tolocal(vUv.x, quadlen-thinperiod, step), vUv.y));
// return vec4(tolocal(vUv.x, quadlen-thinperiod, step), 0, 0, 1);
} else if (quadnum == 0) { } else if (quadnum == 0) {
return texture2D(lof, vec2(tolocal(vUv.x, quadlen-thinperiod, step), vUv.y)); return texture2D(lof, vec2(tolocal(vUv.x, quadlen-thinperiod, step), vUv.y));
} else { } else {
@ -84,18 +85,18 @@ const GrayRing = memo((props: GrayRingProps) => {
int quadlen = int(step)/4; int quadlen = int(step)/4;
// segment within circle's quad // segment within circle's quad
int quadel = int(segment) % quadlen; uint quadel = uint(segment) % uint(quadlen);
// which quad // which quad
int quadnum = int(segment) / quadlen; int quadnum = int(uint(segment) / uint(quadlen));
// how big thin part is // how big thin part is
int thinperiod = 8; int thinperiod = 8;
if (quadel < thinperiod && isheight(vUv.y, thin)) { if (quadel < uint(thinperiod) && isheight(vUv.y, thin)) {
// thin line // thin line
gl_FragColor = color(vUv, quadnum, false, thinperiod, quadlen, step); gl_FragColor = color(vUv, quadnum, false, thinperiod, quadlen, step);
} else if (quadel == thinperiod) { } else if (quadel == uint(thinperiod)) {
// slope up // slope up
float dist = tolocal(vUv.x, 1, step); float dist = tolocal(vUv.x, 1, step);
if (vUv.y > slope(1.0-dist, thin) && vUv.y < 1.0-slope(1.0-dist, thin)) { if (vUv.y > slope(1.0-dist, thin) && vUv.y < 1.0-slope(1.0-dist, thin)) {
@ -103,7 +104,7 @@ const GrayRing = memo((props: GrayRingProps) => {
} else { } else {
gl_FragColor = vec4(0, 0, 0, 0); gl_FragColor = vec4(0, 0, 0, 0);
} }
} else if (quadel == quadlen-1) { } else if (quadel == uint(quadlen-1)) {
// slope down // slope down
float dist = tolocal(vUv.x, 1, step); float dist = tolocal(vUv.x, 1, step);
if (vUv.y > slope(dist, thin) && vUv.y < 1.0-slope(dist, thin)) { if (vUv.y > slope(dist, thin) && vUv.y < 1.0-slope(dist, thin)) {
@ -111,7 +112,7 @@ const GrayRing = memo((props: GrayRingProps) => {
} else { } else {
gl_FragColor = vec4(0, 0, 0, 0); gl_FragColor = vec4(0, 0, 0, 0);
} }
} else if (quadel > thinperiod) { } else if (quadel > uint(thinperiod)) {
gl_FragColor = color(vUv, quadnum, true, thinperiod, quadlen, step); gl_FragColor = color(vUv, quadnum, true, thinperiod, quadlen, step);
} else { } else {
// transparent // transparent

View file

@ -88,18 +88,18 @@ const PurpleRing = memo((props: PurpleRingProps) => {
float thick = 1.0; float thick = 1.0;
float slopefactor = 1.0; float slopefactor = 1.0;
int halfc = int(step)/2; uint halfc = uint(step)/uint(2);
// segment within circle // segment within circle
int segment = int(floor(vUv.x * step)); uint segment = uint(floor(vUv.x * step));
int thinperiod = halfc-8; uint thinperiod = halfc-uint(8);
int halfel = segment % halfc; uint halfel = segment % halfc;
if (halfel < thinperiod-1 && istop(vUv.y, thin)) { if (halfel < thinperiod-uint(1) && istop(vUv.y, thin)) {
// thin line top // thin line top
gl_FragColor = color(vUv, step, false); gl_FragColor = color(vUv, step, false);
} else if (halfel == thinperiod - 1) { } else if (halfel == thinperiod - uint(1)) {
// thin line and corner // thin line and corner
float dist = tolocal(vUv.x, 1, step); float dist = tolocal(vUv.x, 1, step);
float val = 1.0-slope(1.0-dist, thin); float val = 1.0-slope(1.0-dist, thin);
@ -117,10 +117,10 @@ const PurpleRing = memo((props: PurpleRingProps) => {
} else { } else {
gl_FragColor = vec4(0, 0, 0, 0); gl_FragColor = vec4(0, 0, 0, 0);
} }
} else if (halfel == thinperiod+1 && isbottom(vUv.y, thin)) { } else if (halfel == thinperiod+uint(1) && isbottom(vUv.y, thin)) {
// thin line bottom // thin line bottom
gl_FragColor = vec4(0.325,0.325,0.698, 1); gl_FragColor = vec4(0.325,0.325,0.698, 1);
} else if (halfel == thinperiod + 2) { } else if (halfel == thinperiod + uint(2)) {
// slope up // slope up
float dist = tolocal(vUv.x, 1, step); float dist = tolocal(vUv.x, 1, step);
float val = 1.0-slope(1.0-dist, thin); float val = 1.0-slope(1.0-dist, thin);
@ -129,10 +129,10 @@ const PurpleRing = memo((props: PurpleRingProps) => {
} else { } else {
gl_FragColor = vec4(0, 0, 0, 0); gl_FragColor = vec4(0, 0, 0, 0);
} }
} else if (halfel > thinperiod + 2 && halfel < thinperiod+7) { } else if (halfel > thinperiod + uint(2) && halfel < thinperiod+uint(7)) {
// thick part // thick part
gl_FragColor = color(vUv, step, true); gl_FragColor = color(vUv, step, true);
} else if (halfel == thinperiod+7) { } else if (halfel == thinperiod+uint(7)) {
// slope up // slope up
float dist = tolocal(vUv.x, 1, step); float dist = tolocal(vUv.x, 1, step);
float val = slope(dist, thin); float val = slope(dist, thin);

View file

@ -33,7 +33,7 @@
"up": "", "up": "",
"down": "", "down": "",
"left": "0506", "left": "0506",
"right": "" "right": "+0520"
}, },
"0515": { "0515": {
"up": "", "up": "",
@ -47,10 +47,16 @@
"left": "+0517", "left": "+0517",
"right": "" "right": ""
}, },
"0500": { "0517": {
"up": "0508", "up": "",
"down": "", "down": "",
"left": "+0517", "left": "+0500",
"right": ""
},
"0500": {
"up": "",
"down": "",
"left": "0510",
"right": "" "right": ""
} }
} }

View file

@ -178,5 +178,45 @@
"type": "normal", "type": "normal",
"initial_position": [1.36, 0.13, -8.6] "initial_position": [1.36, 0.13, -8.6]
} }
},
"10": {
"long": {
"position": [-0.45, -0.09, -8.6],
"scale": [1, 0.03, 1],
"type": "normal",
"initial_position": [-1.45, -0.09, -8.6]
},
"boring": {
"position": [0.5, -0.07, -8.6],
"scale": [1, 0.03, 1],
"type": "normal",
"initial_position": [1.48, -0.07, -8.6]
},
"big": {
"position": [0.35, -0.12, -8.6],
"scale": [0.5, 0.06, 1],
"type": "normal",
"initial_position": [1.36, -0.12, -8.6]
}
},
"20": {
"long": {
"position": [-0.45, 0.15, -8.6],
"scale": [1, 0.03, 1],
"type": "normal",
"initial_position": [-1.45, 0.15, -8.6]
},
"boring": {
"position": [0.48, 0.174, -8.6],
"scale": [1, 0.03, 1],
"type": "normal",
"initial_position": [1.48, 0.174, -8.6]
},
"big": {
"position": [0.36, 0.13, -8.6],
"scale": [0.5, 0.06, 1],
"type": "normal",
"initial_position": [1.36, 0.13, -8.6]
}
} }
} }

View file

@ -37,14 +37,14 @@
"5": { "5": {
"position": [0.4, 1.87, 1.3], "position": [0.4, 1.87, 1.3],
"scale": [0.25, 0.15, 0.25], "scale": [0.25, 0.15, 0.25],
"rotation": [0, 0.09, 0], "rotation": [0, 0.27, 0],
"sprite": "Dc", "sprite": "Dc",
"id": "0513" "id": "0513"
}, },
"6": { "6": {
"position": [-1, 1.87, 0.95], "position": [-1, 1.87, 0.95],
"scale": [0.25, 0.15, 0.25], "scale": [0.25, 0.15, 0.25],
"rotation": [0, -0.8, 0], "rotation": [0, -0.9, 0],
"sprite": "Tda", "sprite": "Tda",
"id": "0515" "id": "0515"
}, },
@ -70,10 +70,17 @@
"id": "0517" "id": "0517"
}, },
"10": { "10": {
"position": [-1.25, 2.17, -0.5], "position": [-0.85, 1.87, -1.05],
"scale": [0.25, 0.15, 0.25], "scale": [0.25, 0.15, 0.25],
"rotation": [0, -1.85, 0], "rotation": [0, -2.45, 0],
"sprite": "Tda", "sprite": "Cou",
"id": "0510" "id": "0510"
},
"11": {
"position": [1, 2.17, 0.9],
"scale": [0.25, 0.15, 0.25],
"rotation": [0, 0.69, 0],
"sprite": "Cou",
"id": "0520"
} }
} }