Merge branch 'develop'

shinyoshiaki · Jun 16, 2019 · a858fa4 · a858fa4
2 parents c04d342 + 8608757
commit a858fa4
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 11 deletions.
diff --git a/public/textures/Space/space_back.jpg b/public/textures/Space/space_back.jpg
diff --git a/public/textures/Space/space_down.jpg b/public/textures/Space/space_down.jpg
diff --git a/public/textures/Space/space_front.jpg b/public/textures/Space/space_front.jpg
diff --git a/public/textures/Space/space_left.jpg b/public/textures/Space/space_left.jpg
diff --git a/public/textures/Space/space_right.jpg b/public/textures/Space/space_right.jpg
diff --git a/public/textures/Space/space_up.jpg b/public/textures/Space/space_up.jpg
diff --git a/src/domain/babylon/vr/index.tsx b/src/domain/babylon/vr/index.tsx
@@ -6,7 +6,13 @@ import React, {
   createContext
 } from "react";
 import { SceneContext } from "../scene";
-import { Color3 } from "@babylonjs/core";
+import {
+  Color3,
+  MeshBuilder,
+  StandardMaterial,
+  CubeTexture,
+  Texture
+} from "@babylonjs/core";
 import Event from "rx.mini";
 import { ControllerAction, VrPosition } from "./model";
 
@@ -31,10 +37,22 @@ const VR: FC<{
 
       const { scene } = context;
 
+      const files = [
+        `${process.env.PUBLIC_URL}/textures/Space/space_left.jpg`,
+        `${process.env.PUBLIC_URL}/textures/Space/space_up.jpg`,
+        `${process.env.PUBLIC_URL}/textures/Space/space_front.jpg`,
+        `${process.env.PUBLIC_URL}/textures/Space/space_right.jpg`,
+        `${process.env.PUBLIC_URL}/textures/Space/space_down.jpg`,
+        `${process.env.PUBLIC_URL}/textures/Space/space_back.jpg`
+      ];
+      const texture = CubeTexture.CreateFromImages(files, scene);
+
       const environment = scene.createDefaultEnvironment({
-        groundYBias: 1
+        groundYBias: 1,
+        createSkybox: true,
+        skyboxSize: 150,
+        skyboxTexture: texture
       })!;
-      environment!.setMainColor(Color3.FromHexString("#74b9ff"));
 
       const vrHelper = scene.createDefaultVRExperience({
         createDeviceOrientationCamera: false

diff --git a/src/index.tsx b/src/index.tsx
@@ -10,11 +10,7 @@ const store = createStore();
 
 ReactDOM.render(
   <Provider store={store}>
-    <HashRouter>
-      <div>
-        <Route exact path="/" component={App} />
-      </div>
-    </HashRouter>
+    <App />
   </Provider>,
   document.getElementById("root")
 );

diff --git a/src/pages/App.tsx b/src/pages/App.tsx
@@ -1,13 +1,20 @@
-import React, { useRef, useState, FC, useEffect } from "react";
+import React, { useRef, useState, FC } from "react";
 
 import SceneCreate, { SceneEventArgs } from "../domain/babylon/scene";
-import { Vector3, HemisphericLight, FreeCamera } from "@babylonjs/core";
+import {
+  Vector3,
+  HemisphericLight,
+  FreeCamera,
+  MeshBuilder,
+  StandardMaterial,
+  CubeTexture,
+  Texture
+} from "@babylonjs/core";
 import useInput from "../hooks/useInput";
 import { webrtcService } from "../services/webrtc";
 import Desktop, { OnDesktopMountProps } from "../domain/babylon/desktop";
 import VR, { OnMountProps } from "../domain/babylon/vr";
 import Keyboard, { OnKeyboardMountProps } from "../domain/babylon/keyboard";
-import { useSelector } from "react-redux";
 import { ReduxState } from "../redux";
 import useSelectorRef from "../hooks/useSelectorRef";