* some small cleanup

diff --git a/uglcLight.pas b/uglcLight.pas
index 6a36b43..fd79ca5 100644 (file)
--- a/uglcLight.pas
+++ b/uglcLight.pas
@@ -21,7 +21,10 @@ type
   end;
   PglcMaterialRec = ^TglcMaterialRec;
 
   end;
   PglcMaterialRec = ^TglcMaterialRec;
 

-  TglcLightType = (ltGlobal, ltPoint, ltSpot);
+  TglcLightType = (
+    ltGlobal = 0,
+    ltPoint  = 1,
+    ltSpot   = 2);

   TglcLightRec = packed record
     Ambient: TgluVector4f;
     Diffuse: TgluVector4f;
   TglcLightRec = packed record
     Ambient: TgluVector4f;
     Diffuse: TgluVector4f;

diff --git a/uglcShader.pas b/uglcShader.pas
index 4235108..634d57f 100644 (file)
--- a/uglcShader.pas
+++ b/uglcShader.pas
@@ -99,9 +99,6 @@ type
     fProgramObj: GLHandle;
     fOnLog: TglcShaderLogEvent;
     fFilename: String;
     fProgramObj: GLHandle;
     fOnLog: TglcShaderLogEvent;
     fFilename: String;

-    fGeometryInputType: GLint;
-    fGeometryOutputType: GLint;
-    fGeometryVerticesOut: GLint;

 
     function GetUniformLocation(const aName: String; out aPos: glInt): Boolean;
     function GetInfoLog(Obj: GLHandle): String;
 
     function GetUniformLocation(const aName: String; out aPos: glInt): Boolean;
     function GetInfoLog(Obj: GLHandle): String;


@@ -117,9 +114,6 @@ type
     property Compiled:   Boolean            read GetCompiled;
     property Linked:     Boolean            read GetLinked;
     property OnLog:      TglcShaderLogEvent read fOnLog               write fOnLog;
     property Compiled:   Boolean            read GetCompiled;
     property Linked:     Boolean            read GetLinked;
     property OnLog:      TglcShaderLogEvent read fOnLog               write fOnLog;

-    property GeometryInputType:   GLint     read fGeometryInputType   write fGeometryInputType;
-    property GeometryOutputType:  GLint     read fGeometryOutputType  write fGeometryOutputType;
-    property GeometryVerticesOut: GLint     read fGeometryVerticesOut write fGeometryVerticesOut;

 
     procedure Compile;
     procedure Enable;
 
     procedure Compile;
     procedure Enable;


@@ -158,7 +152,7 @@ type
     procedure SaveToFile(const aFilename: String);
     procedure SaveToStream(const aStream: TStream);
 
     procedure SaveToFile(const aFilename: String);
     procedure SaveToStream(const aStream: TStream);
 

-    constructor Create(aLogEvent: TglcShaderLogEvent = nil);
+    constructor Create(const aLogEvent: TglcShaderLogEvent = nil);

     destructor Destroy; override;
   end;
 
     destructor Destroy; override;
   end;
 


@@ -960,7 +954,7 @@ end;
 //@LogEvent: Event zum loggen von Fehlern und Ereignissen;
 //@raise: EglcShader wenn OpenGL nicht initialisiert werden konnte;
 //@raise:
 //@LogEvent: Event zum loggen von Fehlern und Ereignissen;
 //@raise: EglcShader wenn OpenGL nicht initialisiert werden konnte;
 //@raise:

-constructor TglcShaderProgram.Create(aLogEvent: TglcShaderLogEvent);
+constructor TglcShaderProgram.Create(const aLogEvent: TglcShaderLogEvent);

 begin
   inherited Create;
   fOnLog      := aLogEvent;
 begin
   inherited Create;
   fOnLog      := aLogEvent;