diff --git a/app/src/assets/textures/floor/wall-2.png b/app/src/assets/textures/floor/wall-2.png new file mode 100644 index 0000000..786d3b6 Binary files /dev/null and b/app/src/assets/textures/floor/wall-2.png differ diff --git a/app/src/components/icons/Logo.tsx b/app/src/components/icons/Logo.tsx index f267af3..bd1d82a 100644 --- a/app/src/components/icons/Logo.tsx +++ b/app/src/components/icons/Logo.tsx @@ -23,20 +23,45 @@ export function LogoIcon() { export function LogoIconLarge() { return ( - - + + + + + + + + + + ); } diff --git a/app/src/modules/builder/groups/wallsMesh.tsx b/app/src/modules/builder/groups/wallsMesh.tsx index 6b22a8d..81f27d1 100644 --- a/app/src/modules/builder/groups/wallsMesh.tsx +++ b/app/src/modules/builder/groups/wallsMesh.tsx @@ -8,7 +8,7 @@ import React, { useEffect } from "react"; import { getLines } from "../../../services/factoryBuilder/lines/getLinesApi"; import objectLinesToArray from "../geomentries/lines/lineConvertions/objectLinesToArray"; import loadWalls from "../geomentries/walls/loadWalls"; -import texturePath from "../../../assets/textures/floor/wall-tex.png"; +import texturePath from "../../../assets/textures/floor/factory wall texture.jpg"; import { useParams } from "react-router-dom"; import { getUserData } from "../../../functions/getUserData"; import { useVersionContext } from "../version/versionContext"; diff --git a/app/src/modules/builder/wall/Instances/instance/wall.tsx b/app/src/modules/builder/wall/Instances/instance/wall.tsx index a6c5787..2769104 100644 --- a/app/src/modules/builder/wall/Instances/instance/wall.tsx +++ b/app/src/modules/builder/wall/Instances/instance/wall.tsx @@ -2,14 +2,14 @@ import * as THREE from 'three'; import { useMemo, useRef, useState } from 'react'; import * as Constants from '../../../../../types/world/worldConstants'; -import defaultMaterial from '../../../../../assets/textures/floor/wall-tex.png'; +import defaultMaterial from '../../../../../assets/textures/floor/factory wall texture.png'; import material1 from '../../../../../assets/textures/floor/factory wall texture.jpg'; import { useWallStore } from '../../../../../store/builder/useWallStore'; import { useWallClassification } from './helpers/useWallClassification'; import { useFrame, useThree } from '@react-three/fiber'; import { useWallVisibility } from '../../../../../store/builder/store'; -import { Decal, PivotControls } from '@react-three/drei'; -import { Base, Geometry, Subtraction } from '@react-three/csg'; +import { Decal } from '@react-three/drei'; +import { Base } from '@react-three/csg'; function Wall({ wall }: { readonly wall: Wall }) { const { walls } = useWallStore(); diff --git a/app/src/styles/layout/loading.scss b/app/src/styles/layout/loading.scss index 5b4fe12..5331c2f 100644 --- a/app/src/styles/layout/loading.scss +++ b/app/src/styles/layout/loading.scss @@ -7,7 +7,6 @@ background: var(--background-color-solid); &.comparisionLoading { - position: fixed; top: 0; right: 0; @@ -48,11 +47,15 @@ } .loading-hero-container { + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; .logo { @include flex-center; width: 100%; margin-bottom: 35px; - + scale: 0.8; circle { fill: transparent; } @@ -99,4 +102,4 @@ } } } -} \ No newline at end of file +}