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.

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

Theatre wip #982

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

Theatre wip #982

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
cd6f0a6
barely working theatre v1
kfarr Dec 21, 2024
2420818
barely working theatre
kfarr Dec 22, 2024
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
29 changes: 29 additions & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@
"@mux/mux-player-react": "^2.9.1",
"@react-google-maps/api": "^2.19.3",
"@stripe/stripe-js": "^3.4.1",
"@theatre/core": "^0.7.2",
"@theatre/studio": "^0.7.2",
"aframe-atlas-uvs-component": "^3.0.0",
"aframe-cursor-teleport-component": "^1.6.0",
"aframe-extras": "^7.5.1",
Expand Down
103 changes: 53 additions & 50 deletions src/editor/components/Main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import { NewModal } from './modals/NewModal';
import { ToolbarWrapper } from './scenegraph/ToolbarWrapper.js';
import useStore from '@/store';
import { TheatreProvider } from '../contexts/TheatreContext';

THREE.ImageUtils.crossOrigin = '';

Expand Down Expand Up @@ -92,7 +93,7 @@
}));
}
});
}, []);

Check warning on line 96 in src/editor/components/Main.js

View workflow job for this annotation

GitHub Actions / Test Cases (20.x) 

React Hook useEffect has missing dependencies: 'state.visible.attributes' and 'state.visible.scenegraph'. Either include them or remove the dependency array

const onModalTextureOnClose = (value) => {
setState((prevState) => ({
Expand All @@ -108,59 +109,61 @@
const isInspectorEnabled = useStore((state) => state.isInspectorEnabled);

return (
<div id="inspectorContainer">
<ToolbarWrapper />
{isInspectorEnabled && (
<div>
<SceneGraph
scene={scene}
selectedEntity={state.entity}
visible={state.visible.scenegraph}
/>
<div id="rightPanel">
<ComponentsSidebar
entity={state.entity}
visible={state.visible.attributes}
<TheatreProvider>
<div id="inspectorContainer">
<ToolbarWrapper />
{isInspectorEnabled && (
<div>
<SceneGraph
scene={scene}
selectedEntity={state.entity}
visible={state.visible.scenegraph}
/>
<div id="rightPanel">
<ComponentsSidebar
entity={state.entity}
visible={state.visible.attributes}
/>
</div>
</div>
</div>
)}
<ScreenshotModal />
<SignInModal />
<PaymentModal />
<ScenesModal />
<ProfileModal />
<IntroModal />
<NewModal />
<LoadScript
googleMapsApiKey={firebaseConfig.apiKey}
libraries={GOOGLE_MAPS_LIBRARIES}
>
<GeoModal />
</LoadScript>
<ModalTextures
isOpen={state.isModalTexturesOpen}
selectedTexture={state.selectedTexture}
onClose={onModalTextureOnClose}
/>
)}
<ScreenshotModal />
<SignInModal />
<PaymentModal />
<ScenesModal />
<ProfileModal />
<IntroModal />
<NewModal />
<LoadScript
googleMapsApiKey={firebaseConfig.apiKey}
libraries={GOOGLE_MAPS_LIBRARIES}
>
<GeoModal />
</LoadScript>
<ModalTextures
isOpen={state.isModalTexturesOpen}
selectedTexture={state.selectedTexture}
onClose={onModalTextureOnClose}
/>

{isInspectorEnabled && (
<>
<div id="action-bar">
<ActionBar selectedEntity={state.entity} />
</div>
<div id="scene-title" className="clickable">
<SceneEditTitle />
</div>
<div id="zoom-help-buttons">
<ZoomButtons />
<HelpButton />
<div className="clickable">
<AddLayerPanel />
{isInspectorEnabled && (
<>
<div id="action-bar">
<ActionBar selectedEntity={state.entity} />
</div>
</div>
</>
)}
</div>
<div id="scene-title" className="clickable">
<SceneEditTitle />
</div>
<div id="zoom-help-buttons">
<ZoomButtons />
<HelpButton />
<div className="clickable">
<AddLayerPanel />
</div>
</div>
</>
)}
</div>
</TheatreProvider>
);
}
Loading
Loading