Doni/ModelHandle
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor modification.

Browse Source
This commit is contained in:
Viktor Kovacs 2024-06-17 19:31:55 +02:00
parent 28b6e4cb74
commit e73167ef5e
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/website/settings.js
View File

@ -2,6 +2,7 @@ import { NavigationMode, ProjectionMode } from '../engine/viewer/camera.js';
import { RGBAColor, RGBColor } from '../engine/model/color.js'; import { RGBAColor, RGBColor } from '../engine/model/color.js';
import { EdgeSettings } from '../engine/viewer/viewermodel.js'; import { EdgeSettings } from '../engine/viewer/viewermodel.js';
import { CookieGetBoolVal, CookieGetRGBColorVal, CookieGetIntVal, CookieGetStringVal, CookieSetBoolVal, CookieSetRGBColorVal, CookieSetIntVal, CookieSetStringVal, CookieSetRGBAColorVal, CookieGetRGBAColorVal } from './cookiehandler.js'; import { CookieGetBoolVal, CookieGetRGBColorVal, CookieGetIntVal, CookieGetStringVal, CookieSetBoolVal, CookieSetRGBColorVal, CookieSetIntVal, CookieSetStringVal, CookieSetRGBAColorVal, CookieGetRGBAColorVal } from './cookiehandler.js';
import { GetPreferredColorScheme } from './utils.js';
export const Theme = export const Theme =
{ {
@ -30,8 +31,7 @@ export class Settings
LoadFromCookies () LoadFromCookies ()
{ {
const preferredColorScheme = window.matchMedia ('(prefers-color-scheme: dark)').matches ? Theme.Dark : Theme.Light; this.themeId = CookieGetIntVal ('ov_theme_id', GetPreferredColorScheme ());
this.themeId = CookieGetIntVal ('ov_theme_id', preferredColorScheme);
this.environmentMapName = CookieGetStringVal ('ov_environment_map', 'fishermans_bastion'); this.environmentMapName = CookieGetStringVal ('ov_environment_map', 'fishermans_bastion');
this.backgroundIsEnvMap = CookieGetBoolVal ('ov_background_is_envmap', false); this.backgroundIsEnvMap = CookieGetBoolVal ('ov_background_is_envmap', false);
this.backgroundColor = CookieGetRGBAColorVal ('ov_background_color', new RGBAColor (255, 255, 255, 255)); this.backgroundColor = CookieGetRGBAColorVal ('ov_background_color', new RGBAColor (255, 255, 255, 255));

6
source/website/utils.js
View File

@ -2,6 +2,7 @@ import { RGBColor, RGBColorToHexString } from '../engine/model/color.js';
import { CreateObjectUrl } from '../engine/io/bufferutils.js'; import { CreateObjectUrl } from '../engine/io/bufferutils.js';
import { AddDiv, CreateDiv, AddDomElement } from '../engine/viewer/domutils.js'; import { AddDiv, CreateDiv, AddDomElement } from '../engine/viewer/domutils.js';
import { Loc } from '../engine/core/localization.js'; import { Loc } from '../engine/core/localization.js';
import { Theme } from './settings.js';
export function GetNameOrDefault (originalName, defaultName) export function GetNameOrDefault (originalName, defaultName)
{ {
@ -27,6 +28,11 @@ export function GetMaterialName (originalName)
return GetNameOrDefault (originalName, Loc ('No Name')); return GetNameOrDefault (originalName, Loc ('No Name'));
} }
export function GetPreferredColorScheme ()
{
return window.matchMedia ('(prefers-color-scheme: dark)').matches ? Theme.Dark : Theme.Light;
}
export function IsHoverEnabled () export function IsHoverEnabled ()
{ {
return window.matchMedia ('(hover: hover)').matches; return window.matchMedia ('(hover: hover)').matches;