WIP.

sasha240100 · sasha240100 · commit 6f4975fbe780 · 2017-10-21T23:57:17.000+03:00
diff --git a/build/physics-module.js b/build/physics-module.js
diff --git a/build/physics-module.module.js b/build/physics-module.module.js
diff --git a/src/modules/BoxModule.js b/src/modules/BoxModule.js
@@ -1,4 +1,4 @@
-import PhysicsModule from './PhysicsModule';
+import PhysicsModule from './core/PhysicsModule';
 
 export class BoxModule extends PhysicsModule {
   constructor(params) {
diff --git a/src/modules/CapsuleModule.js b/src/modules/CapsuleModule.js
@@ -1,4 +1,4 @@
-import PhysicsModule from './PhysicsModule';
+import PhysicsModule from './core/PhysicsModule';
 
 // TODO: Test CapsuleModule in action.
 export class CapsuleModule extends PhysicsModule {
diff --git a/src/modules/ClothModule.js b/src/modules/ClothModule.js
@@ -1,5 +1,5 @@
 import {BufferGeometry, BufferAttribute} from 'three';
-import PhysicsModule from './PhysicsModule';
+import PhysicsModule from './core/PhysicsModule';
 
 export class ClothModule extends PhysicsModule {
   constructor(params) {
diff --git a/src/modules/CompoundModule.js b/src/modules/CompoundModule.js
@@ -1,4 +1,4 @@
-import PhysicsModule from './PhysicsModule';
+import PhysicsModule from './core/PhysicsModule';
 
 export class CompoundModule extends PhysicsModule {
   constructor(params) {
diff --git a/src/modules/ConcaveModule.js b/src/modules/ConcaveModule.js
@@ -1,4 +1,4 @@
-import PhysicsModule from './PhysicsModule';
+import PhysicsModule from './core/PhysicsModule';
 
 export class ConcaveModule extends PhysicsModule {
   constructor(params) {
diff --git a/src/modules/ConeModule.js b/src/modules/ConeModule.js
@@ -1,4 +1,4 @@
-import PhysicsModule from './PhysicsModule';
+import PhysicsModule from './core/PhysicsModule';
 
 export class ConeModule extends PhysicsModule {
   constructor(params) {
diff --git a/src/modules/ConvexModule.js b/src/modules/ConvexModule.js
@@ -1,5 +1,5 @@
 import {BufferGeometry} from 'three';
-import PhysicsModule from './PhysicsModule';
+import PhysicsModule from './core/PhysicsModule';
 
 export class ConvexModule extends PhysicsModule {
   constructor(params) {
diff --git a/src/modules/CylinderModule.js b/src/modules/CylinderModule.js
@@ -1,4 +1,4 @@
-import PhysicsModule from './PhysicsModule';
+import PhysicsModule from './core/PhysicsModule';
 
 export class CylinderModule extends PhysicsModule {
   constructor(params) {
diff --git a/src/modules/HeightfieldModule.js b/src/modules/HeightfieldModule.js
@@ -1,4 +1,4 @@
-import PhysicsModule from './PhysicsModule';
+import PhysicsModule from './core/PhysicsModule';
 import {Vector3, Vector2, BufferGeometry} from 'three';
 
 export class HeightfieldModule extends PhysicsModule {
diff --git a/src/modules/PlaneModule.js b/src/modules/PlaneModule.js
@@ -1,4 +1,4 @@
-import PhysicsModule from './PhysicsModule';
+import PhysicsModule from './core/PhysicsModule';
 
 export class PlaneModule extends PhysicsModule {
   constructor(params) {
diff --git a/src/modules/RopeModule.js b/src/modules/RopeModule.js
@@ -1,5 +1,5 @@
 import {BufferGeometry, BufferAttribute, Vector3} from 'three';
-import PhysicsModule from './PhysicsModule';
+import PhysicsModule from './core/PhysicsModule';
 
 export class RopeModule extends PhysicsModule {
   constructor(params) {
diff --git a/src/modules/SoftbodyModule.js b/src/modules/SoftbodyModule.js
@@ -1,5 +1,5 @@
 import {BufferGeometry, BufferAttribute} from 'three';
-import PhysicsModule from './PhysicsModule';
+import PhysicsModule from './core/PhysicsModule';
 
 export class SoftbodyModule extends PhysicsModule {
   constructor(params) {
diff --git a/src/modules/SphereModule.js b/src/modules/SphereModule.js
@@ -1,4 +1,4 @@
-import PhysicsModule from './PhysicsModule';
+import PhysicsModule from './core/PhysicsModule';
 
 export class SphereModule extends PhysicsModule {
   constructor(params) {
diff --git a/src/modules/core/PhysicsModule.js b/src/modules/core/PhysicsModule.js
@@ -1,5 +1,135 @@
-import {Vector3} from 'three';
-import {wrapPhysicsPrototype, onCopy, onWrap} from './physicsPrototype';
+import {Vector3, Quaternion} from 'three';
+
+const properties = {
+  position: {
+    get() {
+      return this._native.position;
+    },
+
+    set(vector3) {
+      const pos = this._native.position;
+      const scope = this;
+
+      Object.defineProperties(pos, {
+        x: {
+          get() {
+            return this._x;
+          },
+
+          set(x) {
+            scope.__dirtyPosition = true;
+            this._x = x;
+          }
+        },
+        y: {
+          get() {
+            return this._y;
+          },
+
+          set(y) {
+            scope.__dirtyPosition = true;
+            this._y = y;
+          }
+        },
+        z: {
+          get() {
+            return this._z;
+          },
+
+          set(z) {
+            scope.__dirtyPosition = true;
+            this._z = z;
+          }
+        }
+      });
+
+      scope.__dirtyPosition = true;
+
+      pos.copy(vector3);
+    }
+  },
+
+  quaternion: {
+    get() {
+      this.__c_rot = true;
+      return this.native.quaternion;
+    },
+
+    set(quaternion) {
+      const quat = this._native.quaternion,
+        native = this._native;
+
+      quat.copy(quaternion);
+
+      quat.onChange(() => {
+        if (this.__c_rot) {
+          if (native.__dirtyRotation === true) {
+            this.__c_rot = false;
+            native.__dirtyRotation = false;
+          }
+          native.__dirtyRotation = true;
+        }
+      });
+    }
+  },
+
+  rotation: {
+    get() {
+      this.__c_rot = true;
+      return this._native.rotation;
+    },
+
+    set(euler) {
+      const rot = this._native.rotation,
+        native = this._native;
+
+      this.quaternion.copy(new Quaternion().setFromEuler(euler));
+
+      rot.onChange(() => {
+        if (this.__c_rot) {
+          this.quaternion.copy(new Quaternion().setFromEuler(rot));
+          native.__dirtyRotation = true;
+        }
+      });
+    }
+  }
+}
+
+function wrapPhysicsPrototype(scope) {
+  for (let key in properties) {
+    Object.defineProperty(scope, key, {
+      get: properties[key].get.bind(scope),
+      set: properties[key].set.bind(scope),
+      configurable: true,
+      enumerable: true
+    });
+  }
+}
+
+function onCopy(source) {
+  wrapPhysicsPrototype(this);
+
+  const physics = this.use('physics');
+  const sourcePhysics = source.use('physics');
+
+  this.manager.modules.physics = physics.clone(this.manager);
+
+  physics.data = {...sourcePhysics.data};
+  physics.data.isSoftBodyReset = false;
+  if (physics.data.isSoftbody) physics.data.isSoftBodyReset = false;
+
+  this.position = this.position.clone();
+  this.rotation = this.rotation.clone();
+  this.quaternion = this.quaternion.clone();
+
+  return source;
+}
+
+function onWrap() {
+  this.position = this.position.clone();
+  this.rotation = this.rotation.clone();
+  this.quaternion = this.quaternion.clone();
+}
 
 class API {
   applyCentralImpulse(force) {
diff --git a/vendor/ammo.js b/vendor/ammo.js

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import PhysicsModule from './PhysicsModule';`
	`1`	`+import PhysicsModule from './core/PhysicsModule';`
`2`	`2`
`3`	`3`	`export class BoxModule extends PhysicsModule {`
`4`	`4`	`constructor(params) {`