[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31254] branches/nurbs-merge: Small cleanup.

Sergey Sharybin g.ulairi at gmail.com
Wed Aug 11 17:41:35 CEST 2010


Revision: 31254
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31254
Author:   nazgul
Date:     2010-08-11 17:41:35 +0200 (Wed, 11 Aug 2010)

Log Message:
-----------
Small cleanup.
  Rename NRB_* functions to be consistent capitalisation.
  Rename nbNURBS::Cyclic to getCyclic and setCyclic

Merge rev31150 from nurbs25 branch

Revision Links:
--------------
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31150

Modified Paths:
--------------
    branches/nurbs-merge/intern/nurbana/extern/nurbana.h
    branches/nurbs-merge/intern/nurbana/intern/libNurbana.cpp
    branches/nurbs-merge/intern/nurbana/intern/nbConstruct.cpp
    branches/nurbs-merge/intern/nurbana/intern/nbDegree.cpp
    branches/nurbs-merge/intern/nurbana/intern/nbGenerate.cpp
    branches/nurbs-merge/intern/nurbana/intern/nbGridTessellator.cpp
    branches/nurbs-merge/intern/nurbana/intern/nbKnot.cpp
    branches/nurbs-merge/intern/nurbana/intern/nbMath.cpp
    branches/nurbs-merge/intern/nurbana/intern/nbNURBS.cpp
    branches/nurbs-merge/intern/nurbana/intern/nbNURBS.h
    branches/nurbs-merge/intern/nurbana/intern/nbTrimTessellator.cpp
    branches/nurbs-merge/source/blender/blenkernel/intern/curve.c
    branches/nurbs-merge/source/blender/blenkernel/intern/displist.c
    branches/nurbs-merge/source/blender/editors/curve/editcurve.c
    branches/nurbs-merge/source/blender/render/intern/source/convertblender.c

Modified: branches/nurbs-merge/intern/nurbana/extern/nurbana.h
===================================================================
--- branches/nurbs-merge/intern/nurbana/extern/nurbana.h	2010-08-11 15:41:04 UTC (rev 31253)
+++ branches/nurbs-merge/intern/nurbana/extern/nurbana.h	2010-08-11 15:41:35 UTC (rev 31254)
@@ -65,21 +65,15 @@
 	float radius, pad;		/* user-set radius per point for bevelling etc */
 } ControlPoint;
 
-// forward declare as void
-//typedef void Point3d; 
-//typedef void* Point3d_ptr;
 typedef Point3d* Point3d_ptr;
 typedef nbReal3* nbReal3_ptr;
 typedef void* BlenderNurbs_ptr;
 typedef void* NurbanaObj_ptr; // to hide pointer to C++ object in C space
 
 extern NurbanaObj_ptr NRB_addObject(BlenderNurbs_ptr bNurbs);
-extern NurbanaObj_ptr NRB_CreatePrimitive(NurbanaObj_ptr nop, unsigned char type);
+extern NurbanaObj_ptr NRB_createPrimitive(NurbanaObj_ptr nop, unsigned char type);
 
 
-
-//extern void NRB_init(NurbanaObj_ptr nop);
-
 extern NurbanaObj_ptr NRB_reallocate(BlenderNurbs_ptr bNurbs);
 
 extern void NRB_removeObject(NurbanaObj_ptr nop);
@@ -90,25 +84,18 @@
 extern void NRB_getTrimTess(NurbanaObj_ptr surface, float** vertex, int** index, int* totindex, float** norm);
 extern void NRB_addTrimCurve(NurbanaObj_ptr surface, void* curve);
 
-extern void NRB_ResChanged(NurbanaObj_ptr nop );
-extern void NRB_SizeChanged(NurbanaObj_ptr nop, int newU, int newV);
-extern void NRB_UpdateSize(NurbanaObj_ptr nop);
+extern void NRB_resChanged(NurbanaObj_ptr nop );
+extern void NRB_sizeChanged(NurbanaObj_ptr nop, int newU, int newV);
+extern void NRB_updateSize(NurbanaObj_ptr nop);
 
 extern void NRB_setLength(int U, int V, int shiftU, int shiftV, int copyKnots, NurbanaObj_ptr nurb);
-//extern void NRB_reallocKnots(int U, int V, int copy, NurbanaObj_ptr nurb);
-//extern void NRB_reallocCtlPts(int U, int V, int shiftU, int shiftV, NurbanaObj_ptr nurb);
 
 extern void NRB_copyPatchFromBuffer(nbReal4 *buffer, int curveLength, int nextCurve, int curveCount, NurbanaObj_ptr nurb, int uOffset, int vOffset);
 
-extern void NRB_ConvertToPrimitive(NurbanaObj_ptr nop,unsigned char type);
+extern void NRB_convertToPrimitive(NurbanaObj_ptr nop,unsigned char type);
 
-extern void NRB_RecalculateKnots(NurbanaObj_ptr nop,int uv,int type);
+extern void NRB_recalculateKnots(NurbanaObj_ptr nop,int uv,int type);
 
-//extern Nurb_ExternPtr NRB_getNurbData(NurbanaObj_ptr nop);
-
-//extern void NRB_freeNurbData(Nurb_ExternPtr ne);
-//extern void NRB_updateNurbData(Nurb_ExternPtr ne,NurbanaObj_ptr nop);
-
 extern int NRB_getNumTessPoints(NurbanaObj_ptr nurb);
 extern int NRB_getNumCPoints(int uv,NurbanaObj_ptr nurb);
 extern int NRB_getOrder(int uv,NurbanaObj_ptr nurb);
@@ -131,37 +118,37 @@
 extern void NRB_getQuadIndexes(NurbanaObj_ptr nop, int* indexes);
 extern void NRB_getNormals(NurbanaObj_ptr nop, int* qIndexes, int* tIndexes, nbReal* verts, nbReal* nors);
 extern int NRB_getVertexCount(NurbanaObj_ptr nop);
-//extern nbReal* NRB_GenerateSurface(NurbanaObj_ptr nop, nbReal* buffer, int dim );
-extern nbReal* NRB_GenerateSurface(NurbanaObj_ptr nop, nbReal* buffer, int resU, int resV, int dim);
+//extern nbReal* NRB_generateSurface(NurbanaObj_ptr nop, nbReal* buffer, int dim );
+extern nbReal* NRB_generateSurface(NurbanaObj_ptr nop, nbReal* buffer, int resU, int resV, int dim);
 
-extern nbReal* NRB_GenerateCurve(NurbanaObj_ptr nop, nbReal* buffer, nbReal* bevpBuffer, nbReal* tiltBuffer, nbReal* radiusBuffer, int res, int stride);
-extern nbReal* NRB_GenerateCurveOnSurface(NurbanaObj_ptr nop, nbReal* buffer, int res, nbReal t, int uv, int dim);
-extern nbReal3_ptr NRB_GenerateNormals(NurbanaObj_ptr nop);
+extern nbReal* NRB_generateCurve(NurbanaObj_ptr nop, nbReal* buffer, nbReal* bevpBuffer, nbReal* tiltBuffer, nbReal* radiusBuffer, int res, int stride);
+extern nbReal* NRB_generateCurveOnSurface(NurbanaObj_ptr nop, nbReal* buffer, int res, nbReal t, int uv, int dim);
+extern nbReal3_ptr NRB_generateNormals(NurbanaObj_ptr nop);
 
 
-extern void NRB_RefitSurface(NurbanaObj_ptr nop, nbReal* buffer);
+extern void NRB_refitSurface(NurbanaObj_ptr nop, nbReal* buffer);
 
-extern void NRB_Subdivide(NurbanaObj_ptr nop,int subdivideU, int subdivideV);
-extern void NRB_Refine(NurbanaObj_ptr nop, int U, int V);
-extern void NRB_KnotInsert(NurbanaObj_ptr nop,nbReal *X, int r, int UV);
+extern void NRB_subdivide(NurbanaObj_ptr nop,int subdivideU, int subdivideV);
+extern void NRB_refine(NurbanaObj_ptr nop, int U, int V);
+extern void NRB_knotInsert(NurbanaObj_ptr nop,nbReal *X, int r, int UV);
 
 extern void NRB_split(NurbanaObj_ptr nop, nbReal x, int uv, nbReal4* dst, int dstLen, int* frstLen, int* scndLen, int* k, int* newPoints, int* inserted);
 extern void NRB_splitConvertBuffer(nbReal4* buffer, int newPoints, NurbanaObj_ptr nop, NurbanaObj_ptr nop2, nbReal splitKnot, int newLength, int span, int uv, int frstLen, int scndLen);
 
 
-extern void NRB_Blend(NurbanaObj_ptr in1, NurbanaObj_ptr in2, int edgeA, int edgeB, NurbanaObj_ptr out);
+extern void NRB_blend(NurbanaObj_ptr in1, NurbanaObj_ptr in2, int edgeA, int edgeB, NurbanaObj_ptr out);
 
-extern void NRB_DegreeElevate(NurbanaObj_ptr nop,int Uinc, int Vinc);
-extern void NRB_DegreeReduce(NurbanaObj_ptr nop,int Udec, int Vdec);
+extern void NRB_degreeElevate(NurbanaObj_ptr nop,int Uinc, int Vinc);
+extern void NRB_degreeReduce(NurbanaObj_ptr nop,int Udec, int Vdec);
 
 
 // OpenNURBS stuff
 extern int NRB_loadOpenNURBS(NurbanaObj_ptr nop, char* filename);
 
 // Misc utility functions
-extern void NRB_Print(NurbanaObj_ptr nop);
+extern void NRB_print(NurbanaObj_ptr nop);
 
-extern void NRB_Echo();
+extern void NRB_echo();
 
 #define  NURBANA_PRIMITIVE_CURVE     0
 #define  NURBANA_PRIMITIVE_SURFACE   1
@@ -173,4 +160,4 @@
 }
 #endif
 
-#endif // NAN_INCLUDED_nurbana_h
\ No newline at end of file
+#endif // NAN_INCLUDED_nurbana_h

Modified: branches/nurbs-merge/intern/nurbana/intern/libNurbana.cpp
===================================================================
--- branches/nurbs-merge/intern/nurbana/intern/libNurbana.cpp	2010-08-11 15:41:04 UTC (rev 31253)
+++ branches/nurbs-merge/intern/nurbana/intern/libNurbana.cpp	2010-08-11 15:41:35 UTC (rev 31254)
@@ -53,7 +53,7 @@
 //#include "opennurbs/opennurbs.h"
 //#include "ON_IO.h"
 
-//void NRB_Print(NurbanaObj_ptr nop);
+//void NRB_print(NurbanaObj_ptr nop);
 
 typedef Point3d* Point3d_ptr;
 
@@ -65,7 +65,7 @@
 }
 
 // Initialises an already created object to be a particular kind of geometric primitive e.g. sphere 
-NurbanaObj_ptr NRB_CreatePrimitive(NurbanaObj_ptr nop, unsigned char type) {
+NurbanaObj_ptr NRB_createPrimitive(NurbanaObj_ptr nop, unsigned char type) {
 	nbNURBS *on = reinterpret_cast<nbNURBS*>(nop);
 	nbPrimitives::create(on, type);
 	return nop;
@@ -131,7 +131,7 @@
 
 // Size related
 
-void NRB_SizeChanged(NurbanaObj_ptr nop, int newU, int newV) {
+void NRB_sizeChanged(NurbanaObj_ptr nop, int newU, int newV) {
 	//	cout << "subdivide in libNurbana" << endl;
 	nbNURBS *on;
 	on = reinterpret_cast<nbNURBS*>(nop);
@@ -153,7 +153,7 @@
 	on->setCacheBuffer();
 }
 
-void NRB_UpdateSize(NurbanaObj_ptr nop) {
+void NRB_updateSize(NurbanaObj_ptr nop) {
 	//	cout << "subdivide in libNurbana" << endl;
 	nbNURBS *on;
 	on = reinterpret_cast<nbNURBS*>(nop);
@@ -204,43 +204,43 @@
 	on->reallocCtlPts(U, V, shiftU, shiftV);
 }*/
 
-void NRB_Subdivide(NurbanaObj_ptr nop, int subU, int subV) {
+void NRB_subdivide(NurbanaObj_ptr nop, int subU, int subV) {
 	//	cout << "subdivide in libNurbana" << endl;
 	nbNURBS *on;
 	on = reinterpret_cast<nbNURBS*>(nop);
 	nbKnot::Subdivide(on, subU, subV );
 	on->setCacheBuffer();
-	NRB_Print(on);
+	NRB_print(on);
 }
 
-void NRB_Refine(NurbanaObj_ptr nop, int U, int V) {
+void NRB_refine(NurbanaObj_ptr nop, int U, int V) {
 	int UV[] = {U, V};
 	nbNURBS *on;
 	on = reinterpret_cast<nbNURBS*>(nop);
 	nbKnot::addKnot(on, UV);
 }
 
-void NRB_KnotInsert(NurbanaObj_ptr nop,nbReal *X, int r, int UV) {
+void NRB_knotInsert(NurbanaObj_ptr nop,nbReal *X, int r, int UV) {
 	nbNURBS *on;
 	on = reinterpret_cast<nbNURBS*>(nop);
 	nbKnot::Refine(on, X, r, UV );
-	NRB_Print(on);
+	NRB_print(on);
 }
 
-void NRB_Blend(NurbanaObj_ptr in1, NurbanaObj_ptr in2, int edgeA, int edgeB, NurbanaObj_ptr out) {
+void NRB_blend(NurbanaObj_ptr in1, NurbanaObj_ptr in2, int edgeA, int edgeB, NurbanaObj_ptr out) {
 	nbNURBS *on1,*on2,*on3;
 	on1 = reinterpret_cast<nbNURBS*>(in1);
 	on2 = reinterpret_cast<nbNURBS*>(in2);
 	on3 = reinterpret_cast<nbNURBS*>(out);
 	
 	nbConstruct::blend(on1, on2, on3, edgeA, edgeB, 0);
-	NRB_Print(out);
+	NRB_print(out);
 }
 
 extern void NRB_split(NurbanaObj_ptr nop, nbReal x, int uv, nbReal4* dst, int dstLen, int* frstLen, int* scndLen, int* k, int* newPoints, int* inserted) {
 	nbNURBS *on;
 	on = reinterpret_cast<nbNURBS*>(nop);
-	bool cyclic = on->Cyclic(uv);
+	bool cyclic = on->getCyclic(uv);
 	int degree = on->getOrder(uv) - 1;
 	nbReal* knots = on->getKnotVector(uv);
 
@@ -260,7 +260,7 @@
 	nbNURBS *on2 = reinterpret_cast<nbNURBS*>(nop2);
 	nbNURBS *frst = NULL, *scnd = NULL;
 	nbReal4 *frstPatch, *scndPatch;
-	bool cyclic = on->Cyclic(uv);
+	bool cyclic = on->getCyclic(uv);
 	int newLen, lengthU, lengthV, uOffset1, curveLen, curveCount;
 	const int order = on->getOrder(uv);
 	const int degree = order - 1;
@@ -320,7 +320,7 @@
 		//maybe we should have two variables for one dimension: one allocated mem inbuffer, second for used
 		frst->Length(uv, frstLen);
 		toCopy = frst->Length(!uv) + frst->getOrder(!uv);
-		if (frst->Cyclic(!uv))
+		if (frst->getCyclic(!uv))
 			toCopy += frst->getOrder(!uv) - 1;
 		memcpy(scnd->getKnotVector(!uv), frst->getKnotVector(!uv), toCopy * sizeof(nbReal));
 		scnd->setCacheBuffer();
@@ -349,15 +349,15 @@
 	NRB_copyPatchFromBuffer(scndPatch, curveLen, newLength, curveCount, scnd, 0, 0);
 	MEM_freeN(tmpKnots);
 
-	NRB_Print(frst);
-	NRB_Print(scnd);
+	NRB_print(frst);
+	NRB_print(scnd);
 }
 
 /*extern int NRB_loadOpenNURBS(NurbanaObj_ptr nop, char* filename) {
 nbNURBS *on;
 on = reinterpret_cast<nbNURBS*>(nop);
 
-NRB_Print(on);
+NRB_print(on);
 std::cout << "LOADING....\n";
 ON_IO::read(filename,on);//"C:\\blender\\opennurbs\\example_files\\V4\\Curve.3dm",on);
 // 	ON_TextLog dump_to_stdout;
@@ -397,29 +397,29 @@
 // 	model.Destroy();
 // 	ON::CloseFile( archive_fp );
 // 	ON::End();
-NRB_Print(on);
+NRB_print(on);
 return 42;
 }
 */
 // Reduce the degree/order of the surface by Udec in U direction and Vdec in V direction

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list