From a411045559326fb9205f7940219c0b344b005aab Mon Sep 17 00:00:00 2001
From: netpro2k <netpro2k@gmail.com>
Date: Fri, 20 Apr 2018 16:14:12 -0700
Subject: [PATCH] Revert "Hack to remove hand states and monkeypatch PannerNode
- This should be"
This reverts commit 1dbd414ddc9b2e9e759083293a62ae3d43983be5.
---
src/hub.js | 3 +--
src/network-schemas.js | 20 ++++++++++----------
src/utils/webgl.js | 12 ------------
3 files changed, 11 insertions(+), 24 deletions(-)
diff --git a/src/hub.js b/src/hub.js
index 1cab0c237..f57b614c4 100644
--- a/src/hub.js
+++ b/src/hub.js
@@ -4,9 +4,8 @@ import uuid from "uuid/v4";
import queryString from "query-string";
import { Socket } from "phoenix";
-import { patchWebGLRenderingContext, monkeyPatchPannerNode } from "./utils/webgl";
+import { patchWebGLRenderingContext } from "./utils/webgl";
patchWebGLRenderingContext();
-monkeyPatchPannerNode();
import "aframe-xr";
import "./vendor/GLTFLoader";
diff --git a/src/network-schemas.js b/src/network-schemas.js
index 2e24083d2..822951bed 100644
--- a/src/network-schemas.js
+++ b/src/network-schemas.js
@@ -9,16 +9,16 @@ function registerNetworkSchemas() {
},
"scale",
"player-info",
- // {
- // selector: ".RootScene",
- // component: "hand-pose__left",
- // property: "pose"
- // },
- // {
- // selector: ".RootScene",
- // component: "hand-pose__right",
- // property: "pose"
- // },
+ {
+ selector: ".RootScene",
+ component: "hand-pose__left",
+ property: "pose"
+ },
+ {
+ selector: ".RootScene",
+ component: "hand-pose__right",
+ property: "pose"
+ },
{
selector: ".camera",
component: "position"
diff --git a/src/utils/webgl.js b/src/utils/webgl.js
index 92e95ac0c..b9cbe9c6c 100644
--- a/src/utils/webgl.js
+++ b/src/utils/webgl.js
@@ -33,15 +33,3 @@ export function patchWebGLRenderingContext() {
}
WebGLRenderingContext.prototype.getExtension = patchedGetExtension;
}
-
-// HACK: THIS SHOULD NOT GET MERGED TO MASTER
-export function monkeyPatchPannerNode() {
- const setPosition = PannerNode.prototype.setPosition;
- PannerNode.prototype.setPosition = function(x, y, z) {
- if (isNaN(x) || isNaN(y) || isNaN(z)) {
- console.error("PannerNode.setPosition caled with invalid position", x, y, z);
- } else {
- setPosition.call(this, x, y, z);
- }
- };
-}
--
GitLab