mirror_maker/lainTSX
1
0
Fork 0
mirror of https://github.com/ad044/lainTSX.git synced 2024-10-22 23:19:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

nah fuck that, reverted most stuff

Browse source
This commit is contained in:
ad044 2020-09-26 22:57:16 +04:00
parent a6c7f29c93
commit 014137287e
19 changed files with 1100 additions and 1158 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
package-lock.json generated
View file

@ -2352,8 +2352,7 @@
"arg": {
"version": "4.1.3",
"resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
"integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
"dev": true
"integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA=="
},
"argparse": {
"version": "1.0.10",
@ -4538,8 +4537,7 @@
"diff": {
"version": "4.0.2",
"resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
"integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
"dev": true
"integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A=="
},
"diff-sequences": {
"version": "24.9.0",
@ -8118,8 +8116,7 @@
"make-error": {
"version": "1.3.6",
"resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
"integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
"dev": true
"integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw=="
},
"makeerror": {
"version": "1.0.11",
@ -12698,7 +12695,6 @@
"version": "9.0.0",
"resolved": "https://registry.npmjs.org/ts-node/-/ts-node-9.0.0.tgz",
"integrity": "sha512-/TqB4SnererCDR/vb4S/QvSZvzQMJN8daAslg7MeaiHvD8rDZsSfXmNeNumyZZzMned72Xoq/isQljYSt8Ynfg==",
"dev": true,
"requires": {
"arg": "^4.1.0",
"diff": "^4.0.1",
@ -13949,8 +13945,7 @@
"yn": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
"integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
"dev": true
"integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q=="
}
}
}

4
package.json
View file

@ -46,7 +46,5 @@
]
},
"homepage": ".",
"devDependencies": {
}
"devDependencies": {}
}

4
src/components/BlueOrb/BlueOrb.tsx
View file

@ -119,7 +119,7 @@ const BlueOrb = memo((props: BlueOrbContructorProps) => {
<group position={[0, (level_y_values as LevelYValues)[props.level], 0]}>
<mesh
position={props.position as [number, number, number]}
scale={[(0.046 * 90) / 100, (0.028 * 90) / 100, (0.046 * 90) / 100]}
scale={[0.25, 0.15, 0.25]}
rotation={props.rotation as [number, number, number]}
renderOrder={1}
>
@ -135,7 +135,7 @@ const BlueOrb = memo((props: BlueOrbContructorProps) => {
transparent={true}
/>
) : (
<meshBasicMaterial
<meshStandardMaterial
attach="material"
map={nonActiveTexture}
side={THREE.DoubleSide}

6
src/components/GrayRing.tsx
View file

@ -99,7 +99,7 @@ const GrayRing = memo((props: GrayRingProps) => {
addedLights.rgb += clamp(dot(-lightDirection,
vNormal), 0.0, 1.0)
* pointLights[l].color
* 150.0;
* 50.0;
}
@ -156,10 +156,10 @@ const GrayRing = memo((props: GrayRingProps) => {
position={[0, props.grayRingPosY, 0]}
rotation={[0, 3.95, 0]}
renderOrder={1}
scale={[185, 185, 185]}
scale={[33, 33, 33]}
>
<cylinderBufferGeometry
args={[0.001, 0.001, 0.000075, 64, 64, true]}
args={[0.04, 0.04, 0.0025, 64, 64, true]}
attach="geometry"
/>
<shaderMaterial

19
src/components/InputHandler.tsx
View file

@ -6,7 +6,7 @@ import {
LainMoveUp,
LainStanding,
} from "./Lain/Lain";
import { useRecoilState, useRecoilValue, useSetRecoilState } from "recoil";
import { useRecoilState, useSetRecoilState } from "recoil";
import { currentHUDAtom, hudActiveAtom } from "./HUD/HUDElementAtom";
import { currentBlueOrbAtom } from "./BlueOrb/CurrentBlueOrbAtom";
import lain_animations from "../resources/lain_animations.json";
@ -16,7 +16,6 @@ import {
lainMoveStateAtom,
lainMovingAtom,
lainPosYAtom,
lainRotYAtom,
} from "./Lain/LainAtom";
import { camPosYAtom, camRotYAtom } from "./MainScene/CameraAtom";
import {
@ -70,7 +69,6 @@ const InputHandler = () => {
const [lainMoving, setLainMoving] = useRecoilState(lainMovingAtom);
const setLainMoveState = useSetRecoilState(lainMoveStateAtom);
const setLainRotY = useSetRecoilState(lainRotYAtom);
const [spriteUpdateCooldown, setSpriteUpdateCooldown] = useState(false);
@ -140,7 +138,6 @@ const InputHandler = () => {
setOrthoCamRotY((prev: number) => prev - val);
setGrayPlaneRotY((prev: number) => prev - val);
setLightRotY((prev: number) => prev - val);
setLainRotY((prev: number) => prev - val);
setTimeout(() => {
setMiddleRingRotY((prev: number) => prev - 0.55);
@ -153,7 +150,6 @@ const InputHandler = () => {
setGrayPlaneRotY,
setLightRotY,
setMiddleRingRotY,
setLainRotY,
]
);
@ -177,7 +173,7 @@ const InputHandler = () => {
setLainMoveState(<LainMoveDown />);
setTimeout(() => {
moveCamera(0.25);
moveCamera(1.5);
}, 1300);
// make noise appear again
@ -190,7 +186,7 @@ const InputHandler = () => {
setMiddleRingRotating(false);
}, 700);
// set ring rotation on x axis to create motion effect
// set ring rotation on x axis to craete motion effect
setTimeout(() => {
setMiddleRingRotX(0.3);
}, 1500);
@ -241,7 +237,7 @@ const InputHandler = () => {
setLainMoveState(<LainMoveUp />);
setTimeout(() => {
moveCamera(-0.25);
moveCamera(-1.5);
}, 1300);
// change noise to 0, make the ring bend downwards
@ -323,7 +319,6 @@ const InputHandler = () => {
setLainMoving,
setMiddleRingNoise,
setMiddleRingRotX,
setMiddleRingRotZ,
setMiddleRingRotating,
setMiddleRingWobbleStrength,
]
@ -400,16 +395,12 @@ const InputHandler = () => {
const key = getKeyCodeAssociation(keyCode);
if (key && !lainMoving) {
setTimeout(() => {
rotateCamera(0.785);
}, 1100);
//
const move = getMove(currentBlueOrb, key);
moveDispatcher(move, key);
}
},
[lainMoving, currentBlueOrb, moveDispatcher, rotateCamera]
[lainMoving, currentBlueOrb, moveDispatcher]
);
useEffect(() => {

15
src/components/Lain/Lain.tsx
View file

@ -10,12 +10,7 @@ import moveRightSpriteSheet from "../../static/sprites/move_right.png";
import standingSpriteSheet from "../../static/sprites/standing.png";
import introSpriteSheet from "../../static/sprites/intro.png";
import { useRecoilValue } from "recoil";
import {
lainMoveStateAtom,
lainMovingAtom,
lainPosYAtom,
lainRotYAtom,
} from "./LainAtom";
import { lainMoveStateAtom, lainMovingAtom, lainPosYAtom } from "./LainAtom";
type LainConstructorProps = {
sprite: string;
@ -122,25 +117,21 @@ const Lain = () => {
const lainMoving = useRecoilValue(lainMovingAtom);
const lainMoveState = useRecoilValue(lainMoveStateAtom);
const lainPosY = useRecoilValue(lainPosYAtom);
const lainRotY = useRecoilValue(lainRotYAtom);
const lainPosYState = useSpring({
lainPosY: lainPosY,
lainRotY: lainRotY,
config: { duration: 1200 },
});
return (
<Suspense fallback={<>loading...</>}>
<a.group rotation-y={lainPosYState.lainRotY}>
<a.sprite
position-x={0.1}
position-y={lainPosYState.lainPosY}
position-z={0.05}
scale={[0.6, 0.6, 0.6]}
scale={[4.9, 4.9, 4.9]}
>
{lainMoving ? lainMoveState : <LainStanding />}
</a.sprite>
</a.group>
</Suspense>
);
};

2
src/components/Lain/LainAtom.tsx
View file

@ -3,7 +3,7 @@ import React from "react";
export const lainPosYAtom = atom({
key: "lainPosYAtom",
default: -0.02,
default: -0.15,
});
export const lainRotYAtom = atom({

4
src/components/Level.tsx
View file

@ -11,8 +11,8 @@ type LevelProps = {
const Level = (props: LevelProps) => {
return (
<group position={[0, props.levelPosY, 0]}>
<PurpleRing purpleRingPosY={0.07} />
<GrayRing grayRingPosY={-0.045} />
<PurpleRing purpleRingPosY={0.43} />
<GrayRing grayRingPosY={-0.28} />
<CyanCrystal crystalRingPosY={-0.45} />
</group>
);

26
src/components/Lights/Lights.tsx
View file

@ -1,4 +1,4 @@
import React, { memo, useRef } from "react";
import React, { memo } from "react";
import { useRecoilValue } from "recoil";
import { a, useSpring } from "@react-spring/three";
import { lightPosYAtom, lightRotYAtom } from "./LightsAtom";
@ -18,25 +18,11 @@ const Lights = memo(() => {
position-y={lightState.lightPosY}
rotation-y={lightState.lightRotY}
>
<pointLight color={0xffffff} position={[0, 0, 6]} intensity={1} />
<pointLight color={0x7f7f7f} position={[0, 0.5, -0.5]} intensity={2.5} />
{/*<pointLight color={0xffffff} position={[0, 0, 6.2]} intensity={1} />*/}
{/*<mesh position={[50.09, -1, 5.2]} scale={[0.1, 0.1, 0.1]}>*/}
{/* <sphereBufferGeometry attach="geometry">*/}
{/* <meshStandardMaterial color={0xffffff} attach="material" />*/}
{/* </sphereBufferGeometry>*/}
{/*</mesh>*/}
{/*<pointLight color={0xffffff} position={[0.08, 0, 0]} intensity={0.3} />*/}
{/*<mesh position={[0.08, 0, 0]} scale={[0.01, 0.01, 0.01]}>*/}
{/* <sphereBufferGeometry attach="geometry">*/}
{/* <meshStandardMaterial color={0xffffff} attach="material" />*/}
{/* </sphereBufferGeometry>*/}
{/*</mesh>*/}
<ambientLight color={0x808080} intensity={0.6} />
<pointLight color={0xffffff} position={[0, 0, 7]} intensity={0.7} />
<pointLight color={0x7f7f7f} position={[0, 10, 0]} intensity={1.5} />
<pointLight color={0xffffff} position={[-8, 0, 0]} intensity={0.3} />
<pointLight color={0xffffff} position={[8, 0, 0]} intensity={0.3} />
</a.group>
);
});

7
src/components/MainScene/MainScene.tsx
View file

@ -1,7 +1,7 @@
import { a, useSpring } from "@react-spring/three";
import { OrbitControls } from "drei";
import React, { Suspense, useEffect } from "react";
import Site from "../Site/Site";
import Site from "../Site";
import Lain, { LainIntro } from "../Lain/Lain";
import Lights from "../Lights/Lights";
import OrthoCamera from "../OrthoCamera/OrthoCamera";
@ -55,10 +55,9 @@ const MainScene = () => {
return (
<a.perspectiveCamera
position-z={4.69}
position-z={3}
position-y={cameraState.camPosY}
rotation-y={cameraState.camRotY}
rotation-x={-0.01}
>
<Suspense fallback={null}>
<MainSceneIntro />
@ -74,7 +73,7 @@ const MainScene = () => {
<Starfield />
<GrayPlanes />
<Lights />
{/*<MiddleRing />*/}
<MiddleRing />
<OrbitControls />
</a.group>
<Lain />

17
src/components/PurpleRing.tsx
View file

@ -1,6 +1,7 @@
import React, { memo, useRef } from "react";
import React, { memo, useMemo, useRef } from "react";
import { useFrame, useLoader } from "react-three-fiber";
import * as THREE from "three";
import { GLTF } from "three/examples/jsm/loaders/GLTFLoader";
import siteATex from "../static/sprites/site_a.png";
import siteBTex from "../static/sprites/site_b.png";
@ -14,6 +15,14 @@ const PurpleRing = memo((props: PurpleRingProps) => {
const purpleRingRef = useRef<THREE.Object3D>();
// const uniforms = useMemo(
// () => ({
// siteA: { type: "t", value: siteA },
// siteB: { type: "t", value: siteB },
// }),
// [siteA, siteB]
// );
const uniforms = THREE.UniformsUtils.merge([THREE.UniformsLib["lights"]]);
uniforms.siteA = { type: "t", value: siteA };
@ -99,7 +108,7 @@ const PurpleRing = memo((props: PurpleRingProps) => {
addedLights.rgb += clamp(dot(-lightDirection,
vNormal), 0.0, 1.0)
* pointLights[l].color
* 80.0;
* 50.0;
}
// number of segments
@ -177,11 +186,11 @@ const PurpleRing = memo((props: PurpleRingProps) => {
position={[0, props.purpleRingPosY, 0]}
rotation={[0, 0.5, 0]}
renderOrder={1}
scale={[95, 95, 95]}
scale={[25, 25, 25]}
ref={purpleRingRef}
>
<cylinderBufferGeometry
args={[0.0019, 0.0019, 0.00015, 64, 64, true]}
args={[0.05, 0.05, 0.0035, 64, 64, true]}
attach="geometry"
/>
<shaderMaterial

89
src/components/Site.tsx Normal file
View file

@ -0,0 +1,89 @@
import React, { memo, Suspense } from "react";
import site_a from "../resources/site_a.json";
import blue_orb_positions from "../resources/blue_orb_positions.json";
import BlueOrb from "./BlueOrb/BlueOrb";
import { useRecoilValue } from "recoil";
import { currentBlueOrbAtom } from "./BlueOrb/CurrentBlueOrbAtom";
import Level from "./Level";
import level_y_values from "../resources/level_y_values.json";
type ImageTableIndices = {
1: string;
2: string;
3: string;
};
type ProtocolLines = {
1: string;
2: string;
3: string;
4: string;
};
type Words = {
1: string;
2: string;
3: string;
};
type BlueOrbData = {
"SLPS_016_0x offset": string;
image_table_indices: ImageTableIndices;
is_hidden: string;
media_file: string;
node_name: string;
protocol_lines: ProtocolLines;
site: string;
type: string;
unlocked_by: string;
upgrade_requirement: string;
words: Words;
};
type BlueOrbPositionData = {
position: number[];
rotation: number[];
};
type BlueOrbPositions = {
[orbPos: string]: BlueOrbPositionData;
};
const Site = memo(() => {
const currentBlueOrb = useRecoilValue(currentBlueOrbAtom);
return (
<>
<Suspense fallback={<>loading...</>}>
{/* distance between LEVELS is 1.5 */}
{Object.values(level_y_values).map((yVal) => {
return <Level levelPosY={yVal} key={yVal} />;
})}
{Object.entries(site_a).map((blueOrb: [string, BlueOrbData]) => {
if (blueOrb[1]["unlocked_by"] === "-1")
return (
<BlueOrb
sprite={blueOrb[1]["node_name"]}
position={
(blue_orb_positions as BlueOrbPositions)[
blueOrb[0].substr(2)
]["position"]
}
rotation={
(blue_orb_positions as BlueOrbPositions)[
blueOrb[0].substr(2)
]["rotation"]
}
key={blueOrb[1]["node_name"]}
active={blueOrb[0] === currentBlueOrb}
level={blueOrb[0].substr(0, 2)}
/>
);
})}
</Suspense>
</>
);
});
export default Site;

106
src/components/Site/Site.tsx
View file

@ -1,106 +0,0 @@
import React, {
memo,
Suspense,
useEffect,
useMemo,
useRef,
useState,
} from "react";
import site_a from "../../resources/site_a.json";
import blue_orb_positions from "../../resources/blue_orb_positions.json";
import BlueOrb from "../BlueOrb/BlueOrb";
import { useRecoilValue } from "recoil";
import { currentBlueOrbAtom } from "../BlueOrb/CurrentBlueOrbAtom";
import Level from "../Level";
import level_y_values from "../../resources/level_y_values.json";
import { useFrame } from "react-three-fiber";
import { a, useSpring } from "@react-spring/three";
import columns from "../../resources/columns.json";
type ImageTableIndices = {
1: string;
2: string;
3: string;
};
type ProtocolLines = {
1: string;
2: string;
3: string;
4: string;
};
type Words = {
1: string;
2: string;
3: string;
};
export type BlueOrbData = {
"SLPS_016_0x offset": string;
image_table_indices: ImageTableIndices;
is_hidden: string;
media_file: string;
node_name: string;
protocol_lines: ProtocolLines;
site: string;
type: string;
unlocked_by: string;
upgrade_requirement: string;
words: Words;
};
type BlueOrbPositionData = {
position: number[];
rotation: number[];
};
type BlueOrbPositions = {
[orbPos: string]: BlueOrbPositionData;
};
const Site = memo(() => {
const currentBlueOrb = useRecoilValue(currentBlueOrbAtom);
useFrame(() => {
// grpRef.current!.rotation.y += 0.01
});
return (
<>
<Suspense fallback={<>loading...</>}>
{/* distance between LEVELS is 1.5 */}
{Object.values(level_y_values).map((yVal) => {
return <Level levelPosY={yVal} key={yVal} />;
})}
<a.group >
{Object.entries(site_a).map((blueOrb: [string, BlueOrbData]) => {
if (blueOrb[1]["unlocked_by"] === "-1")
return (
<BlueOrb
sprite={blueOrb[1]["node_name"]}
position={
(blue_orb_positions as BlueOrbPositions)[
blueOrb[0].substr(2)
]["position"]
}
rotation={
(blue_orb_positions as BlueOrbPositions)[
blueOrb[0].substr(2)
]["rotation"]
}
key={blueOrb[1]["node_name"]}
active={blueOrb[0] === currentBlueOrb}
level={blueOrb[0].substr(0, 2)}
/>
);
})}
</a.group>
</Suspense>
</>
);
});
export default Site;

2
src/components/Site/SiteAtom.tsx
View file

@ -1,2 +0,0 @@
import { atom } from "recoil";

110
src/resources/blue_orb_positions.json
View file

@ -1,85 +1,51 @@
{
"05": {
"position": [0.06, -0.045, 0.185],
"rotation": [0, 0.24, 0]
"position": [0.4, -0.25, 1.3],
"rotation": [0, 0.2, 0]
},
"13": {
"position": [0.06, -0.005, 0.185],
"rotation": [0, 0, 0]
},
"21": {
"position": [0.06, 0.045, 0.182],
"rotation": [0, 0, 0]
},
"14": {
"position": [-0.07, 0, 0.186],
"rotation": [0, -0.24, 0]
"position": [-0.35, 0, 1.3],
"rotation": [0, -0.15, 0]
},
"22": {
"position": [-0.07, 0.05, 0.186],
"rotation": [0, -0.24, 0]
"position": [-0.35, 0.3, 1.3],
"rotation": [0, -0.15, 0]
},
"06": {
"position": [-0.07, -0.05, 0.186],
"rotation": [0, -0.24, 0]
"position": [-0.35, -0.25, 1.3],
"rotation": [0, -0.25, 0]
},
"13": {
"position": [0.4, 0, 1.3],
"rotation": [0, 0.27, 0]
},
"15": {
"position": [-0.17, 0, 0.09],
"rotation": [0, -1, 0]
"position": [-1, 0, 0.95],
"rotation": [0, -0.9, 0]
},
"23": {
"position": [-0.17, 0.05, 0.09],
"rotation": [0, -1, 0]
},
"07": {
"position": [-0.17, -0.05, 0.09],
"rotation": [0, -1, 0]
},
"08": {
"position": [-0.19, 0, -0.03],
"rotation": [0, -1.8, 0]
},
"16": {
"position": [-0.19, 0.05, -0.03],
"rotation": [0, -1.8, 0]
"position": [-1.3, 0, 0.3],
"rotation": [0, -1.4, 0]
},
"00": {
"position": [-0.19, -0.05, -0.03],
"rotation": [0, -1.8, 0]
"position": [-1.3, -0.25, 0.3],
"rotation": [0, -1.4, 0]
},
"10": {
"position": [-0.85, 0, -1.05],
"rotation": [0, -2.45, 0]
},
"18": {
"position": [-0.85, 0.3, -1.05],
"rotation": [0, -2.45, 0]
"16": {
"position": [-1.3, 0.3, 0.3],
"rotation": [0, -1.4, 0]
},
"02": {
"position": [-0.85, -0.25, -1.05],
"rotation": [0, -2.45, 0]
},
"17": {
"position": [-1.25, 0.3, -0.5],
"rotation": [0, -1.85, 0]
},
"09": {
"position": [-1.25, 0, -0.5],
"rotation": [0, -1.85, 0]
},
"01": {
"position": [-1.25, -0.25, -0.5],
"rotation": [0, -1.85, 0]
},
"20": {
"position": [-1.25, 0.05, -0.8],
"rotation": [0, -1.85, 0]
"position": [1, 0.3, 0.9],
"rotation": [0, 0.69, 0]
},
"12": {
"position": [1, 0, 0.9],
@ -89,7 +55,34 @@
"position": [1, -0.25, 0.9],
"rotation": [0, 0.69, 0]
},
"21": {
"position": [0.4, 0.3, 1.3],
"rotation": [0, 0.27, 0]
},
"23": {
"position": [-1, 0.3, 0.95],
"rotation": [0, -0.9, 0]
},
"07": {
"position": [-1, -0.25, 0.95],
"rotation": [0, -0.9, 0]
},
"09": {
"position": [-1.25, 0, -0.5],
"rotation": [0, -1.85, 0]
},
"01": {
"position": [-1.25, -0.25, -0.5],
"rotation": [0, -1.85, 0]
},
"18": {
"position": [-0.85, 0.3, -1.05],
"rotation": [0, -2.45, 0]
},
"02": {
"position": [-0.85, -0.25, -1.05],
"rotation": [0, -2.45, 0]
},
"03": {
"position": [-0.15, -0.25, -1.3],
"rotation": [0, -2.45, 0]
@ -102,7 +95,6 @@
"position": [-0.15, 0.3, -1.3],
"rotation": [0, -2.45, 0]
},
"?": {
"position": [-0.15, 0.3, -1.3],
"rotation": [0, -2.45, 0]

10
src/resources/level_y_values.json
View file

@ -1,10 +1,10 @@
{
"01": -0.75,
"02": -0.5,
"03": -0.25,
"01": -4.5,
"02": -3,
"03": -1.5,
"04": 0,
"05": 0.25,
"06": 0.5,
"05": 1.5,
"06": 3,
"07": 4.5,
"08": 6,
"09": 7.5,