cailean
/
emancipate-vr
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: cailean:79eb27cc5d2cce018c7759e8afba1c23b6a26e18
Branches Tags
cailean:master
...
compare: cailean:594fb214682eb3c012f2f3f01c1685e4eee6c335
Branches Tags
cailean:master

6 Commits
79eb27cc5d ... 594fb21468

Author SHA1 Message Date
Cailean Finn 594fb21468 added ignore for mov
2 weeks ago
Cailean Finn c7a3f779e7 deleted model
2 weeks ago
Cailean Finn 0bb1365751 wip update
2 weeks ago
Cailean Finn 5580487e48 new level and item fix
2 weeks ago
Cailean Finn c8d0e812cb Titled fixed
2 weeks ago
Cailean Finn 97e35e0681 Content added, links removed from JSON, new JSON file
2 weeks ago
18 changed files with 111 additions and 15 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats
  1. 2
      .gitignore
  2. 2
      data/drawings.json
  3. 2
      index.html
  4. 5
      js/ItemManager.js
  5. 4
      js/Player.js
  6. 8
      js/main.js
  7. BIN
      public/images/reddit_ChangeOS/reddit_ChangeOS_0.png
  8. BIN
      public/images/reddit_ChangeOS/reddit_ChangeOS_1.png
  9. BIN
      public/images/reddit_Dataconcerns/reddit_Dataconcerns_0.png
  10. BIN
      public/images/reddit_Dataconcerns/reddit_Dataconcerns_1.png
  11. BIN
      public/images/reddit_Dataconcerns/reddit_Dataconcerns_2.png
  12. BIN
      public/images/reddit_Dataconcerns/reddit_Dataconcerns_3.png
  13. BIN
      public/images/reddit_Dataconcerns/reddit_Dataconcerns_4.png
  14. BIN
      public/images/reddit_Dataconcerns/reddit_Dataconcerns_5.png
  15. BIN
      public/images/reddit_Sensordata/Reddit_RawSensorData.png
  16. 97
      public/json/ItemsNew.json
  17. BIN
      public/models/wip-world-exr.glb
  18. 1
      public/texts/XR_FLOSS_Init.md

2
.gitignore
View File

@ -6,6 +6,8 @@ yarn-debug.log*
yarn-error.log* yarn-error.log*
lerna-debug.log* lerna-debug.log*
*.mov
# Diagnostic reports (https://nodejs.org/api/report.html) # Diagnostic reports (https://nodejs.org/api/report.html)
report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json

2
data/drawings.json
View File

File diff suppressed because one or more lines are too long

2
index.html
View File

@ -8,7 +8,7 @@
<body> <body>
<div id="blocker"> <div id="blocker">
<div id="title"> <div id="title">
Emanciptating VR Emancipating XR
</div> </div>
<div id="instructions"> <div id="instructions">
Loading... Loading...

5
js/ItemManager.js
View File

@ -121,11 +121,6 @@ export class ItemManager {
newItem.id = itemDef.id; newItem.id = itemDef.id;
newItem.groupId = parentGroup.name; 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. // Item is already loaded from world glb, but this func creates collider etc.
await newItem.loadModel(); await newItem.loadModel();
newItem.show(); newItem.show();

4
js/Player.js
View File

@ -20,7 +20,7 @@ export class Player {
this.rigibody = null; this.rigibody = null;
this.collider = null; this.collider = null;
this.moveSpeed = 20; this.moveSpeed = 40;
this.mouseSensitivity = 0.002; this.mouseSensitivity = 0.002;
this.maxInteractionDistance = 200.0; this.maxInteractionDistance = 200.0;
@ -609,7 +609,7 @@ export class Player {
if (this.enableInput) { if (this.enableInput) {
if (this.attachedItem && !this.renderer.xr.isPresenting) { // Only lock camera for desktop 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 } else if (!this.renderer.xr.isPresenting) { // Only update movement if not in VR
this._updatePlayerMovement(delta); this._updatePlayerMovement(delta);
} }

8
js/main.js
View File

@ -91,7 +91,7 @@ async function init() {
scene.add(player.playerRig);; scene.add(player.playerRig);;
/* Load Items/Content */ /* Load Items/Content */
loadWorldModel("models/demo-world-comp.glb"); loadWorldModel("models/wip-world-exr.glb");
instructions.innerHTML = "Click to play"; instructions.innerHTML = "Click to play";
instructions.addEventListener( 'click', function () { instructions.addEventListener( 'click', function () {
@ -133,8 +133,6 @@ async function init() {
} }
} }
}); });
//console.log(scene)
} }
async function animate() { async function animate() {
@ -454,7 +452,7 @@ async function loadWorldModel(modelUrl) {
rapierWorld, rapierWorld,
staticWorldGroup, staticWorldGroup,
player, player,
true, false,
object.position, object.position,
1, 1,
object.name || 'static-world-object', object.name || 'static-world-object',
@ -489,7 +487,7 @@ async function loadWorldModel(modelUrl) {
}); });
itemManager = new ItemManager( itemManager = new ItemManager(
"json/Items.json", "json/ItemsNew.json",
preloadedObjectsMap, preloadedObjectsMap,
dynamicGroupsMap, dynamicGroupsMap,
scene, scene,

BIN
public/images/reddit_ChangeOS/reddit_ChangeOS_0.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 182 KiB

BIN
public/images/reddit_ChangeOS/reddit_ChangeOS_1.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 330 KiB

BIN
public/images/reddit_Dataconcerns/reddit_Dataconcerns_0.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 222 KiB

BIN
public/images/reddit_Dataconcerns/reddit_Dataconcerns_1.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 197 KiB

BIN
public/images/reddit_Dataconcerns/reddit_Dataconcerns_2.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 203 KiB

BIN
public/images/reddit_Dataconcerns/reddit_Dataconcerns_3.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 106 KiB

BIN
public/images/reddit_Dataconcerns/reddit_Dataconcerns_4.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 159 KiB

BIN
public/images/reddit_Dataconcerns/reddit_Dataconcerns_5.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 257 KiB

BIN
public/images/reddit_Sensordata/Reddit_RawSensorData.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 110 KiB

97
public/json/ItemsNew.json
View File

@ -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"]
]
}

BIN
public/models/wip-world-exr.glb (Stored with Git LFS)
View File

Binary file not shown.

1
public/texts/XR_FLOSS_Init.md
View File

@ -0,0 +1 @@
What if everyone who had a VR headset and a laptop was able to
Write Preview
Loading…
Cancel
Save