[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13752] branches/ndof: making the new transform methods work on Os X

[JLuc Peuriere]

Revision: 13752
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13752
Author:   lukep
Date:     2008-02-18 17:31:25 +0100 (Mon, 18 Feb 2008)

Log Message:
-----------
making the new transform methods work on Os X

getndof return a 7 floats array, but only the first 6 are axis
the last one is a delta and seems to be much smaller on windows systems
this value should be ignored for the moment

Modified Paths:
--------------
    branches/ndof/config/darwin-config.py
    branches/ndof/source/blender/src/editscreen.c
    branches/ndof/source/blender/src/transform.c
    branches/ndof/source/blender/src/transform_ndofinput.c

Modified: branches/ndof/config/darwin-config.py
===================================================================
--- branches/ndof/config/darwin-config.py	2008-02-18 15:56:34 UTC (rev 13751)
+++ branches/ndof/config/darwin-config.py	2008-02-18 16:31:25 UTC (rev 13752)
@@ -49,11 +49,11 @@
 BF_FMOD = LIBDIR + '/fmod'
 
 WITH_BF_OPENEXR = 'true'
-BF_OPENEXR = '/usr/local'
-BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR'
+BF_OPENEXR = '${LCGDIR}/openexr'
+BF_OPENEXR_INC = '${BF_OPENEXR}/include ${BF_OPENEXR}/include/OpenEXR'
 BF_OPENEXR_LIB = ' Iex Half IlmImf Imath IlmThread'
+BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
 
-
 WITH_BF_JPEG = 'true'
 BF_JPEG = LIBDIR + '/jpeg'
 BF_JPEG_INC = '${BF_JPEG}/include'

Modified: branches/ndof/source/blender/src/editscreen.c
===================================================================
--- branches/ndof/source/blender/src/editscreen.c	2008-02-18 15:56:34 UTC (rev 13751)
+++ branches/ndof/source/blender/src/editscreen.c	2008-02-18 16:31:25 UTC (rev 13752)
@@ -2174,10 +2174,10 @@
 	int i=0;
 	float max  = 0.0;
 	
-	for (i =0; i<5;i++)
+	for (i =0; i<6;i++)
 		if (fabs(sbval[i]) > max)
 			max = fabs(sbval[i]);
-	for (i =0; i<5;i++)
+	for (i =0; i<6;i++)
 		if (fabs(sbval[i]) != max )
 			sbval[i]=0.0;
 }

Modified: branches/ndof/source/blender/src/transform.c
===================================================================
--- branches/ndof/source/blender/src/transform.c	2008-02-18 15:56:34 UTC (rev 13751)
+++ branches/ndof/source/blender/src/transform.c	2008-02-18 16:31:25 UTC (rev 13752)
@@ -3273,7 +3273,7 @@
 
 	getndof(fval);
 
-	for(i = 0; i < 7; i++)
+	for(i = 0; i < 6; i++)
 	{
 		float val = fabs(fval[i]);
 		if (val > maxval)
@@ -3301,7 +3301,7 @@
 			mode = TFM_TRACKBALL;
 			break;
 		default:
-			printf("ndof transform mode not impremented yet");
+			printf("ndof: what we are doing here ?");
 	}
 	
 	if (mode != 0)

Modified: branches/ndof/source/blender/src/transform_ndofinput.c
===================================================================
--- branches/ndof/source/blender/src/transform_ndofinput.c	2008-02-18 15:56:34 UTC (rev 13751)
+++ branches/ndof/source/blender/src/transform_ndofinput.c	2008-02-18 16:31:25 UTC (rev 13752)
@@ -62,7 +62,7 @@
 void resetNDofInput(NDofInput *n)
 {	
 	int i;
-	for(i = 0; i < 7; i++)
+	for(i = 0; i < 6; i++)
 	{
 		n->fval[i] = 0.0f;
 	}
@@ -113,7 +113,7 @@
 	{
 		int i, j;
 		
-		for (i = 0, j = 0; i < 7; i++)
+		for (i = 0, j = 0; i < 6; i++)
 		{
 			if (n->axis & (1 << i))
 			{
@@ -136,7 +136,7 @@
 	if (G.vd->ndoffilter)
 		filterNDOFvalues(fval);
 		
-	for(i = 0; i < 7; i++)
+	for(i = 0; i < 6; i++)
 	{
 		if (!retval && fval[i] != 0.0f)
 		{