[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38831] branches/merwin-spacenav/source/ blender/windowmanager/intern/wm_operators.c: ndof sensitivity operator follows power curve and respects min/max

[Mike Erwin]

Revision: 38831
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38831
Author:   merwin
Date:     2011-07-29 21:07:51 +0000 (Fri, 29 Jul 2011)
Log Message:
-----------
ndof sensitivity operator follows power curve and respects min/max

Modified Paths:
--------------
    branches/merwin-spacenav/source/blender/windowmanager/intern/wm_operators.c

Modified: 
branches/merwin-spacenav/source/blender/windowmanager/intern/wm_operators.c
===================================================================
--- branches/merwin-spacenav/source/blender/windowmanager/intern/wm_operators.c 
2011-07-29 20:59:46 UTC (rev 38830)
+++ branches/merwin-spacenav/source/blender/windowmanager/intern/wm_operators.c 
2011-07-29 21:07:51 UTC (rev 38831)
@@ -3435,16 +3435,36 @@
 
 static int wm_ndof_sensitivity_exec(bContext *UNUSED(C), wmOperator *op)
 {
-       float change = 0.1f;
-       int dir = 1;
-       if(RNA_boolean_get(op->ptr, "decrease"))
-               dir = -1;
+       const float min = 0.25f, max = 4.f; // TODO: get these from RNA property
+       float change;
+       float sensitivity = U.ndof_sensitivity;
+
        if(RNA_boolean_get(op->ptr, "fast"))
-               change = 1.0f;
+               change = 0.5f; // 50% change
+       else
+               change = 0.1f; // 10%
 
+       if(RNA_boolean_get(op->ptr, "decrease"))
+               {
+               sensitivity -= sensitivity * change; 
+               if (sensitivity < min)
+                       sensitivity = min;
+               }
+       else
+               {
+               sensitivity += sensitivity * change; 
+               if (sensitivity > max)
+                       sensitivity = max;
+               }
 
-       U.ndof_sensitivity += (dir * change);
-       printf("new sensitivity: %f\n", U.ndof_sensitivity);
+       if (sensitivity != U.ndof_sensitivity)
+               {
+               U.ndof_sensitivity = sensitivity;
+               printf("new sensitivity: %f\n", U.ndof_sensitivity);
+               }
+       else
+               printf("same sensitivity: %f\n", U.ndof_sensitivity);
+
        return OPERATOR_FINISHED;
 }
 
@@ -3457,8 +3477,9 @@
        ot->exec= wm_ndof_sensitivity_exec;
 
        RNA_def_boolean(ot->srna, "decrease", 1, "Decrease NDOF sensitivity", 
"If true then action decreases NDOF sensitivity instead of increasing");
-       RNA_def_boolean(ot->srna, "fast", 0, "Fast NDOF sensitivity change", 
"If true then action change with factor 1.0, otherwise 0.1");
+       RNA_def_boolean(ot->srna, "fast", 0, "Fast NDOF sensitivity change", 
"If true then sensitivity changes 50%, otherwise 10%");
 } 
+
 /* ******************************************************* */
 /* called on initialize WM_exit() */
 void wm_operatortype_free(void)

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs