mirror of
https://github.com/blitzkit/blitzkit.git
synced 2026-10-21 02:37:05 +02:00
feat: overhead lighting
This commit is contained in:
1 parent
fced1e96ef
commit
344e7caa81
3 files changed
+55
-34
No files matched your search
@@ -12,6 +12,7 @@ import {
|
||||
EyeOpenIcon,
|
||||
ShadowInnerIcon,
|
||||
ShadowNoneIcon,
|
||||
SunIcon,
|
||||
} from "@radix-ui/react-icons";
|
||||
import {
|
||||
Button,
|
||||
@@ -73,6 +74,7 @@ export function Options({ thicknessRange, canvas, skeleton }: OptionsProps) {
|
||||
const { strings, unwrap } = useLocale();
|
||||
const revealed = Tankopedia.use((state) => state.revealed);
|
||||
const disturbed = Tankopedia.use((state) => state.disturbed);
|
||||
const highGraphics = TankopediaPersistent.use((state) => state.highGraphics);
|
||||
|
||||
return (
|
||||
<>
|
||||
@@ -349,6 +351,20 @@ export function Options({ thicknessRange, canvas, skeleton }: OptionsProps) {
|
||||
</DropdownMenu.Content>
|
||||
</DropdownMenu.Root>
|
||||
|
||||
<IconButton
|
||||
size="2"
|
||||
highContrast
|
||||
onClick={() => {
|
||||
TankopediaPersistent.mutate((draft) => {
|
||||
draft.highGraphics = !draft.highGraphics;
|
||||
});
|
||||
}}
|
||||
color={highGraphics ? undefined : "gray"}
|
||||
variant={highGraphics ? "solid" : "surface"}
|
||||
>
|
||||
<SunIcon />
|
||||
</IconButton>
|
||||
|
||||
<ScreenshotButton
|
||||
color="gray"
|
||||
size="2"
|
||||
|
||||
+37
-34
@@ -1,15 +1,24 @@
|
||||
import { useFrame, useThree } from "@react-three/fiber";
|
||||
import { times } from "lodash-es";
|
||||
import { useEffect, useRef } from "react";
|
||||
import { HemisphereLight, SpotLight, type Group } from "three";
|
||||
import { clamp } from "three/src/math/MathUtils.js";
|
||||
import { SpotLight, type Group } from "three";
|
||||
import { clamp, degToRad, lerp } from "three/src/math/MathUtils.js";
|
||||
import { Tankopedia } from "../../../../../../stores/tankopedia";
|
||||
import { TankopediaPersistent } from "../../../../../../stores/tankopediaPersistent";
|
||||
import { HelpingSpotLight } from "../../../../../HelpingSpotLight";
|
||||
|
||||
const ANGLE = Math.PI / 3;
|
||||
const HEMISPHERE_INTENSITY = 4;
|
||||
const REVEAL_ANIMATION_TIME = 5;
|
||||
const REVEAL_ANIMATION_TIME = 3;
|
||||
const TRANSITION_ANIMATION_TIME = 0.5;
|
||||
|
||||
const LIGHTS_COUNT = 4;
|
||||
const THETA_OFFSET = degToRad(-150);
|
||||
const LIGHT_DISTANCE = 13;
|
||||
const LIGHT_HEIGHT_0 = 4;
|
||||
const LIGHT_HEIGHT_1 = 8;
|
||||
const INTENSITY_0 = 70;
|
||||
const INTENSITY_1 = 40;
|
||||
|
||||
export function Lighting() {
|
||||
const wrapper = useRef<Group>(null!);
|
||||
const t0 = useRef(0);
|
||||
@@ -17,6 +26,7 @@ export function Lighting() {
|
||||
const display = Tankopedia.use((state) => state.display);
|
||||
const requestedDisplay = Tankopedia.use((state) => state.requestedDisplay);
|
||||
const animationTime = useRef(REVEAL_ANIMATION_TIME);
|
||||
const highGraphics = TankopediaPersistent.use((state) => state.highGraphics);
|
||||
|
||||
useEffect(() => {
|
||||
Tankopedia.mutate((draft) => {
|
||||
@@ -35,9 +45,7 @@ export function Lighting() {
|
||||
const t = 0.5 * Math.sin(Math.PI * (x + 0.5)) + 0.5;
|
||||
|
||||
for (const child of wrapper.current.children) {
|
||||
if (child instanceof HemisphereLight) {
|
||||
child.intensity = HEMISPHERE_INTENSITY * t;
|
||||
} else if (child instanceof SpotLight) {
|
||||
if (child instanceof SpotLight) {
|
||||
child.angle = ANGLE * t;
|
||||
}
|
||||
}
|
||||
@@ -60,34 +68,29 @@ export function Lighting() {
|
||||
|
||||
return (
|
||||
<group ref={wrapper}>
|
||||
<hemisphereLight
|
||||
position={[0, 1, 0]}
|
||||
color="#dadaff"
|
||||
groundColor="#856331"
|
||||
intensity={0}
|
||||
/>
|
||||
{times(LIGHTS_COUNT, (index) => {
|
||||
const x = index / (LIGHTS_COUNT - 1);
|
||||
const theta = 2 * Math.PI * (index / LIGHTS_COUNT) + THETA_OFFSET;
|
||||
const position = [
|
||||
LIGHT_DISTANCE * Math.sin(theta),
|
||||
lerp(LIGHT_HEIGHT_0, LIGHT_HEIGHT_1, x),
|
||||
LIGHT_DISTANCE * Math.cos(theta),
|
||||
] as const;
|
||||
const intensity = lerp(INTENSITY_0, INTENSITY_1, x);
|
||||
|
||||
<HelpingSpotLight
|
||||
debug
|
||||
position={[-6, 6, -10]}
|
||||
intensity={4}
|
||||
penumbra={1}
|
||||
castShadow
|
||||
color="#ffffff"
|
||||
decay={0}
|
||||
angle={0}
|
||||
/>
|
||||
|
||||
<HelpingSpotLight
|
||||
debug
|
||||
position={[6, 6, -10]}
|
||||
intensity={1}
|
||||
penumbra={1}
|
||||
castShadow
|
||||
color="#ffffff"
|
||||
decay={0}
|
||||
angle={0}
|
||||
/>
|
||||
return (
|
||||
<HelpingSpotLight
|
||||
userData={{ index }}
|
||||
key={index}
|
||||
position={position}
|
||||
intensity={intensity}
|
||||
penumbra={1}
|
||||
castShadow={highGraphics}
|
||||
decay={1}
|
||||
color="#ffffff"
|
||||
/>
|
||||
);
|
||||
})}
|
||||
</group>
|
||||
);
|
||||
}
|
||||
@@ -15,6 +15,7 @@ export interface TankopediaPersistent {
|
||||
showPrimaryArmor: boolean;
|
||||
recentlyViewed: number[];
|
||||
hideTankModelUnderArmor: boolean;
|
||||
highGraphics: boolean;
|
||||
|
||||
sort: {
|
||||
by: TankopediaSortBy;
|
||||
@@ -33,6 +34,7 @@ export const TankopediaPersistent = new Varuna<TankopediaPersistent>(
|
||||
showExternalModules: true,
|
||||
showPrimaryArmor: true,
|
||||
recentlyViewed: [],
|
||||
highGraphics: true,
|
||||
sort: {
|
||||
by: "meta.none",
|
||||
direction: "ascending",
|
||||
|
||||
Reference in new issue
Block a user