Browse Source

demo: webgl: fixed compile

mattias 6 years ago
parent
commit
e922c46cea
2 changed files with 2 additions and 9 deletions
  1. 1 8
      demo/webgl/Pas2JS_WebGL_Terrain.pas
  2. 1 1
      demo/webgl/Terrain.pas

+ 1 - 8
demo/webgl/Pas2JS_WebGL_Terrain.pas

@@ -51,7 +51,6 @@ var
 	startIndex, endIndex: integer;
 	startIndex, endIndex: integer;
 	i: integer;
 	i: integer;
 	map: TTilingTerrain;
 	map: TTilingTerrain;
-	neighbor: TTilingTerrain = nil;
 begin
 begin
 	gl.clear(gl.COLOR_BUFFER_BIT + gl.DEPTH_BUFFER_BIT);
 	gl.clear(gl.COLOR_BUFFER_BIT + gl.DEPTH_BUFFER_BIT);
 
 
@@ -126,7 +125,7 @@ begin
 	gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_T, gl.CLAMP_TO_EDGE);
 	gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_T, gl.CLAMP_TO_EDGE);
 	gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.LINEAR);
 	gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.LINEAR);
 	gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.LINEAR);
 	gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.LINEAR);
-	gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, gl.RGBA, gl.UNSIGNED_BYTE, TJSTexImageSource(event.target));
+	gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, gl.RGBA, gl.UNSIGNED_BYTE, TexImageSource(event.target));
 
 
 	textureLoaded := true;
 	textureLoaded := true;
 	result := true;
 	result := true;
@@ -134,15 +133,9 @@ end;
 
 
 var
 var
   canvas: TJSHTMLCanvasElement;
   canvas: TJSHTMLCanvasElement;
-  i: integer;
-  stride: integer;
-  offset: integer;
   vertexShaderSource: string;
   vertexShaderSource: string;
   fragmentShaderSource: string;
   fragmentShaderSource: string;
-  buffer: TJSWebGLBuffer;
-  element: TJSElement;
   img: TJSHTMLElement;
   img: TJSHTMLElement;
-  texture: TJSWebGLTexture;
 begin
 begin
 
 
 	// add debug status
 	// add debug status

+ 1 - 1
demo/webgl/Terrain.pas

@@ -1,7 +1,7 @@
 unit Terrain;
 unit Terrain;
 interface
 interface
 uses
 uses
-	Noise, Matrix, MemoryBuffer,
+	Noise, Matrix,
 	GLTypes, GLUtils,
 	GLTypes, GLUtils,
 	WebGL, JS,
 	WebGL, JS,
 	Math;
 	Math;