Commit 9adc3e8e authored by Jan Möbius's avatar Jan Möbius
Browse files

Removed old and unused static Point and Volume Type ids

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@6311 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 8be2d792
......@@ -53,7 +53,7 @@
/** This field defines the start id for custom datatypes. It starts high to avoid conflicts with previously
* hardcoded versions.
*/
static int nextTypeId_ = 2048;
static int nextTypeId_ = 128;
/// Variable used to automatically initialize the maps
static bool initialized_ = false;
......@@ -104,10 +104,6 @@ void initialize() {
typeToTypeInfo[DATA_GROUP] = types.size();
types.push_back( TypeInfo(DATA_GROUP ,"Group" ,"Unknown.png") );
stringToTypeInfo["Points"] = types.size();
typeToTypeInfo[DATA_POINTS] = types.size();
types.push_back( TypeInfo(DATA_POINTS ,"Points" ,"Unknown.png") );
stringToTypeInfo["TriangleMesh"] = types.size();
typeToTypeInfo[DATA_TRIANGLE_MESH_CONST_ID] = types.size();
types.push_back( TypeInfo(DATA_TRIANGLE_MESH_CONST_ID ,"TriangleMesh" ,"TriangleType.png") );
......@@ -120,10 +116,6 @@ void initialize() {
typeToTypeInfo[DATA_BSPLINE_CURVE] = types.size();
types.push_back( TypeInfo(DATA_BSPLINE_CURVE ,"BSplineCurve" ,"BSplineCurveType.png") );
stringToTypeInfo["Volume"] = types.size();
typeToTypeInfo[DATA_VOLUME] = types.size();
types.push_back( TypeInfo(DATA_VOLUME ,"Volume" ,"Unknown.png") );
stringToTypeInfo["BSplineSurface"] = types.size();
typeToTypeInfo[DATA_BSPLINE_SURFACE] = types.size();
types.push_back( TypeInfo(DATA_BSPLINE_SURFACE ,"BSplineSurface" ,"Unknown.png") );
......@@ -142,11 +134,9 @@ void initialize() {
typeToString[DATA_NONE] = "Unknown";
typeToString[DATA_GROUP] = "Group";
typeToString[DATA_POINTS] = "Points";
typeToString[DATA_TRIANGLE_MESH_CONST_ID] = "TriangleMesh";
typeToString[DATA_POLY_MESH_CONST_ID] = "PolyMesh";
typeToString[DATA_BSPLINE_CURVE] = "BSplineCurve";
typeToString[DATA_VOLUME] = "Volume";
typeToString[DATA_BSPLINE_SURFACE] = "BSplineSurface";
typeToString[DATA_SKELETON] = "Skeleton";
typeToString[DATA_GIS] = "GIS";
......
......@@ -66,34 +66,25 @@
/// Items used for Grouping
#define DATA_GROUP 1
/// Point based objects
#define DATA_POINTS 2
/// Triangle Mesh objects
#define DATA_TRIANGLE_MESH typeId("TriangleMesh")
//#define DATA_TRIANGLE_MESH 4
#define DATA_TRIANGLE_MESH_CONST_ID 4
#define DATA_TRIANGLE_MESH_CONST_ID 2
/// Poly Mesh Objects
#define DATA_POLY_MESH typeId("PolyMesh")
//#define DATA_POLY_MESH 8
#define DATA_POLY_MESH_CONST_ID 8
#define DATA_POLY_MESH_CONST_ID 4
/// BSpline objects
const unsigned int DATA_BSPLINE_CURVE = 16;
/// Volumetric objects
const unsigned int DATA_VOLUME = 32;
const unsigned int DATA_BSPLINE_CURVE = 8;
/// BSpline Surface objects
const unsigned int DATA_BSPLINE_SURFACE = 64;
const unsigned int DATA_BSPLINE_SURFACE = 16;
/// Skeletons
const unsigned int DATA_SKELETON = 128;
const unsigned int DATA_SKELETON = 32;
/// Gis Data
const unsigned int DATA_GIS = 256;
const unsigned int DATA_GIS = 64;
/// Identifier for all available objects
const unsigned int DATA_ALL = UINT_MAX;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment