Merge pull request #46 from shineworld/master

added missing override statement in inherited virtual calsses methods, casts and decimal separator management

Source/GLS.BaseMeshSilhouette.pas

@@ -50,7 +50,7 @@ type
     // Builds the connectivity information.
     procedure RebuildEdgeList;
     procedure CreateSilhouette(const silhouetteParameters: TGLSilhouetteParameters; var aSilhouette: TGLSilhouette;
-	  AddToSilhouette: boolean);
+	  AddToSilhouette: boolean); override;
     constructor Create(APrecomputeFaceNormal: boolean); override;
     constructor CreateFromMesh(aBaseMesh: TGLBaseMesh);
     destructor Destroy; override;
@@ -60,6 +60,9 @@ type
 implementation
 //==============================================================================
 
+uses
+  GLS.PersistentClasses;
+
 // ------------------
 // ------------------ TGLFaceGroupConnectivity ------------------
 // ------------------

Source/GLS.Silhouette.pas

@@ -99,14 +99,14 @@ type
     FFaceNormal: TGLAffineVectorList;
     FVertexMemory: TGLIntegerList;
     FVertices: TGLAffineVectorList;
-    function GetEdgeCount: integer;
-    function GetFaceCount: integer;
+    function GetEdgeCount: integer; override;
+    function GetFaceCount: integer; override;
     function ReuseOrFindVertexID(const SeenFrom: TAffineVector; ASilhouette: TGLSilhouette; index: integer): integer;
   public
     // Clears out all connectivity information.
     procedure Clear; virtual;
     procedure CreateSilhouette(const silhouetteParameters: TGLSilhouetteParameters; var ASilhouette: TGLSilhouette;
-      AddToSilhouette: Boolean);
+      AddToSilhouette: Boolean); override;
     function AddIndexedEdge(vertexIndex0, vertexIndex1: integer; FaceID: integer): integer;
     function AddIndexedFace(Vi0, Vi1, vi2: integer): integer;
     function AddFace(const vertex0, vertex1, vertex2: TAffineVector): integer; inline;

Source/GLS.VectorFileObjects.pas

@@ -6917,7 +6917,7 @@ procedure TGLActorAnimations.SaveToStream(aStream: TStream);
 var
   i: Integer;
 begin
-  WriteCRLFString(aStream, cAAFHeader);
+  WriteCRLFString(aStream, string(cAAFHeader));
   WriteCRLFString(aStream, IntToStr(Count));
   for i := 0 to Count - 1 do
     WriteCRLFString(aStream, Items[i].AsString);
@@ -6928,7 +6928,7 @@ var
   i, n: Integer;
 begin
   Clear;
-  if ReadCRLFString(aStream) <> cAAFHeader then
+  if ReadCRLFString(aStream) <> string(cAAFHeader) then
     Assert(False);
   n := StrToInt(ReadCRLFString(aStream));
   for i := 0 to n - 1 do
@@ -6951,8 +6951,8 @@ procedure TGLActorAnimations.LoadFromFile(const fileName: string);
 var
   fs: TStream;
 begin
+  fs := TFileStream.Create(fileName, fmOpenRead + fmShareDenyWrite);
   try
-    fs := TFileStream.Create(fileName, fmOpenRead + fmShareDenyWrite);
   finally
     fs.Free;
   end;

Src/Stage.Utils.pas

@@ -221,7 +221,7 @@ var
   DSeparator: Char;
   fs: TFormatSettings;
 begin
-  DSeparator := fs.DecimalSeparator;                                                                                                   fs.DecimalSeparator := ',';
+  DSeparator := fs.DecimalSeparator;
   try
     fs.DecimalSeparator := ',';
     if not TryStrToFloat(S, Result, fs) then