Attachment 580168 Details for Bug 814665 – patch for blender ndof system

[patch] patch for blender ndof system

blender-ndof_fix.patch (text/plain), 1.43 KB, created by Richard Shaw on 2012-04-25 13:22:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Richard Shaw

Created: 2012-04-25 13:22:59 UTC

Size: 1.43 KB

patch

obsolete

>Index: intern/ghost/intern/GHOST_NDOFManagerX11.cpp
>===================================================================
>--- intern/ghost/intern/GHOST_NDOFManagerX11.cpp	(revision 45950)
>+++ intern/ghost/intern/GHOST_NDOFManagerX11.cpp	(revision 45951)
>@@ -75,28 +75,32 @@
> 
> bool GHOST_NDOFManagerX11::processEvents()
> {
>-	GHOST_TUns64 now = m_system.getMilliSeconds();
>-
> 	bool anyProcessed = false;
>-	spnav_event e;
>-	while (spnav_poll_event(&e)) {
>-		switch (e.type) {
>-			case SPNAV_EVENT_MOTION:
>-			{
>-				/* convert to blender view coords */
>-				short t[3] = {e.motion.x, e.motion.y, -e.motion.z};
>-				short r[3] = {-e.motion.rx, -e.motion.ry, e.motion.rz};
> 
>-				updateTranslation(t, now);
>-				updateRotation(r, now);
>-				break;
>+	if (m_available) {
>+		GHOST_TUns64 now = m_system.getMilliSeconds();
>+
>+		spnav_event e;
>+		while (spnav_poll_event(&e)) {
>+			switch (e.type) {
>+				case SPNAV_EVENT_MOTION:
>+				{
>+					/* convert to blender view coords */
>+					short t[3] = {e.motion.x, e.motion.y, -e.motion.z};
>+					short r[3] = {-e.motion.rx, -e.motion.ry, e.motion.rz};
>+
>+					updateTranslation(t, now);
>+					updateRotation(r, now);
>+					break;
>+				}
>+				case SPNAV_EVENT_BUTTON:
>+					updateButton(e.button.bnum, e.button.press, now);
>+					break;
> 			}
>-			case SPNAV_EVENT_BUTTON:
>-				updateButton(e.button.bnum, e.button.press, now);
>-				break;
>+			anyProcessed = true;
> 		}
>-		anyProcessed = true;
> 	}
>+
> 	return anyProcessed;
> }
>

Actions: View | Diff

Attachments on bug 814665: 580168