Skip to content

1.6.0 - Add light block #60

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.

Sign up for GitHub

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

Draft
antpb wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

1.6.0 - Add light block #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
25851ec
adds light block
antpb Aug 8, 2023
7a8dfaf
adds light working state
antpb Aug 10, 2023
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
114 changes: 96 additions & 18 deletions blocks/environment/components/EnvironmentFront.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ import { BoxGeometry } from "three";
import { ThreeImage } from "./core/front/ThreeImage";
import { ThreeVideo } from "./core/front/ThreeVideo";
import { ThreeAudio } from "./core/front/ThreeAudio";
import { ThreeLight } from "./core/front/ThreeLight";
import { ModelObject } from "./core/front/ModelObject";
import { NPCObject } from "./core/front/NPCObject";
import { Portal } from "./core/front/Portal";
Expand Down Expand Up @@ -699,30 +700,13 @@ export default function EnvironmentFront(props) {
padding: "0",
position: "relative",
zIndex: 1
}}
}}
>
{ isVRCompatible() && <XRButton mode={'VR' | 'inline'}/>}
{/* <Perf className="stats" /> */}
{/* <fog attach="fog" color="hotpink" near={100} far={20} /> */}
<Hands />
<DefaultXRControllers />
<ambientLight intensity={0.5} />
<directionalLight
intensity={0.6}
position={[0, 2, 2]}
// shadow-mapSize-width={512}
// shadow-mapSize-height={512}
// shadow-camera-far={5000}
// shadow-camera-fov={15}
// shadow-camera-near={0.5}
// shadow-camera-left={-50}
// shadow-camera-bottom={-50}
// shadow-camera-right={50}
// shadow-camera-top={50}
// shadow-radius={1}
// shadow-bias={-0.001}
// castShadow
/>
<Suspense fallback={<Loading />}>
<Physics
// debug
Expand Down Expand Up @@ -1202,6 +1186,100 @@ export default function EnvironmentFront(props) {
/>
);
})}
{props.lightsToAdd.length < 1 && (
<>
<ambientLight intensity={0.5} />
<directionalLight
intensity={0.6}
position={[0, 2, 2]}
// shadow-mapSize-width={512}
// shadow-mapSize-height={512}
// shadow-camera-far={5000}
// shadow-camera-fov={15}
// shadow-camera-near={0.5}
// shadow-camera-left={-50}
// shadow-camera-bottom={-50}
// shadow-camera-right={50}
// shadow-camera-top={50}
// shadow-radius={1}
// shadow-bias={-0.001}
// castShadow
/>
</>
)}
{Object.values(props.lightsToAdd).map((item, index) => {
const lightPosX = item.querySelector("p.light-block-positionX")
? item.querySelector("p.light-block-positionX").innerText
: "";

const lightPosY = item.querySelector("p.light-block-positionY")
? item.querySelector("p.light-block-positionY").innerText
: "";

const lightPosZ = item.querySelector("p.light-block-positionZ")
? item.querySelector("p.light-block-positionZ").innerText
: "";

const lightRotationX = item.querySelector("p.light-block-rotationX")
? item.querySelector("p.light-block-rotationX").innerText
: "";

const lightRotationY = item.querySelector("p.light-block-rotationY")
? item.querySelector("p.light-block-rotationY").innerText
: "";

const lightRotationZ = item.querySelector("p.light-block-rotationZ")
? item.querySelector("p.light-block-rotationZ").innerText
: "";

const lightType = item.querySelector("p.light-block-type")
? item.querySelector("p.light-block-type").innerText
: "ambient";

const lightColor = item.querySelector("p.light-block-color")
? item.querySelector("p.light-block-color").innerText
: "";

const lightItensity = item.querySelector("p.light-block-intensity")
? item.querySelector("p.light-block-intensity").innerText
: "";

const lightDistance = item.querySelector("p.light-block-distance")
? item.querySelector("p.light-block-distance").innerText
: "";

const lightDecay = item.querySelector("p.light-block-decay")
? item.querySelector("p.light-block-decay").innerText
: "";

const lightAngle = item.querySelector("p.light-block-angle")
? item.querySelector("p.light-block-angle").innerText
: "";

const lightPenumbra = item.querySelector("p.light-block-penumbra")
? item.querySelector("p.light-block-penumbra").innerText
: "";

return (
<ThreeLight
key={index}
positionX={lightPosX}
positionY={lightPosY}
positionZ={lightPosZ}
rotationX={lightRotationX}
rotationY={lightRotationY}
rotationZ={lightRotationZ}
type={lightType}
color={lightColor}
intensity={lightItensity}
distance={lightDistance}
decay={lightDecay}
angle={lightAngle}
penumbra={lightPenumbra}
/>
);
})}

{Object.values(
props.npcsToAdd
).map((npc, index) => {
Expand Down
Loading