Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

enhancement: polish lightning and add darkmode background #922

Merged
merged 5 commits into from
Dec 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions client/src/features/visualizer-threejs/VisualizerInstance.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,7 @@ import React, { useEffect, useRef } from "react";
import { RouteComponentProps } from "react-router-dom";
import * as THREE from "three";
import { Box3 } from "three";
import {
ACCEPTED_BLOCK_COLORS,
PENDING_BLOCK_COLOR,
TIME_DIFF_COUNTER,
ZOOM_DEFAULT,
} from './constants'
import { ACCEPTED_BLOCK_COLORS, DIRECTIONAL_LIGHT_INTENSITY, PENDING_BLOCK_COLOR, TIME_DIFF_COUNTER, VISUALIZER_BACKGROUND, ZOOM_DEFAULT } from "./constants";
import Emitter from "./Emitter";
import { useTangleStore, useConfigStore } from "./store";
import { getGenerateY, randomIntFromInterval, timer } from "./utils";
Expand All @@ -24,6 +19,7 @@ import { NovaFeedClient } from "../../services/nova/novaFeedClient";
import { Wrapper } from "./wrapper/Wrapper";
import "./Visualizer.scss";
import { IFeedBlockMetadata } from "~/models/api/stardust/feed/IFeedBlockMetadata";
import { useGetThemeMode } from '~/helpers/hooks/useGetThemeMode';
import { StardustFeedClient } from "~/services/stardust/stardustFeedClient";

const features = {
Expand All @@ -40,6 +36,7 @@ const VisualizerInstance: React.FC<RouteComponentProps<VisualizerRouteProps>> =
}) => {
const [networkConfig] = useNetworkConfig(network);
const generateY = getGenerateY({ withRandom: true });
const themeMode = useGetThemeMode()

const [runListeners, setRunListeners] = React.useState<boolean>(false);

Expand Down Expand Up @@ -228,9 +225,9 @@ const VisualizerInstance: React.FC<RouteComponentProps<VisualizerRouteProps>> =
position={[0, 0, 1500]}
zoom={ZOOM_DEFAULT}
/>
<color attach="background" args={["#f2f2f2"]} />
<color attach="background" args={[VISUALIZER_BACKGROUND[themeMode]]} />
<ambientLight />
<directionalLight position={[100, 100, 50]} />
<directionalLight position={[400, 700, 920]} intensity={DIRECTIONAL_LIGHT_INTENSITY} />
<Emitter
emitterRef={emitterRef}
setRunListeners={setRunListeners}
Expand Down
9 changes: 9 additions & 0 deletions client/src/features/visualizer-threejs/constants.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Color } from "three";
import { ThemeMode } from './enums';

// steps
export const STEP_Y_PX = 20;
Expand Down Expand Up @@ -38,6 +39,14 @@ export const COLORS = [
...ACCEPTED_BLOCK_COLORS,
]

// visualizer

export const DIRECTIONAL_LIGHT_INTENSITY = 0.45;

export const VISUALIZER_BACKGROUND: Record<ThemeMode, string> = {
[ThemeMode.Dark]: "#000000",
[ThemeMode.Light]: "#f2f2f2",
}

// emitter

Expand Down
4 changes: 4 additions & 0 deletions client/src/features/visualizer-threejs/enums.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
export enum ThemeMode {
Light = "light",
Dark = "dark"
}
30 changes: 30 additions & 0 deletions client/src/helpers/hooks/useGetThemeMode.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import { useEffect, useState } from 'react'
import { ServiceFactory } from '~/factories/serviceFactory'
import { ThemeMode } from '~/features/visualizer-threejs/enums';
import { SettingsService } from '~/services/settingsService'

export function useGetThemeMode(): ThemeMode {
const [settingsService] = useState<SettingsService>(
ServiceFactory.get<SettingsService>('settings')
)

const [isDarkMode, setIsDarkMode] = useState<boolean | null>(
settingsService.get().darkMode ?? null
)

const themeMode = isDarkMode ? ThemeMode.Dark : ThemeMode.Light

function toggleDarkMode(event: Event): void {
const darkMode = (event as CustomEvent).detail.darkMode
setIsDarkMode(darkMode)
}

useEffect(() => {
window.addEventListener('theme-change', toggleDarkMode)
return () => {
window.removeEventListener('theme-change', toggleDarkMode)
}
}, [])

return themeMode
}