diff --git a/package.json b/package.json index 97926d61d59520881fbccd38ff4b3e8e8acfb137..e2d2ddfb578851bba9e296dbde1b41c21afd143b 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "aframe-extras": "^3.12.4", "aframe-input-mapping-component": "https://github.com/johnshaughnessy/aframe-input-mapping-component#23e2855", "aframe-physics-extras": "^0.1.2", - "aframe-physics-system": "https://github.com/infinitelee/aframe-physics-system#fix/constraint-dependency", + "aframe-physics-system": "https://github.com/infinitelee/aframe-physics-system#fix/3.0.0_fixes", "aframe-teleport-controls": "https://github.com/netpro2k/aframe-teleport-controls#feature/teleport-origin", "extract-text-webpack-plugin": "^3.0.2", "material-design-lite": "^1.3.0", diff --git a/src/components/remote-dynamic-body.js b/src/components/remote-dynamic-body.js index 65b055775b26bcadc3012c474944c574ed099f3e..59c06be535d8145a2e1d3729265fc7d2baaaf484 100644 --- a/src/components/remote-dynamic-body.js +++ b/src/components/remote-dynamic-body.js @@ -15,7 +15,7 @@ AFRAME.registerComponent("remote-dynamic-body", { this.networked = this.networkedEl.components.networked; if (!this._isMine()) { - this.networkedEl.setAttribute("body", "mass: 0;"); + this.networkedEl.setAttribute("body", "type: dynamic; mass: 0"); if (this.data.grabbable) this.networkedEl.setAttribute("grabbable", ""); if (this.data.stretchable) @@ -36,7 +36,7 @@ AFRAME.registerComponent("remote-dynamic-body", { tick: function(t) { if (this.wasMine && !this._isMine()) { this.wasMine = false; - this.networkedEl.setAttribute("body", "mass: 0;"); + this.networkedEl.setAttribute("body", "mass: 0"); this.networkedEl.emit("grab-end", {hand: this.hand}) this.hand = null; this.counter.deregister(this.networkedEl); diff --git a/src/network-schemas.js b/src/network-schemas.js index 0a6d9953b541afd0a39afd7dd360ac765b1f9f9a..7d0ec6047502a6c12fcc87523e7db9b30683029e 100644 --- a/src/network-schemas.js +++ b/src/network-schemas.js @@ -27,7 +27,7 @@ function registerNetworkSchemas() { NAF.schemas.add({ template: "#physics-cube", - components: ["position", "quaternion", "scale"] + components: ["position", "rotation", "scale"] }); } diff --git a/yarn.lock b/yarn.lock index 6d5e3ab1dfa7b08588e39cadc69cd4153bea1a7a..ee1e1b99f7ec27c7fc147ec72d4aea8220e58ffd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -83,9 +83,9 @@ aframe-physics-system@^1.4.3: cannon "github:donmccurdy/cannon.js#v0.6.2-dev1" three-to-cannon "^1.1.1" -"aframe-physics-system@https://github.com/infinitelee/aframe-physics-system#fix/constraint-dependency": +"aframe-physics-system@https://github.com/infinitelee/aframe-physics-system#fix/3.0.0_fixes": version "3.0.0" - resolved "https://github.com/infinitelee/aframe-physics-system#d9e7894c4f826ec7326eec67bdfc3e27a14c8773" + resolved "https://github.com/infinitelee/aframe-physics-system#2552d24277a18302968738b4f6a85fc1df6f6acc" dependencies: browserify "^14.3.0" budo "^10.0.3"