Changeset 87

Timestamp:

06/16/10 00:31:21 (2 years ago)

Author:

Carsten

Message:

SceneGraph, LP64 bug fix:
Updated class cf::SceneGraph::BezierPatchNodeT to properly serialize its "unsigned long" members,
which are 4 bytes large with ILP32 and LLP64 data models and 8 bytes with the common LP64 data model.
Fixes #30.

Files:

• cafu/trunk/Libs/SceneGraph/BezierPatchNode.cpp (modified) (2 diffs)

cafu/trunk/Libs/SceneGraph/BezierPatchNode.cpp

@@ -105 +105 @@
     BezierPatchNodeT* BP=new BezierPatchNodeT(LMM);
 
-    InFile.read((char*)&BP->SizeX, sizeof(BP->SizeX));
-    InFile.read((char*)&BP->SizeY, sizeof(BP->SizeY));
-
-    InFile.read((char*)&BP->SubdivsHorz, sizeof(BP->SubdivsHorz));
-    InFile.read((char*)&BP->SubdivsVert, sizeof(BP->SubdivsVert));
- // InFile.read((char*)&BP->MaxError,    sizeof(BP->MaxError   ));
+    BP->SizeX=aux::ReadUInt32(InFile);
+    BP->SizeY=aux::ReadUInt32(InFile);
+
+    BP->SubdivsHorz=aux::ReadInt32(InFile);
+    BP->SubdivsVert=aux::ReadInt32(InFile);
+ // BP->MaxError   =aux::ReadFloat(InFile);
     assert(BP->MaxError==400.0f);
 
-    std::string MaterialName=Pool.ReadString(InFile);
+    const std::string MaterialName=Pool.ReadString(InFile);
     BP->Material=MaterialManager->GetMaterial(MaterialName);
  // BP->Material=MaterialManager->GetMaterial("wireframeTest");
@@ -192 +192 @@
     aux::Write(OutFile, "BP");
 
-    OutFile.write((char*)&SizeX, sizeof(SizeX));
-    OutFile.write((char*)&SizeY, sizeof(SizeY));
-
-    OutFile.write((char*)&SubdivsHorz, sizeof(SubdivsHorz));
-    OutFile.write((char*)&SubdivsVert, sizeof(SubdivsVert));
- // OutFile.write((char*)&MaxError,    sizeof(MaxError   ));
+    aux::Write(OutFile, aux::cnc32(SizeX));
+    aux::Write(OutFile, aux::cnc32(SizeY));
+
+    aux::Write(OutFile, SubdivsHorz);
+    aux::Write(OutFile, SubdivsVert);
+ // aux::Write(OutFile, MaxError);
     assert(MaxError==400.0f);