Bergmann89 11 лет назад
Родитель
Сommit
d3ba3cb916
2 измененных файлов: 6 добавлений и 9 удалений
  1. +4
    -1
      uglcLight.pas
  2. +2
    -8
      uglcShader.pas

+ 4
- 1
uglcLight.pas Просмотреть файл

@@ -21,7 +21,10 @@ type
end; end;
PglcMaterialRec = ^TglcMaterialRec; PglcMaterialRec = ^TglcMaterialRec;


TglcLightType = (ltGlobal, ltPoint, ltSpot);
TglcLightType = (
ltGlobal = 0,
ltPoint = 1,
ltSpot = 2);
TglcLightRec = packed record TglcLightRec = packed record
Ambient: TgluVector4f; Ambient: TgluVector4f;
Diffuse: TgluVector4f; Diffuse: TgluVector4f;


+ 2
- 8
uglcShader.pas Просмотреть файл

@@ -99,9 +99,6 @@ type
fProgramObj: GLHandle; fProgramObj: GLHandle;
fOnLog: TglcShaderLogEvent; fOnLog: TglcShaderLogEvent;
fFilename: String; fFilename: String;
fGeometryInputType: GLint;
fGeometryOutputType: GLint;
fGeometryVerticesOut: GLint;


function GetUniformLocation(const aName: String; out aPos: glInt): Boolean; function GetUniformLocation(const aName: String; out aPos: glInt): Boolean;
function GetInfoLog(Obj: GLHandle): String; function GetInfoLog(Obj: GLHandle): String;
@@ -117,9 +114,6 @@ type
property Compiled: Boolean read GetCompiled; property Compiled: Boolean read GetCompiled;
property Linked: Boolean read GetLinked; property Linked: Boolean read GetLinked;
property OnLog: TglcShaderLogEvent read fOnLog write fOnLog; 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 Compile;
procedure Enable; procedure Enable;
@@ -158,7 +152,7 @@ type
procedure SaveToFile(const aFilename: String); procedure SaveToFile(const aFilename: String);
procedure SaveToStream(const aStream: TStream); procedure SaveToStream(const aStream: TStream);


constructor Create(aLogEvent: TglcShaderLogEvent = nil);
constructor Create(const aLogEvent: TglcShaderLogEvent = nil);
destructor Destroy; override; destructor Destroy; override;
end; end;


@@ -960,7 +954,7 @@ end;
//@LogEvent: Event zum loggen von Fehlern und Ereignissen; //@LogEvent: Event zum loggen von Fehlern und Ereignissen;
//@raise: EglcShader wenn OpenGL nicht initialisiert werden konnte; //@raise: EglcShader wenn OpenGL nicht initialisiert werden konnte;
//@raise: //@raise:
constructor TglcShaderProgram.Create(aLogEvent: TglcShaderLogEvent);
constructor TglcShaderProgram.Create(const aLogEvent: TglcShaderLogEvent);
begin begin
inherited Create; inherited Create;
fOnLog := aLogEvent; fOnLog := aLogEvent;


Загрузка…
Отмена
Сохранить