bugfixes, improved markdown

This commit is contained in:
ad044 2021-03-23 21:07:16 +04:00
parent b896adcbfa
commit 71b984d3d2
14 changed files with 32 additions and 18 deletions

View file

@ -39,13 +39,16 @@ Once you've saved the game manually (going into pause => selecting Save), look i
## Screenshots ## Screenshots
<img src="markdown/img/1.png" width="50%"></img> <p align="center">
<img src="markdown/img/2.jpg" width="50%"></img> <img src="markdown/1.png" width="49%">
<img src="markdown/img/3.png" width="50%"></img> <img src="markdown/2.jpg" width="49%">
<img src="markdown/img/4.png" width="50%"></img> <img src="markdown/3.png" width="49%">
<img src="markdown/img/5.png" width="50%"></img> <img src="markdown/4.png" width="49%">
<img src="markdown/img/6.png" width="50%"></img> <img src="markdown/5.png" width="49%">
<img src="markdown/img/7.png" width="50%"></img> <img src="markdown/6.png" width="49%">
<img src="markdown/7.png" width="49%">
<img src="markdown/8.png" width="49%">
</p>
## TODO ## TODO

View file

Before

Width:  |  Height:  |  Size: 989 KiB

After

Width:  |  Height:  |  Size: 989 KiB

View file

Before

Width:  |  Height:  |  Size: 149 KiB

After

Width:  |  Height:  |  Size: 149 KiB

View file

Before

Width:  |  Height:  |  Size: 888 KiB

After

Width:  |  Height:  |  Size: 888 KiB

View file

Before

Width:  |  Height:  |  Size: 500 KiB

After

Width:  |  Height:  |  Size: 500 KiB

View file

Before

Width:  |  Height:  |  Size: 457 KiB

After

Width:  |  Height:  |  Size: 457 KiB

View file

Before

Width:  |  Height:  |  Size: 729 KiB

After

Width:  |  Height:  |  Size: 729 KiB

View file

Before

Width:  |  Height:  |  Size: 449 KiB

After

Width:  |  Height:  |  Size: 449 KiB

BIN
markdown/8.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 892 KiB

View file

@ -18,9 +18,6 @@ const HUD = memo(() => {
const currentHudRef = useRef( const currentHudRef = useRef(
getNodeHud(useStore.getState().activeNode.matrixIndices!) getNodeHud(useStore.getState().activeNode.matrixIndices!)
); );
const activeNodeMatrixIndices = useStore(
(state) => state.activeNode.matrixIndices
);
const activeNode = useStore((state) => state.activeNode); const activeNode = useStore((state) => state.activeNode);
const siteRotY = useStore((state) => state.siteRot[1]); const siteRotY = useStore((state) => state.siteRot[1]);
const activeLevel = useStore((state) => state.activeLevel); const activeLevel = useStore((state) => state.activeLevel);
@ -136,7 +133,7 @@ const HUD = memo(() => {
}; };
if (activeRef.current !== undefined) { if (activeRef.current !== undefined) {
const hud = getNodeHud(activeNodeMatrixIndices!); const hud = getNodeHud(activeNode.matrixIndices!);
if ( if (
!(scene === "main" && prevData?.scene === "main") || !(scene === "main" && prevData?.scene === "main") ||
(subscene === "site" && prevData?.subscene === "pause") || (subscene === "site" && prevData?.subscene === "pause") ||
@ -175,7 +172,6 @@ const HUD = memo(() => {
} }
}, [ }, [
activeLevel, activeLevel,
activeNodeMatrixIndices,
prevData?.activeLevel, prevData?.activeLevel,
prevData?.scene, prevData?.scene,
prevData?.siteRotY, prevData?.siteRotY,
@ -185,6 +181,8 @@ const HUD = memo(() => {
siteRotY, siteRotY,
subscene, subscene,
protocolLinesToggled, protocolLinesToggled,
activeNode.matrixIndices,
activeNode.node_name,
]); ]);
const longHudTex = useLoader(THREE.TextureLoader, longHud); const longHudTex = useLoader(THREE.TextureLoader, longHud);
const boringHudTex = useLoader(THREE.TextureLoader, boringHud); const boringHudTex = useLoader(THREE.TextureLoader, boringHud);

View file

@ -151,7 +151,7 @@ const MediaProgressBar = () => {
return ( return (
<> <>
<sprite scale={[5.2, 0.5, 1]} position={[2.15, 3.005, 0]}> <sprite scale={[5.2, 0.5, 1]} position={[2.15, 3.005, 0]} renderOrder={3}>
<spriteMaterial attach="material" map={progressBarContainerTex} /> <spriteMaterial attach="material" map={progressBarContainerTex} />
</sprite> </sprite>
<mesh <mesh
@ -161,6 +161,7 @@ const MediaProgressBar = () => {
2.945, 2.945,
0, 0,
]} ]}
renderOrder={3}
> >
<planeBufferGeometry attach="geometry" /> <planeBufferGeometry attach="geometry" />
<meshBasicMaterial <meshBasicMaterial

View file

@ -10,8 +10,13 @@ const NodeNameContainer = () => {
); );
return ( return (
<sprite scale={[2.6, 0.5, 1]} position={[3.425, 2.5, 0]}> <sprite scale={[2.6, 0.5, 1]} position={[3.425, 2.5, 0]} renderOrder={3}>
<spriteMaterial attach="material" map={mediaNodeNameContainerTex} /> <spriteMaterial
attach="material"
map={mediaNodeNameContainerTex}
transparent={true}
depthTest={false}
/>
</sprite> </sprite>
); );
}; };

View file

@ -255,9 +255,12 @@ const handleMainSceneInput = (
activeNode: newNode, activeNode: newNode,
}); });
case "SQUARE": case "SQUARE":
return setProtocolLines({ if (activeNode.node_name !== "Unknown") {
protocolLinesToggled: !protocolLinesToggled, return setProtocolLines({
}); protocolLinesToggled: !protocolLinesToggled,
});
}
break;
case "R2": case "R2":
if (cameraTiltValue === 0) { if (cameraTiltValue === 0) {
return setCameraTilt({ return setCameraTilt({

View file

@ -284,6 +284,10 @@ export const useStore = create(
activeMediaComponent: "play", activeMediaComponent: "play",
currentMediaSide: "left", currentMediaSide: "left",
mediaWordPosStateIdx: 1, mediaWordPosStateIdx: 1,
lastActiveMediaComponents: {
left: "play",
right: "fstWord",
},
})), })),
incrementFinalVideoViewCount: () => incrementFinalVideoViewCount: () =>