-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #55 from brown-ccv/clean-aframe
Clean aframe
- Loading branch information
Showing
16 changed files
with
1,271 additions
and
1,653 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,27 +1,40 @@ | ||
| /* globals AFRAME */ | ||
|
|
||
| // TODO: Change vars to triggerDown and gripDown | ||
| AFRAME.registerComponent("buttons-check", { | ||
| schema: { | ||
| clipPlane: { type: "boolean", default: false }, | ||
| grabObject: { type: "boolean", default: false }, | ||
| }, | ||
|
|
||
| init: function () { | ||
| this.el.addEventListener("gripdown", (evt) => { | ||
| this.data.clipPlane = true; | ||
| }); | ||
|
|
||
| this.el.addEventListener("gripup", (evt) => { | ||
| this.data.clipPlane = false; | ||
| }); | ||
| this.onGripDown = this.onGripDown.bind(this); | ||
| this.onGripUp = this.onGripDown.bind(this); | ||
| this.onTriggerDown = this.onTriggerDown.bind(this); | ||
| this.onTriggerUp = this.onTriggerUp.bind(this); | ||
| this.el.addEventListener("gripdown", this.onGripDown); | ||
| this.el.addEventListener("gripup", this.onGripUp); | ||
| this.el.addEventListener("triggerdown", this.onTriggerDown); | ||
| this.el.addEventListener("triggerup", this.onTriggerUp); | ||
| }, | ||
|
|
||
| this.el.addEventListener("triggerdown", (evt) => { | ||
| this.data.grabObject = true; | ||
| console.log(this.data.grabObject); | ||
| }); | ||
| remove: function () { | ||
| this.el.removeEventListener("gripdown", this.onGripDown); | ||
| this.el.removeEventListener("gripup", this.onGripUp); | ||
| this.el.removeEventListener("triggerdown", this.onTriggerDown); | ||
| this.el.removeEventListener("triggerup", this.onTriggerUp); | ||
| }, | ||
|
|
||
| this.el.addEventListener("triggerup", (evt) => { | ||
| this.data.grabObject = false; | ||
| console.log(this.data.grabObject); | ||
| }); | ||
| onGripDown: function (e) { | ||
| this.data.clipPlane = true; | ||
| }, | ||
| onGripUp: function (e) { | ||
| this.data.clipPlane = false; | ||
| }, | ||
| onTriggerDown: function (e) { | ||
| this.data.grabObject = true; | ||
| }, | ||
| onTriggerUp: function (e) { | ||
| this.data.grabObject = false; | ||
| }, | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| /* globals AFRAME */ | ||
|
|
||
| AFRAME.registerComponent("collider-check", { | ||
| dependencies: ["raycaster", "buttons-check"], | ||
|
|
||
| schema: { | ||
| intersecting: { type: "boolean", default: false }, | ||
| }, | ||
|
|
||
| init: function () { | ||
| this.onCollide = this.onCollide.bind(this); | ||
| this.el.addEventListener("raycaster-intersection", this.onCollide); | ||
| }, | ||
|
|
||
| onCollide: function (e) { | ||
| this.data.intersecting = true; | ||
| }, | ||
|
|
||
| remove: function () { | ||
| this.el.removeEventListener("raycaster-intersection", this.onCollide); | ||
| }, | ||
| }); |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| /* globals AFRAME */ | ||
|
|
||
| AFRAME.registerComponent("entity-collider-check", { | ||
| schema: { | ||
| intersected: { type: "boolean", default: false }, | ||
| }, | ||
|
|
||
| init: function () { | ||
| this.onCollide = this.onCollide.bind(this); | ||
| this.el.addEventListener("raycaster-intersected", this.onCollide); | ||
| }, | ||
|
|
||
| remove: function () { | ||
| this.el.removeEventListener("raycaster-intersected", this.onCollide); | ||
| }, | ||
|
|
||
| onCollide: function (e) { | ||
| this.data.intersected = true; | ||
| }, | ||
| }); |
Oops, something went wrong.