Merge pull request #33 from trenc/solid-objects

Updates and fixes

Author: trenc

dist/klee.js

@@ -1,5 +1,5 @@
 // src/modules/constants.js
-var KLEEVERSION = "0.7.2";
+var KLEEVERSION = "0.7.3";
 
 // src/default.options.js
 function getDefaultOptions(THREE) {
@@ -705,6 +705,7 @@ var Dragging = function() {
     distance = new THREE.Vector3();
   }
   function start() {
+    "use strict";
     const intersects = App.raycaster.intersectObjects(App.draggables);
     if (intersects.length <= 0) {
       return;
@@ -719,7 +720,7 @@ var Dragging = function() {
     let onDragStartCallback = App.draggableObject.userData?.callbacks?.onDragStart ?? (() => {
     });
     if (typeof App.draggableObject.userData?.callbacks?.onDragStart === "string") {
-      onDragStartCallback = eval(App.draggableObject.userData.callbacks.onDragStart);
+      onDragStartCallback = new Function("return " + App.draggableObject.userData.callbacks.onDragStart)();
     }
     onDragStartCallback(App);
     if (App.draggableObject.userData.dragMaterial) {
@@ -735,7 +736,7 @@ var Dragging = function() {
       let onDragStopCallback = App.draggableObject.userData?.callbacks?.onDragStop ?? (() => {
       });
       if (typeof App.draggableObject.userData?.callbacks?.onDragStop === "string") {
-        onDragStopCallback = eval(App.draggableObject.userData.callbacks.onDragStop);
+        onDragStopCallback = new Function("return " + App.draggableObject.userData.callbacks.onDragStop)();
       }
       onDragStopCallback(App);
     }
@@ -758,7 +759,7 @@ var Dragging = function() {
     let onDragCallback = App.draggableObject.userData?.callbacks?.onDrag ?? (() => {
     });
     if (typeof App.draggableObject.userData?.callbacks?.onDrag === "string") {
-      onDragCallback = eval(App.draggableObject.userData.callbacks.onDrag);
+      onDragCallback = new Function("return " + App.draggableObject.userData.callbacks.onDrag)();
     }
     onDragCallback(App);
     App.raycaster.ray.intersectPlane(plane, pointIntersect);

dist/klee.min.js

@@ -19,6 +19,28 @@
 			}
 		</script>
 
+		<script>
+
+			function doSomethingOnDragStart (App) {
+
+				console.log('onDragStart', App);
+
+			};
+
+			function doSomethingOnDragStop (App) {
+
+				console.log('onDragStop', App);
+
+			};
+
+			function doSomethingOnDrag (App) {
+
+				console.log('onDrag', App);
+
+			};
+
+		</script>
+
 		<script type="module">
 
 			import * as THREE from 'three';
@@ -206,7 +228,7 @@
 							receiveShadow: true,
 							userData: {
 								callbacks: {
-									onDragStart: (App) => doSomethingOnDragStart(App),
+									onDragStart: '(App) => doSomethingOnDragStart(App)',
 									onDragStop: (App) => doSomethingOnDragStop(App),
 									onDrag: (App) => doSomethingOnDrag(App)
 								},
@@ -259,25 +281,6 @@
 
 			})();
 
-
-			function doSomethingOnDragStart (App) {
-
-				console.log('onDragStart', App);
-
-			};
-
-			function doSomethingOnDragStop (App) {
-
-				console.log('onDragStop', App);
-
-			};
-
-			function doSomethingOnDrag (App) {
-
-				console.log('onDrag', App);
-
-			};
-
 		</script>
 
 	</body>