[SCM] Lisaac library opengl-binding branch, master, updated. ef0acf44bcc5aa85ca90fb6cdbfd6210eefe34a5
Damien Bouvarel
dams.bouvarel at wanadoo.fr
Thu Aug 27 10:18:31 UTC 2009
The following commit has been merged in the master branch:
commit ef0acf44bcc5aa85ca90fb6cdbfd6210eefe34a5
Author: Damien Bouvarel <dams.bouvarel at wanadoo.fr>
Date: Thu Aug 27 12:18:17 2009 +0200
0.14 update
diff --git a/3D/particles/particle_system.li b/3D/particles/particle_system.li
index 4448dd3..f6f5760 100644
--- a/3D/particles/particle_system.li
+++ b/3D/particles/particle_system.li
@@ -226,7 +226,7 @@ Section Public
(
0.to 4 do { i:INTEGER;
palette.item i.make (i.to_real/4.0, 0, 0);
- palette.item (i+4).make (1, i.to_real/4.0, 0);
+ palette.item (i+4).make (1.0, (i.to_real)/4.0, 0);
palette.item (i+8).make ((3-i).to_real/3.0, (3-i).to_real/3.0, 1);
};
);
diff --git a/abstract_renderer/color_buffer.li b/abstract_renderer/color_buffer.li
index 923747b..6f1b55c 100644
--- a/abstract_renderer/color_buffer.li
+++ b/abstract_renderer/color_buffer.li
@@ -59,16 +59,16 @@ Section Public
// FrameBuffer transfert functions
//
- - read (x,y:INTEGER) size (w,h:INTEGER) type t:INTEGER in buf:FAST_ARRAY[UINTEGER_8] <- deferred;
+ - read (x,y:INTEGER) size (w,h:INTEGER) type t:INTEGER in buf:FAST_ARRAY(UINTEGER_8) <- deferred;
- - read_rgb (x,y:INTEGER) size (w,h:INTEGER) in buf:FAST_ARRAY[UINTEGER_8] <- deferred;
- - read_rgba (x,y:INTEGER) size (w,h:INTEGER) in buf:FAST_ARRAY[UINTEGER_8] <- deferred;
+ - read_rgb (x,y:INTEGER) size (w,h:INTEGER) in buf:FAST_ARRAY(UINTEGER_8) <- deferred;
+ - read_rgba (x,y:INTEGER) size (w,h:INTEGER) in buf:FAST_ARRAY(UINTEGER_8) <- deferred;
- - draw_pixels pixels:FAST_ARRAY[UINTEGER_8] size (w,h:INTEGER) type t:INTEGER <- deferred;
+ - draw_pixels pixels:FAST_ARRAY(UINTEGER_8) size (w,h:INTEGER) type t:INTEGER <- deferred;
- - draw_rgb_pixels pixels:FAST_ARRAY[UINTEGER_8] size (w,h:INTEGER) <- deferred;
- - draw_rgba_pixels pixels:FAST_ARRAY[UINTEGER_8] size (w,h:INTEGER) <- deferred;
+ - draw_rgb_pixels pixels:FAST_ARRAY(UINTEGER_8) size (w,h:INTEGER) <- deferred;
+ - draw_rgba_pixels pixels:FAST_ARRAY(UINTEGER_8) size (w,h:INTEGER) <- deferred;
- copy (x,y:INTEGER) size (w,h:INTEGER) type t:INTEGER <- deferred;
diff --git a/abstract_renderer/display_list.li b/abstract_renderer/display_list.li
index 5e78a3c..9c1b1f6 100644
--- a/abstract_renderer/display_list.li
+++ b/abstract_renderer/display_list.li
@@ -31,7 +31,7 @@ Section Inherit
Section Public
- - create body:BLOCK :SELF <- deferred;
+ - create body:{} :SELF <- deferred;
- call <- deferred;
diff --git a/abstract_renderer/font.li b/abstract_renderer/font.li
index 2ab10ce..a829d16 100644
--- a/abstract_renderer/font.li
+++ b/abstract_renderer/font.li
@@ -55,7 +55,7 @@ Section Public
- enable <- deferred;
- disable <- deferred;
- - print_zone body:BLOCK <-
+ - print_zone body:{} <-
(
enable;
body.value;
diff --git a/abstract_renderer/index_buffer.li b/abstract_renderer/index_buffer.li
index c88878e..00dde85 100644
--- a/abstract_renderer/index_buffer.li
+++ b/abstract_renderer/index_buffer.li
@@ -47,7 +47,7 @@ Section Public
- begin_index <- deferred;
- end <- deferred;
- - new_indices body:BLOCK <-
+ - new_indices body:{} <-
(
begin_indices;
body.value;
diff --git a/abstract_renderer/quadrics.li b/abstract_renderer/quadrics.li
index c5d7f65..c04d7f6 100644
--- a/abstract_renderer/quadrics.li
+++ b/abstract_renderer/quadrics.li
@@ -38,7 +38,7 @@ Section Public
- begin_quadric <- deferred;
- end_quadric <- deferred;
- - new_quadric body:BLOCK <-
+ - new_quadric body:{} <-
(
begin_quadric;
body.value;
diff --git a/abstract_renderer/texture.li b/abstract_renderer/texture.li
index f715f5a..ebe718d 100644
--- a/abstract_renderer/texture.li
+++ b/abstract_renderer/texture.li
@@ -109,7 +109,7 @@ Section Public
- set_image image:IMAGE <-
(
parent_image := image;
- );
+ );
- draw (x,y:INTEGER) <- deferred;
@@ -117,4 +117,8 @@ Section Public
- set_filter f:INTEGER <- filter := f;
- set_drawing_mode f:INTEGER <- drawing_mode := f;
- - set_wrapping_mode f:INTEGER <- wrapping_mode := f;
\ No newline at end of file
+
+ - set_wrapping_mode f:INTEGER :INTEGER <- (wrapping_mode := f);
+
+
+
\ No newline at end of file
diff --git a/abstract_renderer/transform.li b/abstract_renderer/transform.li
index 2d2000a..656a58f 100644
--- a/abstract_renderer/transform.li
+++ b/abstract_renderer/transform.li
@@ -35,7 +35,7 @@ Section Public
- push_matrix <- deferred;
- pop_matrix <- deferred;
- - new_matrix body:BLOCK <-
+ - new_matrix body:{} <-
(
push_matrix;
body.value;
@@ -64,7 +64,7 @@ Section Public
//
- set_projection_mode <- deferred;
- - new_projection body:BLOCK <-
+ - new_projection body:{} <-
(
set_projection_mode;
body.value;
@@ -90,10 +90,10 @@ Section Public
//
// Tranformation utility
//
-
+
- begin_ortho (w,h:INTEGER) <- deferred;
- end_ortho <- deferred;
- - ortho_mode (w,h:INTEGER) do body:BLOCK <-
+ - ortho_mode (w,h:INTEGER) do body:{} <-
(
begin_ortho (w,h);
body.value;
diff --git a/abstract_renderer/vertex_buffer.li b/abstract_renderer/vertex_buffer.li
index b01fc08..49c1a76 100644
--- a/abstract_renderer/vertex_buffer.li
+++ b/abstract_renderer/vertex_buffer.li
@@ -77,70 +77,70 @@ Section Public
- end <- deferred;
- - new_points body:BLOCK <-
+ - new_points body:{} <-
(
begin_points;
body.value;
end;
);
- - new_lines body:BLOCK <-
+ - new_lines body:{} <-
(
begin_lines;
body.value;
end;
);
- - new_polygon body:BLOCK <-
+ - new_polygon body:{} <-
(
begin_polygon;
body.value;
end;
);
- - new_triangles body:BLOCK <-
+ - new_triangles body:{} <-
(
begin_triangles;
body.value;
end;
);
- - new_quads body:BLOCK <-
+ - new_quads body:{} <-
(
begin_quads;
body.value;
end;
);
- - new_line_strip body:BLOCK <-
+ - new_line_strip body:{} <-
(
begin_line_strip;
body.value;
end;
);
- - new_line_loop body:BLOCK <-
+ - new_line_loop body:{} <-
(
begin_line_loop;
body.value;
end;
);
- - new_triangle_strip body:BLOCK <-
+ - new_triangle_strip body:{} <-
(
begin_triangle_strip;
body.value;
end;
);
- - new_triangle_fan body:BLOCK <-
+ - new_triangle_fan body:{} <-
(
begin_triangle_fan;
body.value;
end;
);
- - new_quad_strip body:BLOCK <-
+ - new_quad_strip body:{} <-
(
begin_quad_strip;
body.value;
@@ -172,4 +172,4 @@ Section Public
- get_vertex_data:FAST_ARRAY(REAL_32) <- deferred;
- get_texels_data:FAST_ARRAY(REAL_32) <- deferred;
- get_normals_data:FAST_ARRAY(REAL_32) <- deferred;
- - get_colors_data:FAST_ARRAY(REAL_32) <- deferred;
\ No newline at end of file
+ - get_colors_data:FAST_ARRAY(REAL_32) <- deferred;
diff --git a/framework/unix/framework_event.li b/framework/unix/framework_event.li
index 03f1ff9..6663d7d 100644
--- a/framework/unix/framework_event.li
+++ b/framework/unix/framework_event.li
@@ -41,10 +41,10 @@ Section Public
(
);
- - keys:FAST_ARRAY[BOOLEAN] :=
- ( + result:FAST_ARRAY[BOOLEAN];
+ - keys:FAST_ARRAY(BOOLEAN) :=
+ ( + result:FAST_ARRAY(BOOLEAN);
- result := FAST_ARRAY[BOOLEAN].create 256;
+ result := FAST_ARRAY(BOOLEAN).create 256;
result.set_all_with FALSE;
result
);
diff --git a/framework/unix/gl_font.li b/framework/unix/gl_font.li
index 6adab6a..ec88184 100644
--- a/framework/unix/gl_font.li
+++ b/framework/unix/gl_font.li
@@ -40,7 +40,7 @@ Section Public
- load <-
(
- + fontname:NATIVE_ARRAY[CHARACTER];
+ + fontname:NATIVE_ARRAY(CHARACTER);
+ b:UINTEGER_32;
+ n:INTEGER;
diff --git a/framework/unix/keycode.li b/framework/unix/keycode.li
index e2ca2dd..2b683bf 100644
--- a/framework/unix/keycode.li
+++ b/framework/unix/keycode.li
@@ -32,7 +32,7 @@ Section Public
- make <-
(
- keys := HASHED_DICTIONARY[INTEGER,INTEGER].create;
+ keys := HASHED_DICTIONARY(INTEGER,INTEGER).create;
keys.add k_backspace to (`XK_BackSpace`:INTEGER);
keys.add k_tab to (`XK_Tab`:INTEGER);
diff --git a/images/bmp.li b/images/bmp.li
index faaabf6..8be52c9 100644
--- a/images/bmp.li
+++ b/images/bmp.li
@@ -41,11 +41,11 @@ Section Public
- load image:IMAGE :BOOLEAN <-
(
+ result:BOOLEAN;
- + bmp_buffer:FAST_ARRAY[UINTEGER_8];
+ + bmp_buffer:FAST_ARRAY(UINTEGER_8);
+ header:BMP_HEADER;
+ columns,rows,stride:UINTEGER_32;
- + image_data:FAST_ARRAY[UINTEGER_8];
+ + image_data:FAST_ARRAY(UINTEGER_8);
+ base,k:INTEGER;
+ e:ENTRY;
@@ -56,11 +56,11 @@ Section Public
file ?= e;
file.open;
- bmp_buffer := FAST_ARRAY[UINTEGER_8].create_with_capacity (file.size+1);
+ bmp_buffer := FAST_ARRAY(UINTEGER_8).create_with_capacity (file.size+1);
(file.read bmp_buffer size (file.size) > 0).if {
- header := CONVERT[NATIVE_ARRAY[UINTEGER_8],BMP_HEADER].on (bmp_buffer.storage);
+ header := CONVERT(NATIVE_ARRAY(UINTEGER_8),BMP_HEADER).on (bmp_buffer.storage);
image.set_size (header.width, header.height);
image.set_channels (header.bits_per_pixel >> 3);
@@ -77,7 +77,7 @@ Section Public
stride := image.calculate_stride;
- image_data := FAST_ARRAY[UINTEGER_8].create (stride * rows);
+ image_data := FAST_ARRAY(UINTEGER_8).create (stride * rows);
base := BMP_HEADER.object_size;
0.to (rows-1) do { row:INTEGER;
diff --git a/images/image.li b/images/image.li
index 879ab33..6f04cc5 100644
--- a/images/image.li
+++ b/images/image.li
@@ -120,7 +120,7 @@ Section Public
height := h;
);
- - set_channels ch:INTEGER <- channels := ch;
+ - set_channels ch:INTEGER <- (channels := ch;);
- set_format fmt:IMAGE_FORMAT <-
diff --git a/images/tga.li b/images/tga.li
index ccb84e3..df825fc 100644
--- a/images/tga.li
+++ b/images/tga.li
@@ -38,12 +38,12 @@ Section Public
- load image:IMAGE :BOOLEAN <-
(
+ result:BOOLEAN;
- + tga_buffer:FAST_ARRAY[UINTEGER_8];
+ + tga_buffer:FAST_ARRAY(UINTEGER_8);
+ buffer_pos:INTEGER;
+ header:TGA_HEADER;
- + image_data:FAST_ARRAY[UINTEGER_8];
+ + image_data:FAST_ARRAY(UINTEGER_8);
+ temp:UINTEGER_8;
+ e:ENTRY;
@@ -57,11 +57,11 @@ Section Public
file ?= e;
file.open;
- tga_buffer := FAST_ARRAY[UINTEGER_8].create_with_capacity (file.size+1);
+ tga_buffer := FAST_ARRAY(UINTEGER_8).create_with_capacity (file.size+1);
(file.read tga_buffer size (file.size) > 0).if {
- header := CONVERT[NATIVE_ARRAY[UINTEGER_8],TGA_HEADER].on (tga_buffer.storage);
+ header := CONVERT(NATIVE_ARRAY(UINTEGER_8),TGA_HEADER).on (tga_buffer.storage);
buffer_pos := TGA_HEADER.object_size;
@@ -74,7 +74,7 @@ Section Public
stride := image.calculate_stride;//channels * header.width;
- image_data := FAST_ARRAY[UINTEGER_8].create (stride * header.height);
+ image_data := FAST_ARRAY(UINTEGER_8).create (stride * header.height);
// read data line by line
0.to (header.height-1) do { y:INTEGER;
@@ -107,7 +107,7 @@ Section Public
stride := image.calculate_stride;//channels * header.width;
- image_data := FAST_ARRAY[UINTEGER_8].create (stride * header.height);
+ image_data := FAST_ARRAY(UINTEGER_8).create (stride * header.height);
// read data
0.to (header.width*header.height-1) do { y:INTEGER;
@@ -129,15 +129,15 @@ Section Public
// load compressed tga
//
- + temp_data:FAST_ARRAY[UINTEGER_8];
+ + temp_data:FAST_ARRAY(UINTEGER_8);
+ nb_pixels,current_pixel:INTEGER;
- + color_buffer:FAST_ARRAY[UINTEGER_8];
+ + color_buffer:FAST_ARRAY(UINTEGER_8);
+ rle_id:UINTEGER_8;
((channels = 3) || {channels = 4}).if {
- temp_data := FAST_ARRAY[UINTEGER_8].create_with_capacity (header.width * header.height*channels);
+ temp_data := FAST_ARRAY(UINTEGER_8).create_with_capacity (header.width * header.height*channels);
nb_pixels := header.width * header.height;
- color_buffer := FAST_ARRAY[UINTEGER_8].create_with_capacity channels;
+ color_buffer := FAST_ARRAY(UINTEGER_8).create_with_capacity channels;
{
// read RLE chunk header
@@ -201,7 +201,7 @@ Section Public
}.do_while {current_pixel < nb_pixels};
stride := image.calculate_stride;
- image_data := FAST_ARRAY[UINTEGER_8].create (stride * header.height);
+ image_data := FAST_ARRAY(UINTEGER_8).create (stride * header.height);
// line by line copy with 32bit aligned
0.to (header.height-1) do { row:INTEGER;
i := header.width * channels;
diff --git a/opengl/extensions/arb_shader_object.li b/opengl/extensions/arb_shader_object.li
index 9695bb0..fbdec1a 100644
--- a/opengl/extensions/arb_shader_object.li
+++ b/opengl/extensions/arb_shader_object.li
@@ -138,7 +138,7 @@ Section Public
*/
- shader_source shader:INTEGER string src:STRING <-
(
- + p:NATIVE_ARRAY[CHARACTER];
+ + p:NATIVE_ARRAY(CHARACTER);
p := src.to_external;
`liglShaderSourceARB(@shader, 1, (char**)(&@p), NULL)`;
@@ -168,7 +168,7 @@ Section Public
`GL_ARB_shader_object_dummy`:INTEGER
);
- - get_parameteriv (obj,pname:UINTEGER_32) in buf:FAST_ARRAY[INTEGER] <- // ??
+ - get_parameteriv (obj,pname:UINTEGER_32) in buf:FAST_ARRAY(INTEGER) <- // ??
( + p:POINTER;
p := buf.to_external;
@@ -185,7 +185,7 @@ Section Public
get_parameteri (obj,`GL_OBJECT_INFO_LOG_LENGTH_ARB`:UINTEGER_32)
);
- - get_infolog obj:UINTEGER_32 in buffer:FAST_ARRAY[CHARACTER] size sz:INTEGER <-
+ - get_infolog obj:UINTEGER_32 in buffer:FAST_ARRAY(CHARACTER) size sz:INTEGER <-
( + p:POINTER;
p := buffer.to_external;
@@ -193,7 +193,7 @@ Section Public
);
- get_uniform_location (program:UINTEGER_32, name:ABSTRACT_STRING) :INTEGER <-
- ( + p:NATIVE_ARRAY[CHARACTER];
+ ( + p:NATIVE_ARRAY(CHARACTER);
p := name.to_external;
`liglGetUniformLocationARB(@program, @p)`:INTEGER
diff --git a/opengl/gl_abstract_texture.li b/opengl/gl_abstract_texture.li
index daf8e0a..0557c49 100644
--- a/opengl/gl_abstract_texture.li
+++ b/opengl/gl_abstract_texture.li
@@ -107,7 +107,7 @@ Section Public
`glTexParameteri(@mode, GL_TEXTURE_WRAP_T, @env_mode)`;
);
- - make_from_data pixels:FAST_ARRAY[UINTEGER_8] size (w,h:INTEGER) type t:INTEGER <-
+ - make_from_data pixels:FAST_ARRAY(UINTEGER_8) size (w,h:INTEGER) type t:INTEGER <-
(
+ image:IMAGE;
diff --git a/opengl/gl_color_buffer.li b/opengl/gl_color_buffer.li
index 910e657..b505b65 100644
--- a/opengl/gl_color_buffer.li
+++ b/opengl/gl_color_buffer.li
@@ -88,37 +88,37 @@ Section Public
`glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE)`;
);
- - read (x,y:INTEGER) size (w,h:INTEGER) type t:INTEGER in buf:FAST_ARRAY[UINTEGER_8] <-
+ - read (x,y:INTEGER) size (w,h:INTEGER) type t:INTEGER in buf:FAST_ARRAY(UINTEGER_8) <-
( + p:POINTER;
p := buf.to_external;
- `glReadPixels(@x, at y, at w, at h, at t,GL_UNSIGNED_BYTE, at p)`;
- );
+ `glReadPixels(@x, at y, at w, at h, at t,GL_UNSIGNED_BYTE, at p)`;
+ );
// aliases
- - read_rgb (x,y:INTEGER) size (w,h:INTEGER) in buf:FAST_ARRAY[UINTEGER_8] <-
+ - read_rgb (x,y:INTEGER) size (w,h:INTEGER) in buf:FAST_ARRAY(UINTEGER_8) <-
(
read (x,y) size (w,h) type rgb in buf;
);
-
- - read_rgba (x,y:INTEGER) size (w,h:INTEGER) in buf:FAST_ARRAY[UINTEGER_8] <-
+
+ - read_rgba (x,y:INTEGER) size (w,h:INTEGER) in buf:FAST_ARRAY(UINTEGER_8) <-
(
read (x,y) size (w,h) type rgba in buf;
);
- - draw_pixels pixels:FAST_ARRAY[UINTEGER_8] size (w,h:INTEGER) type t:INTEGER <-
+ - draw_pixels pixels:FAST_ARRAY(UINTEGER_8) size (w,h:INTEGER) type t:INTEGER <-
( + p:POINTER;
p := pixels.to_external;
`glDrawPixels(@w, at h,GL_UNSIGNED_BYTE, at t, at p)`;
);
- - draw_rgb_pixels pixels:FAST_ARRAY[UINTEGER_8] size (w,h:INTEGER) <-
+ - draw_rgb_pixels pixels:FAST_ARRAY(UINTEGER_8) size (w,h:INTEGER) <-
(
draw_pixels pixels size (w,h) type rgb;
);
- - draw_rgba_pixels pixels:FAST_ARRAY[UINTEGER_8] size (w,h:INTEGER) <-
+ - draw_rgba_pixels pixels:FAST_ARRAY(UINTEGER_8) size (w,h:INTEGER) <-
(
draw_pixels pixels size (w,h) type rgba;
);
diff --git a/opengl/gl_display_list.li b/opengl/gl_display_list.li
index 694024e..3276d73 100644
--- a/opengl/gl_display_list.li
+++ b/opengl/gl_display_list.li
@@ -33,7 +33,7 @@ Section Public
+ id_list:INTEGER;// OpenGL id to call display list
- - create body:BLOCK :SELF <-
+ - create body:{} :SELF <-
(
+ result:SELF;
result := SELF.clone;
@@ -41,7 +41,7 @@ Section Public
result
);
- - make body:BLOCK <-
+ - make body:{} <-
(
+ id:INTEGER;
diff --git a/opengl/gl_error.li b/opengl/gl_error.li
index b5d1e68..ab092e8 100644
--- a/opengl/gl_error.li
+++ b/opengl/gl_error.li
@@ -21,7 +21,7 @@
Section Header
- + name := GL_ERROR;
+ + name := GL_ERROR;
- comment := "OpenGL error";
@@ -54,10 +54,10 @@ Section Public
- get buffer:STRING from code:INTEGER <-
// return details of error
- ( + str:NATIVE_ARRAY[CHARACTER];
+ ( + str:NATIVE_ARRAY(CHARACTER);
+ i:INTEGER;
- str := `gluErrorString(@code)`:NATIVE_ARRAY[CHARACTER];
+ str := `gluErrorString(@code)`:NATIVE_ARRAY(CHARACTER);
{str.item i != '\0'}.while_do {
// copy names of supported extensions
diff --git a/opengl/gl_font_abstract.li b/opengl/gl_font_abstract.li
index a50681d..f64d641 100644
--- a/opengl/gl_font_abstract.li
+++ b/opengl/gl_font_abstract.li
@@ -101,7 +101,7 @@ Section Public
(
+ b:UINTEGER_32;
+ n:INTEGER;
- + txt:NATIVE_ARRAY[CHARACTER];
+ + txt:NATIVE_ARRAY(CHARACTER);
+ xx,yy:INTEGER;
txt := text.to_external;
@@ -119,4 +119,4 @@ Section Public
#endif
`;
);
-
\ No newline at end of file
+
diff --git a/opengl/gl_index_buffer.li b/opengl/gl_index_buffer.li
index 73fbe5e..e58127a 100644
--- a/opengl/gl_index_buffer.li
+++ b/opengl/gl_index_buffer.li
@@ -29,14 +29,14 @@ Section Inherit
Section Public
- + index:FAST_ARRAY[UINTEGER_16];
+ + index:FAST_ARRAY(UINTEGER_16);
+ index_id:UINTEGER_32;
- make sz:INTEGER <-
(
- index := FAST_ARRAY[UINTEGER_16].create_with_capacity sz;
+ index := FAST_ARRAY(UINTEGER_16).create_with_capacity sz;
);
- build <-
@@ -103,4 +103,4 @@ Section Public
OPENGL.arb_vertex_buffer_object.delete index_id;
};
};
- );
\ No newline at end of file
+ );
diff --git a/opengl/gl_light.li b/opengl/gl_light.li
index 7b5b694..87e51eb 100644
--- a/opengl/gl_light.li
+++ b/opengl/gl_light.li
@@ -36,7 +36,7 @@ Section Public
+ id_light:INTEGER; // OpenGL id: LIGHT0 - LIGHT7
- - make (a,d,s:COLOR, pos:VECTOR3[REAL_32]) <-
+ - make (a,d,s:COLOR, pos:VECTOR3(REAL_32)) <-
(
parent_light.make (a,d,s,pos);
(nb_lights < 8).if {
@@ -53,7 +53,7 @@ Section Public
(
+ id:INTEGER;
+ p:POINTER;
- + vec:FAST_ARRAY[REAL_32];
+ + vec:FAST_ARRAY(REAL_32);
parent_state.enable;
id := id_light;
@@ -117,7 +117,7 @@ Section Public
(
`glPopAttrib()`;
);
-
+
- enable_default_light <-
(
diff --git a/opengl/gl_texture2d.li b/opengl/gl_texture2d.li
index 2d99b8d..b599393 100644
--- a/opengl/gl_texture2d.li
+++ b/opengl/gl_texture2d.li
@@ -70,12 +70,12 @@ Section Public
`;
);
- - replace_region (x,y,w,h:INTEGER) with_data (pixels:FAST_ARRAY[UINTEGER_8],type:INTEGER) <-
+ - replace_region (x,y,w,h:INTEGER) with_data (pixels:FAST_ARRAY(UINTEGER_8),type:INTEGER) <-
( + p:POINTER;
p := pixels.to_external;
`glTexSubImage2D(GL_TEXTURE_2D, 0, @x, @y, @w, @h, @type, GL_UNSIGNED_BYTE, @p)`;
- );
+ );
- replace_region (x,y,w,h:INTEGER) with image:IMAGE <-
(
diff --git a/opengl/gl_transform.li b/opengl/gl_transform.li
index 3850605..40edeca 100644
--- a/opengl/gl_transform.li
+++ b/opengl/gl_transform.li
@@ -47,14 +47,14 @@ Section Public
`glPopMatrix()`;
);
- - load_matrix m:MATRIX4[REAL_32] <-
+ - load_matrix m:MATRIX4(REAL_32) <-
( + p:POINTER;
p := m.to_external;
`glLoadMatrixf(@p)`;
);
- - mult_matrix_by m:MATRIX4[REAL_32] <-
+ - mult_matrix_by m:MATRIX4(REAL_32) <-
( + p:POINTER;
p := m.to_external;
@@ -85,7 +85,7 @@ Section Public
`glScalef (@x, at y, at z)`;
);
- - get_modelview matrix:MATRIX4[REAL_32] <-
+ - get_modelview matrix:MATRIX4(REAL_32) <-
( + p:POINTER;
p := matrix.to_external;
@@ -101,7 +101,7 @@ Section Public
`glMatrixMode(GL_PROJECTION)`;
);
- - get_projection matrix:MATRIX4[REAL_32] <-
+ - get_projection matrix:MATRIX4(REAL_32) <-
( + p:POINTER;
p := matrix.to_external;
diff --git a/opengl/gl_vertex_buffer.li b/opengl/gl_vertex_buffer.li
index e325ecb..7e694fa 100644
--- a/opengl/gl_vertex_buffer.li
+++ b/opengl/gl_vertex_buffer.li
@@ -179,7 +179,7 @@ Section Public
`glNormal3f(@x, @y, @z)`;
);
- - add_normal v:VECTOR3[REAL_32] <-
+ - add_normal v:VECTOR3(REAL_32) <-
(
add_normal3f (v.x, v.y, v.z);
);
@@ -199,22 +199,22 @@ Section Public
`glColor3f(@r, @g, @b)`;
);
- - get_vertex_data:FAST_ARRAY[REAL_32] <-
+ - get_vertex_data:FAST_ARRAY(REAL_32) <-
(
not_yet_implemented; NULL
);
- - get_texels_data:FAST_ARRAY[REAL_32] <-
+ - get_texels_data:FAST_ARRAY(REAL_32) <-
(
not_yet_implemented; NULL
);
- - get_normals_data:FAST_ARRAY[REAL_32] <-
+ - get_normals_data:FAST_ARRAY(REAL_32) <-
(
not_yet_implemented; NULL
);
- - get_colors_data:FAST_ARRAY[REAL_32] <-
+ - get_colors_data:FAST_ARRAY(REAL_32) <-
(
not_yet_implemented; NULL
);
--
Lisaac library opengl-binding
More information about the Lisaac-commits
mailing list