added ignore for mov

deleted model
wip update
18 changed files with 111 additions and 15 deletions
--- a/.gitignore
+++ b/.gitignore
@ -6,6 +6,8 @@ yarn-debug.log*
 yarn-error.log*
 lerna-debug.log*

+*.mov
+
 # Diagnostic reports (https://nodejs.org/api/report.html)
 report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json

--- a/data/drawings.json
+++ b/data/drawings.json
--- a/index.html
+++ b/index.html
@ -8,7 +8,7 @@
  <body>
    <div id="blocker">
      <div id="title">
-        Emanciptating VR
+        Emancipating XR
      </div>
      <div id="instructions">
        Loading...
--- a/js/ItemManager.js
+++ b/js/ItemManager.js
@ -120,12 +120,7 @@ export class ItemManager {
            // Set item id and group id
            newItem.id = itemDef.id;
            newItem.groupId = parentGroup.name;
-
-            // Set links
-            if (itemDef.links) {
-                newItem.links = itemDef.links;
-            }
-
+            
            // Item is already loaded from world glb, but this func creates collider etc.
            await newItem.loadModel();
            newItem.show();
--- a/js/Player.js
+++ b/js/Player.js
@ -20,7 +20,7 @@ export class Player {
        this.rigibody = null;
        this.collider = null;

-        this.moveSpeed = 20;
+        this.moveSpeed = 40;
        this.mouseSensitivity = 0.002;
        this.maxInteractionDistance = 200.0;

@ -609,7 +609,7 @@ export class Player {

        if (this.enableInput) {
            if (this.attachedItem && !this.renderer.xr.isPresenting) { // Only lock camera for desktop
-                this._lockCameraForAttachedItem();
+                    this._lockCameraForAttachedItem();
            } else if (!this.renderer.xr.isPresenting) { // Only update movement if not in VR
                this._updatePlayerMovement(delta);
            }   
--- a/js/main.js
+++ b/js/main.js
@ -91,7 +91,7 @@ async function init() {
  scene.add(player.playerRig);;

  /* Load Items/Content */
-  loadWorldModel("models/demo-world-comp.glb");  
+  loadWorldModel("models/wip-world-exr.glb");  

  instructions.innerHTML = "Click to play";
  instructions.addEventListener( 'click', function () {
@ -133,8 +133,6 @@ async function init() {
      }
    }
  });
-
-  //console.log(scene)
 }

 async function animate() {
@ -454,7 +452,7 @@ async function loadWorldModel(modelUrl) {
                    rapierWorld,
                    staticWorldGroup,
                    player,
-                    true,
+                    false,
                    object.position,
                    1,
                    object.name || 'static-world-object',
@ -489,7 +487,7 @@ async function loadWorldModel(modelUrl) {
        });

        itemManager = new ItemManager(
-            "json/Items.json", 
+            "json/ItemsNew.json", 
            preloadedObjectsMap,
            dynamicGroupsMap, 
            scene, 
--- a/public/images/reddit_ChangeOS/reddit_ChangeOS_0.png
+++ b/public/images/reddit_ChangeOS/reddit_ChangeOS_0.png
--- a/public/images/reddit_ChangeOS/reddit_ChangeOS_1.png
+++ b/public/images/reddit_ChangeOS/reddit_ChangeOS_1.png
--- a/public/images/reddit_Dataconcerns/reddit_Dataconcerns_0.png
+++ b/public/images/reddit_Dataconcerns/reddit_Dataconcerns_0.png
--- a/public/images/reddit_Dataconcerns/reddit_Dataconcerns_1.png
+++ b/public/images/reddit_Dataconcerns/reddit_Dataconcerns_1.png
--- a/public/images/reddit_Dataconcerns/reddit_Dataconcerns_2.png
+++ b/public/images/reddit_Dataconcerns/reddit_Dataconcerns_2.png
--- a/public/images/reddit_Dataconcerns/reddit_Dataconcerns_3.png
+++ b/public/images/reddit_Dataconcerns/reddit_Dataconcerns_3.png
--- a/public/images/reddit_Dataconcerns/reddit_Dataconcerns_4.png
+++ b/public/images/reddit_Dataconcerns/reddit_Dataconcerns_4.png
--- a/public/images/reddit_Dataconcerns/reddit_Dataconcerns_5.png
+++ b/public/images/reddit_Dataconcerns/reddit_Dataconcerns_5.png
--- a/public/images/reddit_Sensordata/Reddit_RawSensorData.png
+++ b/public/images/reddit_Sensordata/Reddit_RawSensorData.png
--- a/public/json/ItemsNew.json
+++ b/public/json/ItemsNew.json
@ -0,0 +1,97 @@
+{
+    "items": [
+        {
+            "id": 0,
+            "groupId": "group_reddit_Sensordata",
+            "name": "dyBall",
+            "contentType": "image",
+            "file": "./images/reddit_Sensordata/Reddit_RawSensorData.png",
+            "links": []
+        },
+        {
+            "id": 1,
+            "groupId": "group_reddit_Dataconcerns",
+            "name": "dyDetergent",
+            "contentType": "image",
+            "file": "./images/reddit_Dataconcerns/reddit_Dataconcerns_0.png",
+            "links": []
+        },
+        {
+            "id": 2,
+            "groupId": "group_reddit_Dataconcerns",
+            "name": "dyToy",
+            "contentType": "image",
+            "file": "./images/reddit_Dataconcerns/reddit_Dataconcerns_1.png",
+            "links": []
+        },
+        {
+            "id": 3,
+            "groupId": "group_reddit_Dataconcerns",
+            "name": "dyCan",
+            "contentType": "image",
+            "file": "./images/reddit_Dataconcerns/reddit_Dataconcerns_2.png",
+            "links": []
+        },
+        {
+            "id": 4,
+            "groupId": "group_reddit_Dataconcerns",
+            "name": "dyBottle",
+            "contentType": "image",
+            "file": "./images/reddit_Dataconcerns/reddit_Dataconcerns_3.png",
+            "links": []
+        },
+        {
+            "id": 5,
+            "groupId": "group_reddit_Dataconcerns",
+            "name": "dyChair",
+            "contentType": "image",
+            "file": "./images/reddit_Dataconcerns/reddit_Dataconcerns_4.png",
+            "links": []
+        },
+        {
+            "id": 6,
+            "groupId": "group_reddit_Dataconcerns",
+            "name": "dyCig",
+            "contentType": "image",
+            "file": "./images/reddit_Dataconcerns/reddit_Dataconcerns_5.png",
+            "links": []
+        },
+        {
+            "id": 7,
+            "groupId": "group_reddit_ChangeOS",
+            "name": "dyPan",
+            "contentType": "image",
+            "file": "./images/reddit_ChangeOS/reddit_ChangeOS_0.png",
+            "links": []
+        },
+        {
+            "id": 8,
+            "groupId": "group_reddit_ChangeOS",
+            "name": "dySoda",
+            "contentType": "image",
+            "file": "./images/reddit_ChangeOS/reddit_ChangeOS_0.png",
+            "links": []
+        },
+        {
+            "id": 9,
+            "groupId": "group_XRFLOSS",
+            "name": "dyLettuce",
+            "contentType": "text",
+            "file": "./texts/XR_FLOSS_Init.md",
+            "links": []
+        },
+        {
+            "id": 10,
+            "groupId": "group_Q3Root",
+            "name": "dyRifle",
+            "contentType": "video",
+            "file": "./videos/Quest3_root_demo.mov",
+            "links": []
+        }
+    ],
+
+    "groupLinks": [
+        ["group_Q3Root", "group_reddit_ChangeOS"],
+        ["group_reddit_Dataconcerns", "group_reddit_Sensordata"]
+    ]
+}
--- a/public/models/wip-world-exr.glb
+++ b/public/models/wip-world-exr.glb
--- a/public/texts/XR_FLOSS_Init.md
+++ b/public/texts/XR_FLOSS_Init.md
@ -0,0 +1 @@
+What if everyone who had a VR headset and a laptop was able to
Author	SHA1	Message	Date
Cailean Finn	594fb21468	added ignore for mov	1 week ago
Cailean Finn	c7a3f779e7	deleted model	1 week ago
Cailean Finn	0bb1365751	wip update	1 week ago
Cailean Finn	5580487e48	new level and item fix	1 week ago
Cailean Finn	c8d0e812cb	Titled fixed	1 week ago
Cailean Finn	97e35e0681	Content added, links removed from JSON, new JSON file	1 week ago
			`@ -0,0 +1 @@`
			`What if everyone who had a VR headset and a laptop was able to`