[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12029] branches/nurbs/blender/intern/ nurbana/intern: Removed iostream. h from libNurbana to see if it will help with building on MSVC

[Emmanuel Stone]

Revision: 12029
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12029
Author:   eman
Date:     2007-09-13 08:08:43 +0200 (Thu, 13 Sep 2007)

Log Message:
-----------
Removed iostream.h from libNurbana to see if it will help with building on MSVC
Typo fix in NURB_Knot.h

Thanks to lguillame for noticing both.

Modified Paths:
--------------
    branches/nurbs/blender/intern/nurbana/intern/NURBS_Knot.h
    branches/nurbs/blender/intern/nurbana/intern/libNurbana.cpp

Modified: branches/nurbs/blender/intern/nurbana/intern/NURBS_Knot.h
===================================================================
--- branches/nurbs/blender/intern/nurbana/intern/NURBS_Knot.h	2007-09-13 05:15:55 UTC (rev 12028)
+++ branches/nurbs/blender/intern/nurbana/intern/NURBS_Knot.h	2007-09-13 06:08:43 UTC (rev 12029)
@@ -38,7 +38,7 @@
     static	void	Scale(nbReal *KV, int r, nbReal Max);
     static	void	MergeKnotVectors(int Ulen, nbReal *U, int Vlen, nbReal *V, int &Ki, nbReal *KV);
     static	void	Refine(Object_NURBS *obj, nbReal *X, int r, bool UV);
-    static	void	Subdivide(Object_NURBS *obj,nbReal subdividePositionU, nbReal subdividePositionU);
+    static	void	Subdivide(Object_NURBS *obj,nbReal subdividePositionU, nbReal subdividePositionV);
     static	void	Insert(Object_NURBS *obj, int U, int V);
     static	void	Remove(Object_NURBS *obj);
     static	void	BezierDecompose(int Npts, int Order, Point3d *CtlPts, nbReal *KV);

Modified: branches/nurbs/blender/intern/nurbana/intern/libNurbana.cpp
===================================================================
--- branches/nurbs/blender/intern/nurbana/intern/libNurbana.cpp	2007-09-13 05:15:55 UTC (rev 12028)
+++ branches/nurbs/blender/intern/nurbana/intern/libNurbana.cpp	2007-09-13 06:08:43 UTC (rev 12029)
@@ -35,7 +35,7 @@
 *
 */ 
 
-#include <iostream.h>
+#include <iostream>
 //#include <iomanip.h>
 
 #include "../extern/nurbana.h"
@@ -50,9 +50,9 @@
 	Object_NURBS *on = new Object_NURBS(CtlPts,numCPu,numCPv,orderU,orderV,knotsU,knotsV,flagU,flagV,knottypeu,knottypev,resolu,resolv,isores,isoden);
 	//int numKnotsU,numKnotsV,totalLenU,totalLenV;	
 	
-	cout << "addObject()" << endl;
-	NRB_Print(on);
-	cout << "addObject<>" << endl;
+//	cout << "addObject()" << endl;
+//	NRB_Print(on);
+//	cout << "addObject<>" << endl;
 	return on;
 }
 
@@ -163,16 +163,16 @@
 nbReal3* NRB_GenerateSurface(NurbanaObj_ptr nop, nbReal3* buffer) {
 	Object_NURBS *on;
 	on = reinterpret_cast<Object_NURBS*>(nop);
-	cout << "GenerateSurface before knot recalc()" << endl;
-	NRB_Print(on);	
-	cout << "GenerateSurfacebefore knot recalc<>" << endl;
+//	cout << "GenerateSurface before knot recalc()" << endl;
+//	NRB_Print(on);	
+	//cout << "GenerateSurfacebefore knot recalc<>" << endl;
 	if(on->RecalculateKnotVector()) {
 		NURBS_Generate::KnotVector(on);
 		on->RecalculateKnotVector(0);
 	}	
-	cout << "GenerateSurface after knot recalc()" << endl;
+//	cout << "GenerateSurface after knot recalc()" << endl;
 	NRB_Print(on);	
-	cout << "GenerateSurface after knot recalc<>" << endl;
+//	cout << "GenerateSurface after knot recalc<>" << endl;
 	
 	NURBS_Generate::Surface(on,buffer);
 	return buffer;
@@ -197,7 +197,7 @@
    cps = on->CtlPts();
    u = on->Length(0);
    v = on->Length(1);
-   cout << endl << "Print out of NURB" << endl;
+   /*cout << endl << "Print out of NURB" << endl;
 	cout << "Order: " << on->Order(0) << ", " << on->Order(1) <<endl;
 	cout << "Cyclic: " << on->Cyclic(0) << ", " << on->Cyclic(1) <<endl;
 	cout << "Length: " << u << ", " << v << endl;
@@ -219,5 +219,5 @@
 				cout << on->GetKnotVector(1,i) << ",";
 			cout << endl;
 		}
-	}
+	}*/
 }