Skip to content

Commit 47aad4f

Browse files
authored
Merge pull request #144 from musehq/dev
v2.7.3
2 parents cbcebc2 + cbb5b6c commit 47aad4f

File tree

4 files changed

+6
-7
lines changed

4 files changed

+6
-7
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "spacesvr",
3-
"version": "2.7.2",
3+
"version": "2.7.3",
44
"private": true,
55
"description": "A standardized reality for future of the 3D Web",
66
"keywords": [

src/layers/Environment/ui/PauseMenu/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ export default function PauseMenu(props: PauseMenuProps) {
4848
const PAUSE_ITEMS: PauseItem[] = [
4949
...pauseMenuItems,
5050
{
51-
text: "v2.7.2",
51+
text: "v2.7.3",
5252
link: "https://www.npmjs.com/package/spacesvr",
5353
},
5454
...menuItems,

src/tools/Camera/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ export function Camera(props: CameraProps) {
4545
config: config.stiff,
4646
});
4747

48-
useRendering(ENABLED, cam, group, mesh, photo.target);
48+
useRendering(ENABLED && open, cam, group, mesh, photo.target);
4949

5050
const onClick = useCallback(() => {
5151
setPressShutter(true);

src/tools/Camera/logic/rendering.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { useEnvironment } from "../../../layers/Environment";
1212
import { useThree } from "@react-three/fiber";
1313

1414
export const useRendering = (
15-
ENABLED: boolean,
15+
enabled: boolean,
1616
cam: MutableRefObject<PerspectiveCamera | undefined>,
1717
group: RefObject<Group>,
1818
mesh: RefObject<Mesh>,
@@ -30,7 +30,7 @@ export const useRendering = (
3030
if (!paused) prepRendering.current = false;
3131
}, [paused]);
3232
useLimitedFrame(1 / 4, (state) => {
33-
if (ENABLED || !prepRendering.current || !cam.current) return; // don't double render
33+
if (enabled || !prepRendering.current || !cam.current) return; // don't double render
3434
state.gl.autoClear = true;
3535
state.gl.setRenderTarget(target);
3636
state.gl.render(scene, cam.current);
@@ -39,8 +39,7 @@ export const useRendering = (
3939
});
4040

4141
useLimitedFrame(24, (state) => {
42-
if (!cam.current || !mesh.current || !group.current || !ENABLED || !open)
43-
return;
42+
if (!cam.current || !mesh.current || !group.current || !enabled) return;
4443

4544
// move mesh to camera's position
4645
mesh.current.getWorldPosition(dummy);

0 commit comments

Comments
 (0)