[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22312] branches/nurbs25/intern/nurbana: Filename and naming convention cleanup.
Emmanuel Stone
emmanuel.stone at gmail.com
Sun Aug 9 08:39:02 CEST 2009
Revision: 22312
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22312
Author: eman
Date: 2009-08-09 08:39:01 +0200 (Sun, 09 Aug 2009)
Log Message:
-----------
Filename and naming convention cleanup.
Using 'nb' prefix for nurbana's c++ interfaces now (should be familiar to anyone that's looked at bullet)
No functionality changes (I hope).
Modified Paths:
--------------
branches/nurbs25/intern/nurbana/extern/nurbana.h
branches/nurbs25/intern/nurbana/intern/ON_IO.h
branches/nurbs25/intern/nurbana/intern/libNurbana.cpp
branches/nurbs25/intern/nurbana/intern/nbGridTessellator.cpp
branches/nurbs25/intern/nurbana/intern/nbGridTessellator.h
branches/nurbs25/intern/nurbana/intern/nbTessellator.cpp
branches/nurbs25/intern/nurbana/intern/nbTessellator.h
branches/nurbs25/intern/nurbana/intern/nbTrimTessellator.cpp
branches/nurbs25/intern/nurbana/intern/nbTrimTessellator.h
Added Paths:
-----------
branches/nurbs25/intern/nurbana/intern/nbConstruct.cpp
branches/nurbs25/intern/nurbana/intern/nbConstruct.h
branches/nurbs25/intern/nurbana/intern/nbDegree.cpp
branches/nurbs25/intern/nurbana/intern/nbDegree.h
branches/nurbs25/intern/nurbana/intern/nbFitting.cpp
branches/nurbs25/intern/nurbana/intern/nbFitting.h
branches/nurbs25/intern/nurbana/intern/nbGenerate.cpp
branches/nurbs25/intern/nurbana/intern/nbGenerate.h
branches/nurbs25/intern/nurbana/intern/nbKnot.cpp
branches/nurbs25/intern/nurbana/intern/nbKnot.h
branches/nurbs25/intern/nurbana/intern/nbMath.cpp
branches/nurbs25/intern/nurbana/intern/nbMath.h
branches/nurbs25/intern/nurbana/intern/nbNURBS.cpp
branches/nurbs25/intern/nurbana/intern/nbNURBS.h
branches/nurbs25/intern/nurbana/intern/nbNormals.cpp
branches/nurbs25/intern/nurbana/intern/nbNormals.h
branches/nurbs25/intern/nurbana/intern/nbPrimitives.cpp
branches/nurbs25/intern/nurbana/intern/nbPrimitives.h
branches/nurbs25/intern/nurbana/intern/nbUtils.h
branches/nurbs25/intern/nurbana/intern/nbVertexOps.cpp
branches/nurbs25/intern/nurbana/intern/nbVertexOps.h
Removed Paths:
-------------
branches/nurbs25/intern/nurbana/intern/NURBS.h
branches/nurbs25/intern/nurbana/intern/NURBS_Construct.cpp
branches/nurbs25/intern/nurbana/intern/NURBS_Construct.h
branches/nurbs25/intern/nurbana/intern/NURBS_Degree.cpp
branches/nurbs25/intern/nurbana/intern/NURBS_Degree.h
branches/nurbs25/intern/nurbana/intern/NURBS_Fitting.cpp
branches/nurbs25/intern/nurbana/intern/NURBS_Fitting.h
branches/nurbs25/intern/nurbana/intern/NURBS_Generate.cpp
branches/nurbs25/intern/nurbana/intern/NURBS_Generate.h
branches/nurbs25/intern/nurbana/intern/NURBS_Knot.cpp
branches/nurbs25/intern/nurbana/intern/NURBS_Knot.h
branches/nurbs25/intern/nurbana/intern/NURBS_Utils.h
branches/nurbs25/intern/nurbana/intern/NurbanaMath.cpp
branches/nurbs25/intern/nurbana/intern/NurbanaMath.h
branches/nurbs25/intern/nurbana/intern/Object_Base.cpp
branches/nurbs25/intern/nurbana/intern/Object_Base.h
branches/nurbs25/intern/nurbana/intern/Object_NURBS.cpp
branches/nurbs25/intern/nurbana/intern/Object_NURBS.h
branches/nurbs25/intern/nurbana/intern/Object_Normals.cpp
branches/nurbs25/intern/nurbana/intern/Object_Normals.h
branches/nurbs25/intern/nurbana/intern/Object_Primitives.cpp
branches/nurbs25/intern/nurbana/intern/Object_Primitives.h
branches/nurbs25/intern/nurbana/intern/VertexOps.cpp
branches/nurbs25/intern/nurbana/intern/VertexOps.h
Modified: branches/nurbs25/intern/nurbana/extern/nurbana.h
===================================================================
--- branches/nurbs25/intern/nurbana/extern/nurbana.h 2009-08-09 01:30:32 UTC (rev 22311)
+++ branches/nurbs25/intern/nurbana/extern/nurbana.h 2009-08-09 06:39:01 UTC (rev 22312)
@@ -54,36 +54,6 @@
}nbReal4;
-/*typedef struct Point3d {
- nbReal x;
- nbReal y;
- nbReal z;
- nbReal H;
-
- // This extra data should make Point4d 'struct'rally equivalent to BPoint from Blender::DNA_Data_Types.h
- nbReal alfa, weight; // alfa: tilt in 3D View, weight: used for softbody goal weight
- short f1, hide;
- nbReal radius, pad; // user-set radius per point for bevelling etc
-}Point3d;
-*/
-//typedef Point3d nbReal3;
-
-typedef struct Nurb_Extern {
- int numCPu;
- int numCPv;
- int resolu;
- int resolv;
- short cyclicU;
- short cyclicV;
- short orderU;
- short orderV;
- int numKnotsU;
- int numKnotsV;
- nbReal *KnotU;
- nbReal *KnotV;
- struct ControlPoint *CP;
-} Nurb_Extern;
-
typedef struct ControlPoint {
nbReal x;
nbReal y;
@@ -95,9 +65,6 @@
float radius, pad; /* user-set radius per point for bevelling etc */
} ControlPoint;
-
-typedef Nurb_Extern* Nurb_ExternPtr;
-
// forward declare as void
//typedef void Point3d;
//typedef void* Point3d_ptr;
@@ -106,219 +73,10 @@
typedef void* BlenderNurbs_ptr;
typedef void* NurbanaObj_ptr; // to hide pointer to C++ object in C space
-//extern NurbanaObj_ptr NRB_addObject(Point3d** CtlPts, short* numCPu, short* numCPv, short* orderU, short* orderV, nbReal** knotsU, nbReal** knotsV, short* cyclicU, short* cyclicV, short* knottypeu, short* knottypev, short* resolu, short* resolv, short* isores, short* isoden, short* isovis) ;
extern NurbanaObj_ptr NRB_addObject(BlenderNurbs_ptr bNurbs);
-//extern NurbanaObj_ptr NRB_allocate();
-//extern void NRB_deallocate(NurbanaObj_ptr nop);
-extern void NRB_init(NurbanaObj_ptr nop);
-extern NurbanaObj_ptr NRB_reallocate(BlenderNurbs_ptr bNurbs);
-
-extern NurbanaObj_ptr NRB_CreatePrimitive(NurbanaObj_ptr nop, unsigned char type);
-extern void NRB_removeObject(NurbanaObj_ptr nop);
-
-extern void NRB_changeCyclic(NurbanaObj_ptr nop,int uv);
-
-extern void NRB_getTriangleNormals(float v0[], float v1[], float v2[], float n0[], float n1[], float n2[]);
-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_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_copyPatchFromBuffer(nbReal4 *buffer, int curveLength, int nextCurve, int curveCount, NurbanaObj_ptr nurb, int uOffset, int vOffset);
-extern void NRB_reallocCtlPts(int U, int V, int shiftU, int shiftV, NurbanaObj_ptr nurb);
-
-extern void NRB_ConvertToPrimitive(NurbanaObj_ptr nop,unsigned char 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);
-extern int NRB_getNumKnots(int uv,NurbanaObj_ptr nurb);
-extern nbReal NRB_getLastKnotValue(NurbanaObj_ptr nurb,int uv);
-extern nbReal NRB_getFirstKnotValue(NurbanaObj_ptr nurb,int uv);
-
-extern void NRB_resetIsoLines(NurbanaObj_ptr nurb);
-extern int NRB_getNumIsoPoints(NurbanaObj_ptr nop);
-extern int NRB_getIsoResolution(NurbanaObj_ptr nop);
-extern int NRB_getIsoDensity(NurbanaObj_ptr nop);
-extern void NRB_setIsoResolution(NurbanaObj_ptr nop,int res);
-extern void NRB_setIsoDensity(NurbanaObj_ptr nop,int den);
-extern nbReal* NRB_getIsoPoints(NurbanaObj_ptr nop, nbReal* buffer);
-
-
-extern int NRB_getTrianIndexCount(NurbanaObj_ptr nop);
-extern int NRB_getQuadIndexCount(NurbanaObj_ptr nop);
-extern void NRB_getTrianIndexes(NurbanaObj_ptr nop, int* indexes);
-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_GenerateCurve(NurbanaObj_ptr nop, nbReal* buffer, nbReal* tiltBuffer, nbReal* radiusBuffer, int res);
-extern nbReal* NRB_GenerateCurveOnSurface(NurbanaObj_ptr nop, nbReal* buffer, int res, float 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_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_splitBuffer(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_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_Echo();
-
-#define NURBANA_PRIMITIVE_CURVE 0
-#define NURBANA_PRIMITIVE_SURFACE 1
-#define NURBANA_PRIMITIVE_CIRCLE 2
-#define NURBANA_PRIMITIVE_TUBE 3
-#define NURBANA_PRIMITIVE_TORUS 4
-#define NURBANA_PRIMITIVE_SPHERE 5
-#ifdef __cplusplus
-}
-#endif
-
-#endif // NAN_INCLUDED_nurbana_h
-/*
-* $Id$
-*
-* ***** BEGIN GPL LICENSE BLOCK *****
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License
-* as published by the Free Software Foundation; either version 2
-* of the License, or (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software Foundation,
-* Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-*
-* The Original Code is Copyright (C) 2005 by Emmanuel Stone
-* All rights reserved.
-*
-* The Original Code is: all of this file.
-*
-* Contributor(s): none yet.
-*
-* ***** END GPL LICENSE BLOCK *****
-*/
-
-#ifndef NAN_INCLUDED_nurbana_h
-#define NAN_INCLUDED_nurbana_h
-
-#include "../intern/blenderNurbsStruct.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern void nurbs_test();
-
-typedef float nbReal;
-
-typedef struct nbReal3 {
- nbReal x;
- nbReal y;
- nbReal z;
-
-}nbReal3;
-typedef struct nbReal4 {
- nbReal x;
- nbReal y;
- nbReal z;
- nbReal a;
-}nbReal4;
-
-
-/*typedef struct Point3d {
- nbReal x;
- nbReal y;
- nbReal z;
- nbReal H;
-
- // This extra data should make Point4d 'struct'rally equivalent to BPoint from Blender::DNA_Data_Types.h
- nbReal alfa, weight; // alfa: tilt in 3D View, weight: used for softbody goal weight
- short f1, hide;
- nbReal radius, pad; // user-set radius per point for bevelling etc
-}Point3d;
-*/
-//typedef Point3d nbReal3;
-
-typedef struct Nurb_Extern {
- int numCPu;
- int numCPv;
- int resolu;
- int resolv;
- short cyclicU;
- short cyclicV;
- short orderU;
- short orderV;
- int numKnotsU;
- int numKnotsV;
- nbReal *KnotU;
- nbReal *KnotV;
- struct ControlPoint *CP;
-} Nurb_Extern;
-
-typedef struct ControlPoint {
- nbReal x;
- nbReal y;
- nbReal z;
- nbReal H;
- // This extra data makes nurbana struct compatible with blender
- float alfa, weight; /* alfa: tilt in 3D View, weight: used for softbody goal weight */
- short f1, hide;
- float radius, pad; /* user-set radius per point for bevelling etc */
-} ControlPoint;
-
-
-typedef Nurb_Extern* Nurb_ExternPtr;
-
-// 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(Point3d** CtlPts, short* numCPu, short* numCPv, short* orderU, short* orderV, nbReal** knotsU, nbReal** knotsV, short* cyclicU, short* cyclicV, short* knottypeu, short* knottypev, short* resolu, short* resolv, short* isores, short* isoden, short* isovis) ;
-extern NurbanaObj_ptr NRB_addObject(BlenderNurbs_ptr bNurbs);
-
-
-//extern NurbanaObj_ptr NRB_allocate();
-//extern void NRB_deallocate(NurbanaObj_ptr nop);
extern void NRB_init(NurbanaObj_ptr nop);
extern NurbanaObj_ptr NRB_reallocate(BlenderNurbs_ptr bNurbs);
@@ -345,10 +103,10 @@
extern void NRB_RecalculateKnots(NurbanaObj_ptr nop,int uv,int type);
-extern Nurb_ExternPtr NRB_getNurbData(NurbanaObj_ptr nop);
+//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 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);
@@ -411,4 +169,4 @@
}
#endif
-#endif // NAN_INCLUDED_nurbana_h
+#endif // NAN_INCLUDED_nurbana_h
\ No newline at end of file
Deleted: branches/nurbs25/intern/nurbana/intern/NURBS.h
===================================================================
--- branches/nurbs25/intern/nurbana/intern/NURBS.h 2009-08-09 01:30:32 UTC (rev 22311)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list