[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11629] branches/ndof: sculpt mode ndof transforms.

[JLuc Peuriere]

Revision: 11629
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11629
Author:   lukep
Date:     2007-08-17 00:00:29 +0200 (Fri, 17 Aug 2007)

Log Message:
-----------
sculpt mode ndof transforms.

please test, especially with multires conditions

Modified Paths:
--------------
    branches/ndof/intern/ghost/intern/GHOST_SystemCarbon.cpp
    branches/ndof/source/blender/src/space.c
    branches/ndof/source/blender/src/transform.c

Modified: branches/ndof/intern/ghost/intern/GHOST_SystemCarbon.cpp
===================================================================
--- branches/ndof/intern/ghost/intern/GHOST_SystemCarbon.cpp	2007-08-16 21:31:51 UTC (rev 11628)
+++ branches/ndof/intern/ghost/intern/GHOST_SystemCarbon.cpp	2007-08-16 22:00:29 UTC (rev 11629)
@@ -486,7 +486,9 @@
 					 * are, but we get a lot of them
 					 */
 				if (i!='cgs ') {
-					printf("Missed - Class: '%.4s', Kind: %d\n", &i, ::GetEventKind(event));
+					if (i!='tblt') {  // tablet event. we use the one packaged in the mouse event
+						printf("Missed - Class: '%.4s', Kind: %d\n", &i, ::GetEventKind(event));
+					}
 				}
 			}
 			::ReleaseEvent(event);

Modified: branches/ndof/source/blender/src/space.c
===================================================================
--- branches/ndof/source/blender/src/space.c	2007-08-16 21:31:51 UTC (rev 11628)
+++ branches/ndof/source/blender/src/space.c	2007-08-16 22:00:29 UTC (rev 11629)
@@ -1476,6 +1476,31 @@
 				do_layer_buttons(11); break;
 			case ACCENTGRAVEKEY:
 				do_layer_buttons(-1); break;
+			
+			case NDOFMOTION:		
+				if (G.vd->ndofmode == 0) {
+					viewmoveNDOF(1);
+				} else if (G.vd->ndofmode == 1) {
+					viewmoveNDOFfly(1);
+				} else {
+					if (OBACT) {
+						ndof_transform();
+					}
+				}
+                break;
+				
+            case NDOFBUTTON:
+				if (val == 1) {
+					G.vd->ndofmode +=1;
+					if (G.vd->ndofmode > 2)		/* we have currently 3 modes : 0 original, 1 fly, 2 transform */
+						G.vd->ndofmode = 0;
+				}
+				if (val == 2) {
+					G.vd->ndoffilter =(G.vd->ndoffilter == 1 ? 0 : 1);
+				}
+				allqueue(REDRAWHEADERS, 0);
+                break;
+				
 			}
 			
 			/* Redraw buttons window as well as view 3d (for floating panel) */
@@ -1577,7 +1602,6 @@
 						ndof_transform();
 					}
 				}
-					
                 break;
 
             case NDOFBUTTON:

Modified: branches/ndof/source/blender/src/transform.c
===================================================================
--- branches/ndof/source/blender/src/transform.c	2007-08-16 21:31:51 UTC (rev 11628)
+++ branches/ndof/source/blender/src/transform.c	2007-08-16 22:00:29 UTC (rev 11629)
@@ -3184,13 +3184,7 @@
 		special_aftertrans_update(&Trans);
 		
 	}
-	
-
-	
-	if (change) {	
-		;
-	}
-		
+			
 		/* send events out for redraws */
 		viewRedrawPost(&Trans);