Updated InterfaceCallbacks - these appear to fix the crash.

rpavlik · rpavlik · commit fcb1759d7ad0 · 2014-12-29T11:31:49.000-06:00
diff --git a/OSVR-Unity/Assets/OSVRUnity/src/InterfaceCallbacks.cs b/OSVR-Unity/Assets/OSVRUnity/src/InterfaceCallbacks.cs
@@ -53,14 +53,16 @@ public void RegisterCallback(PoseMatrixCallback callback)
                 if (null == poseMatrixCallbacks)
                 {
                     poseMatrixCallbacks = callback;
-                    iface.registerCallback(PoseMatrixCb, System.IntPtr.Zero);
+                    rawPoseMatrixCallback = new OSVR.ClientKit.PoseCallback(PoseMatrixCb);
+                    iface.registerCallback(rawPoseMatrixCallback, System.IntPtr.Zero);
                 }
                 else
                 {
                     poseMatrixCallbacks += callback;
                 }
             }
 
+            private OSVR.ClientKit.PoseCallback rawPoseMatrixCallback;
             private PoseMatrixCallback poseMatrixCallbacks;
 
             public void RegisterCallback(PoseCallback callback)
@@ -69,14 +71,16 @@ public void RegisterCallback(PoseCallback callback)
                 if (null == poseCallbacks)
                 {
                     poseCallbacks = callback;
-                    iface.registerCallback(PoseCb, System.IntPtr.Zero);
+                    rawPoseCallback = new OSVR.ClientKit.PoseCallback(PoseCb);
+                    iface.registerCallback(rawPoseCallback, System.IntPtr.Zero);
                 }
                 else
                 {
                     poseCallbacks += callback;
                 }
             }
 
+            private OSVR.ClientKit.PoseCallback rawPoseCallback;
             private PoseCallback poseCallbacks;
 
             public void RegisterCallback(PositionCallback callback)
@@ -85,14 +89,16 @@ public void RegisterCallback(PositionCallback callback)
                 if (null == positionCallbacks)
                 {
                     positionCallbacks = callback;
-                    iface.registerCallback(PositionCb, System.IntPtr.Zero);
+                    rawPositionCallback = new OSVR.ClientKit.PositionCallback(PositionCb);
+                    iface.registerCallback(rawPositionCallback, System.IntPtr.Zero);
                 }
                 else
                 {
                     positionCallbacks += callback;
                 }
             }
 
+            private OSVR.ClientKit.PositionCallback rawPositionCallback;
             private PositionCallback positionCallbacks;
 
             public void RegisterCallback(OrientationCallback callback)
@@ -101,26 +107,34 @@ public void RegisterCallback(OrientationCallback callback)
                 if (null == orientationCallbacks)
                 {
                     orientationCallbacks = callback;
-                    iface.registerCallback(OrientationCb, System.IntPtr.Zero);
+                    rawOrientationCallback = new OSVR.ClientKit.OrientationCallback(OrientationCb);
+                    iface.registerCallback(rawOrientationCallback, System.IntPtr.Zero);
                 }
                 else
                 {
                     orientationCallbacks += callback;
                 }
             }
 
+            private OSVR.ClientKit.OrientationCallback rawOrientationCallback;
             private OrientationCallback orientationCallbacks;
 
             public void RegisterCallback(ButtonCallback callback)
             {
                 Start(); // make sure the interface is initialized.
                 if (null == buttonCallbacks)
                 {
-                    iface.registerCallback(ButtonCb, System.IntPtr.Zero);
+                    buttonCallbacks = callback;
+                    rawButtonCallback = new OSVR.ClientKit.ButtonCallback(ButtonCb);
+                    iface.registerCallback(rawButtonCallback, System.IntPtr.Zero);
+                }
+                else
+                {
+                    buttonCallbacks += callback;
                 }
-                buttonCallbacks += callback;
             }
 
+            private OSVR.ClientKit.ButtonCallback rawButtonCallback;
             private ButtonCallback buttonCallbacks;
 
             public void RegisterCallback(AnalogCallback callback)
@@ -129,18 +143,22 @@ public void RegisterCallback(AnalogCallback callback)
                 if (null == analogCallbacks)
                 {
                     analogCallbacks = callback;
-                    iface.registerCallback(AnalogCb, System.IntPtr.Zero);
+                    rawAnalogCallback = new OSVR.ClientKit.AnalogCallback(AnalogCb);
+                    iface.registerCallback(rawAnalogCallback, System.IntPtr.Zero);
                 }
                 else
                 {
                     analogCallbacks += callback;
                 }
             }
 
+            private OSVR.ClientKit.AnalogCallback rawAnalogCallback;
             private AnalogCallback analogCallbacks;
 
             /* END GENERATED CODE - unity-generate.lua */
 
+
+
             private void PoseCb(System.IntPtr userdata, ref OSVR.ClientKit.TimeValue timestamp, ref OSVR.ClientKit.PoseReport report)
             {
                 Vector3 position = Math.ConvertPosition(report.pose.translation);
diff --git a/unity-generate.lua b/unity-generate.lua
@@ -4,12 +4,14 @@ template = [[
 				Start(); // make sure the interface is initialized.
 				if (null == $WrappedList) {
 					$WrappedList = callback;
-					iface.registerCallback ($RawCallback, System.IntPtr.Zero);
+					raw$WrappedCallback = new OSVR.ClientKit.$RawCallbackType($RawCallback);
+					iface.registerCallback (raw$WrappedCallback, System.IntPtr.Zero);
 				} else {
 					$WrappedList += callback;
 				}
 			}
 			
+			private OSVR.ClientKit.$RawCallbackType raw$WrappedCallback;
 			private $WrappedCallback $WrappedList;
 ]]
 function generate(data)
@@ -24,6 +26,7 @@ print(generate{
 	WrappedCallback = "PoseMatrixCallback";
 	WrappedList = "poseMatrixCallbacks";
 	RawCallback = "PoseMatrixCb";
+	RawCallbackType = "PoseCallback";
 })
 
 for _, v in ipairs{"Pose", "Position", "Orientation", "Button", "Analog"} do
@@ -33,6 +36,7 @@ for _, v in ipairs{"Pose", "Position", "Orientation", "Button", "Analog"} do
 		WrappedCallback = CapsName .. "Callback";
 		WrappedList = nocapsName .. "Callbacks";
 		RawCallback = CapsName .. "Cb";
+		RawCallbackType = CapsName .. "Callback";
 	}
 	print(generate(vals))
 end

Original file line number	Diff line number	Diff line change
`@@ -53,14 +53,16 @@ public void RegisterCallback(PoseMatrixCallback callback)`
`53`	`53`	`if (null == poseMatrixCallbacks)`
`54`	`54`	`{`
`55`	`55`	`poseMatrixCallbacks = callback;`
`56`		`- iface.registerCallback(PoseMatrixCb, System.IntPtr.Zero);`
	`56`	`+ rawPoseMatrixCallback = new OSVR.ClientKit.PoseCallback(PoseMatrixCb);`
	`57`	`+ iface.registerCallback(rawPoseMatrixCallback, System.IntPtr.Zero);`
`57`	`58`	`}`
`58`	`59`	`else`
`59`	`60`	`{`
`60`	`61`	`poseMatrixCallbacks += callback;`
`61`	`62`	`}`
`62`	`63`	`}`
`63`	`64`
	`65`	`+ private OSVR.ClientKit.PoseCallback rawPoseMatrixCallback;`
`64`	`66`	`private PoseMatrixCallback poseMatrixCallbacks;`
`65`	`67`
`66`	`68`	`public void RegisterCallback(PoseCallback callback)`
`@@ -69,14 +71,16 @@ public void RegisterCallback(PoseCallback callback)`
`69`	`71`	`if (null == poseCallbacks)`
`70`	`72`	`{`
`71`	`73`	`poseCallbacks = callback;`
`72`		`- iface.registerCallback(PoseCb, System.IntPtr.Zero);`
	`74`	`+ rawPoseCallback = new OSVR.ClientKit.PoseCallback(PoseCb);`
	`75`	`+ iface.registerCallback(rawPoseCallback, System.IntPtr.Zero);`
`73`	`76`	`}`
`74`	`77`	`else`
`75`	`78`	`{`
`76`	`79`	`poseCallbacks += callback;`
`77`	`80`	`}`
`78`	`81`	`}`
`79`	`82`
	`83`	`+ private OSVR.ClientKit.PoseCallback rawPoseCallback;`
`80`	`84`	`private PoseCallback poseCallbacks;`
`81`	`85`
`82`	`86`	`public void RegisterCallback(PositionCallback callback)`
`@@ -85,14 +89,16 @@ public void RegisterCallback(PositionCallback callback)`
`85`	`89`	`if (null == positionCallbacks)`
`86`	`90`	`{`
`87`	`91`	`positionCallbacks = callback;`
`88`		`- iface.registerCallback(PositionCb, System.IntPtr.Zero);`
	`92`	`+ rawPositionCallback = new OSVR.ClientKit.PositionCallback(PositionCb);`
	`93`	`+ iface.registerCallback(rawPositionCallback, System.IntPtr.Zero);`
`89`	`94`	`}`
`90`	`95`	`else`
`91`	`96`	`{`
`92`	`97`	`positionCallbacks += callback;`
`93`	`98`	`}`
`94`	`99`	`}`
`95`	`100`
	`101`	`+ private OSVR.ClientKit.PositionCallback rawPositionCallback;`
`96`	`102`	`private PositionCallback positionCallbacks;`
`97`	`103`
`98`	`104`	`public void RegisterCallback(OrientationCallback callback)`
`@@ -101,26 +107,34 @@ public void RegisterCallback(OrientationCallback callback)`
`101`	`107`	`if (null == orientationCallbacks)`
`102`	`108`	`{`
`103`	`109`	`orientationCallbacks = callback;`
`104`		`- iface.registerCallback(OrientationCb, System.IntPtr.Zero);`
	`110`	`+ rawOrientationCallback = new OSVR.ClientKit.OrientationCallback(OrientationCb);`
	`111`	`+ iface.registerCallback(rawOrientationCallback, System.IntPtr.Zero);`
`105`	`112`	`}`
`106`	`113`	`else`
`107`	`114`	`{`
`108`	`115`	`orientationCallbacks += callback;`
`109`	`116`	`}`
`110`	`117`	`}`
`111`	`118`
	`119`	`+ private OSVR.ClientKit.OrientationCallback rawOrientationCallback;`
`112`	`120`	`private OrientationCallback orientationCallbacks;`
`113`	`121`
`114`	`122`	`public void RegisterCallback(ButtonCallback callback)`
`115`	`123`	`{`
`116`	`124`	`Start(); // make sure the interface is initialized.`
`117`	`125`	`if (null == buttonCallbacks)`
`118`	`126`	`{`
`119`		`- iface.registerCallback(ButtonCb, System.IntPtr.Zero);`
	`127`	`+ buttonCallbacks = callback;`
	`128`	`+ rawButtonCallback = new OSVR.ClientKit.ButtonCallback(ButtonCb);`
	`129`	`+ iface.registerCallback(rawButtonCallback, System.IntPtr.Zero);`
	`130`	`+ }`
	`131`	`+ else`
	`132`	`+ {`
	`133`	`+ buttonCallbacks += callback;`
`120`	`134`	`}`
`121`		`- buttonCallbacks += callback;`
`122`	`135`	`}`
`123`	`136`
	`137`	`+ private OSVR.ClientKit.ButtonCallback rawButtonCallback;`
`124`	`138`	`private ButtonCallback buttonCallbacks;`
`125`	`139`
`126`	`140`	`public void RegisterCallback(AnalogCallback callback)`
`@@ -129,18 +143,22 @@ public void RegisterCallback(AnalogCallback callback)`
`129`	`143`	`if (null == analogCallbacks)`
`130`	`144`	`{`
`131`	`145`	`analogCallbacks = callback;`
`132`		`- iface.registerCallback(AnalogCb, System.IntPtr.Zero);`
	`146`	`+ rawAnalogCallback = new OSVR.ClientKit.AnalogCallback(AnalogCb);`
	`147`	`+ iface.registerCallback(rawAnalogCallback, System.IntPtr.Zero);`
`133`	`148`	`}`
`134`	`149`	`else`
`135`	`150`	`{`
`136`	`151`	`analogCallbacks += callback;`
`137`	`152`	`}`
`138`	`153`	`}`
`139`	`154`
	`155`	`+ private OSVR.ClientKit.AnalogCallback rawAnalogCallback;`
`140`	`156`	`private AnalogCallback analogCallbacks;`
`141`	`157`
`142`	`158`	`/* END GENERATED CODE - unity-generate.lua */`
`143`	`159`
	`160`	`+`
	`161`	`+`
`144`	`162`	`private void PoseCb(System.IntPtr userdata, ref OSVR.ClientKit.TimeValue timestamp, ref OSVR.ClientKit.PoseReport report)`
`145`	`163`	`{`
`146`	`164`	`Vector3 position = Math.ConvertPosition(report.pose.translation);`