[SCM] Lisaac library opengl-binding branch, master, updated. 9a65c25f45c3200d7a0c546bc1b3ac0a802c6280
Damien Bouvarel
dams.bouvarel at wanadoo.fr
Wed Aug 26 23:46:31 UTC 2009
The following commit has been merged in the master branch:
commit 9a65c25f45c3200d7a0c546bc1b3ac0a802c6280
Author: Damien Bouvarel <dams.bouvarel at wanadoo.fr>
Date: Thu Aug 27 01:46:22 2009 +0200
start 0.14 update
diff --git a/3D/camera.li b/3D/camera.li
index 8ace876..4fa3a41 100644
--- a/3D/camera.li
+++ b/3D/camera.li
@@ -32,40 +32,40 @@ Section Inherit
Section Public
// position in 3d world
- + position:VECTOR3[REAL_32];
+ + position:VECTOR3(REAL_32);
// camera's view vector
- + view:VECTOR3[REAL_32];
+ + view:VECTOR3(REAL_32);
// camera's up vector (orthonormal with view & right)
- + up:VECTOR3[REAL_32];
+ + up:VECTOR3(REAL_32);
// camera's up vector (orthonormal with view & up)
- + right:VECTOR3[REAL_32];
+ + right:VECTOR3(REAL_32);
// speed coeff
- kspeed:REAL_32 := 50;
- - create_from (p,v,u,r:VECTOR3[REAL_32]) :SELF <-
+ - create_from (p,v,u,r:VECTOR3(REAL_32)) :SELF <-
( + result:SELF;
result := SELF.clone;
result.make (p,v,u,r);
result
);
- - create_position (p:VECTOR3[REAL_32]) :SELF <-
+ - create_position (p:VECTOR3(REAL_32)) :SELF <-
( + result:SELF;
result := SELF.clone;
- result.make (p, VECTOR3[REAL_32].create (0.0,-1.0,1.0),VECTOR3[REAL_32].create (0.0,1.0,0.0),VECTOR3[REAL_32].create (1.0,0.0,0.0));
+ result.make (p, VECTOR3(REAL_32).create (0.0,-1.0,1.0),VECTOR3(REAL_32).create (0.0,1.0,0.0),VECTOR3(REAL_32).create (1.0,0.0,0.0));
result
);
- - create_position p:VECTOR3[REAL_32] looking_at target:VECTOR3[REAL_32] :SELF <-
+ - create_position p:VECTOR3(REAL_32) looking_at target:VECTOR3(REAL_32) :SELF <-
( + result:SELF;
result := SELF.clone;
- result.make (p, (target - p).normalized, VECTOR3[REAL_32].create (0.0,1.0,0.0),VECTOR3[REAL_32].create (1.0,0.0,0.0));
+ result.make (p, (target - p).normalized, VECTOR3(REAL_32).create (0.0,1.0,0.0),VECTOR3(REAL_32).create (1.0,0.0,0.0));
result
);
@@ -73,11 +73,11 @@ Section Public
// default camera
( + result:SELF;
result := SELF.clone;
- result.make (VECTOR3[REAL_32].create (0.0,1.0,-1.0), VECTOR3[REAL_32].create (0.0,-1.0,1.0),VECTOR3[REAL_32].create (0.0,1.0,0.0),VECTOR3[REAL_32].create (1.0,0.0,0.0));
+ result.make (VECTOR3(REAL_32).create (0.0,1.0,-1.0), VECTOR3(REAL_32).create (0.0,-1.0,1.0),VECTOR3(REAL_32).create (0.0,1.0,0.0),VECTOR3(REAL_32).create (1.0,0.0,0.0));
result
);
- - make (p,v,u,r:VECTOR3[REAL_32]) <-
+ - make (p,v,u,r:VECTOR3(REAL_32)) <-
(
position := p;
view := v;
@@ -85,22 +85,22 @@ Section Public
right := r;
);
- - set_position p:VECTOR3[REAL_32] <-
+ - set_position p:VECTOR3(REAL_32) <-
(
position := p;
);
- - set_view v:VECTOR3[REAL_32] <-
+ - set_view v:VECTOR3(REAL_32) <-
(
view := v;
);
- - set_up u:VECTOR3[REAL_32] <-
+ - set_up u:VECTOR3(REAL_32) <-
(
up := u;
);
- - set_right u:VECTOR3[REAL_32] <-
+ - set_right u:VECTOR3(REAL_32) <-
(
right := u;
);
@@ -167,7 +167,7 @@ Section Public
up := view.cross right * -1;
);
- - move (speed:REAL_32,t:REAL_32) axis v:VECTOR3[REAL_32] <-
+ - move (speed:REAL_32,t:REAL_32) axis v:VECTOR3(REAL_32) <-
(
position.set_x (position.x + v.x * speed * t);
position.set_y (position.y + v.y * speed * t);
diff --git a/3D/models/md2_frame.li b/3D/models/md2_frame.li
index 3923223..118fade 100644
--- a/3D/models/md2_frame.li
+++ b/3D/models/md2_frame.li
@@ -32,18 +32,18 @@ Section Inherit
Section Public
- - fixme:VECTOR3[REAL_32] := VECTOR3[REAL_32].zero;
+ - fixme:VECTOR3(REAL_32) := VECTOR3(REAL_32).zero;
+ name:STRING;
// frame transformation
- + scale:VECTOR3[REAL_32] := fixme;
- + translate:VECTOR3[REAL_32] := fixme;
+ + scale:VECTOR3(REAL_32) := fixme;
+ + translate:VECTOR3(REAL_32) := fixme;
- + vertex:FAST_ARRAY[MD2_VERTEX];
+ + vertex:FAST_ARRAY(MD2_VERTEX);
- - create (n:ABSTRACT_STRING, s,t:VECTOR3[REAL_32], v:FAST_ARRAY[MD2_VERTEX]) :SELF <-
+ - create (n:ABSTRACT_STRING, s,t:VECTOR3(REAL_32), v:FAST_ARRAY(MD2_VERTEX)) :SELF <-
(
+ result:SELF;
result := SELF.clone;
@@ -51,7 +51,7 @@ Section Public
result
);
- - make (n:ABSTRACT_STRING, s,t:VECTOR3[REAL_32], v:FAST_ARRAY[MD2_VERTEX]) <-
+ - make (n:ABSTRACT_STRING, s,t:VECTOR3(REAL_32), v:FAST_ARRAY(MD2_VERTEX)) <-
(
name := STRING.create_from_string n;
scale := s;
diff --git a/3D/models/md2_model.li b/3D/models/md2_model.li
index 36a4541..6802c34 100644
--- a/3D/models/md2_model.li
+++ b/3D/models/md2_model.li
@@ -50,19 +50,19 @@ Section Public
// texture coordinates
- + texels:FAST_ARRAY[VECTOR2[INTEGER_16]];
+ + texels:FAST_ARRAY(VECTOR2(INTEGER_16));
// model geometry
- + triangles:FAST_ARRAY[MD2_TRIANGLE];
+ + triangles:FAST_ARRAY(MD2_TRIANGLE);
// model frames for animation
- + frames:FAST_ARRAY[MD2_FRAME];
+ + frames:FAST_ARRAY(MD2_FRAME);
// re-scaling model
+ scale:REAL_32;
// frame start of each animation
- + anim_index:FAST_ARRAY[INTEGER];
+ + anim_index:FAST_ARRAY(INTEGER);
// skin texture dimensions
+ skin_width:REAL_32;
@@ -70,10 +70,10 @@ Section Public
- load <-
(
- + header:FAST_ARRAY[UINTEGER_32];
- + buffer_16:FAST_ARRAY[INTEGER_16];
+ + header:FAST_ARRAY(UINTEGER_32);
+ + buffer_16:FAST_ARRAY(INTEGER_16);
+ nb_texels,nb_tris,nb_vertex:INTEGER;
- + v:VECTOR2[INTEGER_16];
+ + v:VECTOR2(INTEGER_16);
+ t:MD2_TRIANGLE;
+ x:INTEGER;
@@ -86,7 +86,7 @@ Section Public
file.open;
// md2 header size = 17*4 bytes
- header := FAST_ARRAY[UINTEGER_32].create_with_capacity 17;
+ header := FAST_ARRAY(UINTEGER_32).create_with_capacity 17;
(file.read header size (17) > 0).if {
// read header
@@ -105,16 +105,16 @@ Section Public
"\nNb verts: ".print;nb_vertex.print;
"\nNb frames: ".print;nb_frames.print;
*/
- texels := FAST_ARRAY[VECTOR2[INTEGER_16]].create_with_capacity nb_texels;
- triangles := FAST_ARRAY[MD2_TRIANGLE].create_with_capacity nb_tris;
+ texels := FAST_ARRAY(VECTOR2(INTEGER_16)).create_with_capacity nb_texels;
+ triangles := FAST_ARRAY(MD2_TRIANGLE).create_with_capacity nb_tris;
- frames := FAST_ARRAY[MD2_FRAME].create_with_capacity nb_frames;
+ frames := FAST_ARRAY(MD2_FRAME).create_with_capacity nb_frames;
skin_width := header.item md2_skin_width.to_real;
skin_height := header.item md2_skin_height.to_real;
// coord texture
- buffer_16 := FAST_ARRAY[INTEGER_16].create_with_capacity (nb_texels*2);
+ buffer_16 := FAST_ARRAY(INTEGER_16).create_with_capacity (nb_texels*2);
file.set_cursor (header.item md2_offset_texels);
(file.read buffer_16 size (nb_texels*2) <= 0).if {
error "load model: read error";
@@ -123,13 +123,13 @@ Section Public
// read texels
x := 0;
{x < nb_texels*2}.while_do {
- v := VECTOR2[INTEGER_16].create (buffer_16.item (x),buffer_16.item (x+1));
+ v := VECTOR2(INTEGER_16).create (buffer_16.item (x),buffer_16.item (x+1));
texels.add_last v;
x := x+2;
};
// triangles
- buffer_16 := FAST_ARRAY[INTEGER_16].create_with_capacity (nb_tris*6);
+ buffer_16 := FAST_ARRAY(INTEGER_16).create_with_capacity (nb_tris*6);
file.set_cursor (header.item md2_offset_tris);
(file.read buffer_16 size (nb_tris*6) <= 0).if {
error "load model: read error";
@@ -157,19 +157,19 @@ Section Public
- load_frame (file:STD_FILE, nb_vertex:INTEGER) :MD2_FRAME <-
(
- + scale,translate:VECTOR3[REAL_32];
- + vertex:FAST_ARRAY[MD2_VERTEX];
- + buffer:FAST_ARRAY[REAL_32];
- + buffer_8:FAST_ARRAY[UINTEGER_8];
+ + scale,translate:VECTOR3(REAL_32);
+ + vertex:FAST_ARRAY(MD2_VERTEX);
+ + buffer:FAST_ARRAY(REAL_32);
+ + buffer_8:FAST_ARRAY(UINTEGER_8);
+ x,y,z:REAL_32;
- + name:FAST_ARRAY[CHARACTER];
+ + name:FAST_ARRAY(CHARACTER);
+ v:MD2_VERTEX;
+ i:INTEGER;
- vertex := FAST_ARRAY[MD2_VERTEX].create_with_capacity nb_vertex;
+ vertex := FAST_ARRAY(MD2_VERTEX).create_with_capacity nb_vertex;
// read transformation vectors
- buffer := FAST_ARRAY[REAL_32].create_with_capacity 7;
+ buffer := FAST_ARRAY(REAL_32).create_with_capacity 7;
(file.read buffer size 6 <= 0).if {
error "load model: read error (trans)";
};
@@ -178,21 +178,21 @@ Section Public
y := buffer.item 1;
z := buffer.item 2;
- scale := VECTOR3[REAL_32].create (x,y,z);
+ scale := VECTOR3(REAL_32).create (x,y,z);
x := buffer.item 3;
y := buffer.item 4;
z := buffer.item 5;
- translate := VECTOR3[REAL_32].create (x,y,z);
+ translate := VECTOR3(REAL_32).create (x,y,z);
// read frame name
- name := FAST_ARRAY[CHARACTER].create_with_capacity 16;
+ name := FAST_ARRAY(CHARACTER).create_with_capacity 16;
(file.read name size 16 <= 0).if {
error "load model: read error (name)";
};
- buffer_8 := FAST_ARRAY[UINTEGER_8].create_with_capacity (4*nb_vertex);
+ buffer_8 := FAST_ARRAY(UINTEGER_8).create_with_capacity (4*nb_vertex);
(file.read buffer_8 size (4*nb_vertex) <= 0).if {
error "load model: read error";
};
@@ -205,7 +205,7 @@ Section Public
i := i + 4;
};
- MD2_FRAME.create (CONVERT[FAST_ARRAY[CHARACTER],STRING].on (name), scale, translate, vertex)
+ MD2_FRAME.create (CONVERT(FAST_ARRAY(CHARACTER),STRING).on (name), scale, translate, vertex)
);
- render_with tex:TEXTURE <-
@@ -227,7 +227,7 @@ Section Public
+ poly:MD2_TRIANGLE;
+ verts1,verts2:MD2_VERTEX;
+ vertex_index,texel_index:INTEGER_16;
- + texel:VECTOR2[INTEGER_16];
+ + texel:VECTOR2(INTEGER_16);
//+ n,n1,n2,v,v1,v2:VERTEX;
+ x,y,z:REAL_32;
diff --git a/3D/noise.li b/3D/noise.li
index 501769b..6fc9f1a 100644
--- a/3D/noise.li
+++ b/3D/noise.li
@@ -40,7 +40,7 @@ Section Inherit
Section Public
- + permutation:FAST_ARRAY[INTEGER];
+ + permutation:FAST_ARRAY(INTEGER);
@@ -57,7 +57,7 @@ Section Public
- make <-
(
- permutation := FAST_ARRAY[INTEGER].create 256;
+ permutation := FAST_ARRAY(INTEGER).create 256;
0.to 255 do { i:INTEGER;
permutation.put (random & 0ffh) to i;
};
@@ -112,7 +112,7 @@ Section Public
// interpolations
idx := spline dx1;
- idy := spline dy1;
+ idy := spline dy1;
idz := spline dz1;
v11 := linear (dot7, dot8, idz);
diff --git a/3D/particles/bounce_plane.li b/3D/particles/bounce_plane.li
index 5f07c76..d14271c 100644
--- a/3D/particles/bounce_plane.li
+++ b/3D/particles/bounce_plane.li
@@ -31,21 +31,21 @@ Section Inherit
Section Public
- + normal:VECTOR3[REAL_32];
+ + normal:VECTOR3(REAL_32);
+ offset:REAL_32;
//
// Creation.
//
- - create (n:VECTOR3[REAL_32], off:REAL_32) :SELF <-
+ - create (n:VECTOR3(REAL_32), off:REAL_32) :SELF <-
( + result:SELF;
result := clone;
result.make (n,off);
result
);
- - make (n:VECTOR3[REAL_32], off:REAL_32) <-
+ - make (n:VECTOR3(REAL_32), off:REAL_32) <-
(
normal := n;
offset := off;
@@ -67,7 +67,7 @@ Section Public
Section Private
- - distance_to p:VECTOR3[REAL_32] :REAL_32 <-
+ - distance_to p:VECTOR3(REAL_32) :REAL_32 <-
(
(p.dot normal) + offset
);
diff --git a/3D/particles/particle.li b/3D/particles/particle.li
index c8ab3c5..6efe5e5 100644
--- a/3D/particles/particle.li
+++ b/3D/particles/particle.li
@@ -35,8 +35,8 @@ Section Public
// Particle properties
//
- + position:VECTOR3[REAL_32];
- + dir:VECTOR3[REAL_32];
+ + position:VECTOR3(REAL_32);
+ + dir:VECTOR3(REAL_32);
+ size:REAL_32;
+ life:REAL_32;
@@ -45,14 +45,14 @@ Section Public
- is_dead:BOOLEAN <- life <= 0;
- - create (p,d:VECTOR3[REAL_32]) size sz:REAL_32 life t:REAL_32 :SELF <-
+ - create (p,d:VECTOR3(REAL_32)) size sz:REAL_32 life t:REAL_32 :SELF <-
( + result:SELF;
result := SELF.clone;
result.make (p,d) size sz life t;
result
);
- - make (p,d:VECTOR3[REAL_32]) size sz:REAL_32 life t:REAL_32 <-
+ - make (p,d:VECTOR3(REAL_32)) size sz:REAL_32 life t:REAL_32 <-
(
position := p;
dir := d;
@@ -62,12 +62,12 @@ Section Public
life := initial_life;
);
- - set_position p:VECTOR3[REAL_32] <-
+ - set_position p:VECTOR3(REAL_32) <-
(
position := p;
);
- - set_direction d:VECTOR3[REAL_32] <-
+ - set_direction d:VECTOR3(REAL_32) <-
(
dir := d;
);
@@ -75,7 +75,7 @@ Section Public
- kill <-
(
life := 0;
- );
+ );
//
// Update
diff --git a/3D/particles/particle_system.li b/3D/particles/particle_system.li
index eeb545d..4448dd3 100644
--- a/3D/particles/particle_system.li
+++ b/3D/particles/particle_system.li
@@ -35,35 +35,35 @@ Section Public
// Particle System properties
//
- + position:VECTOR3[REAL_32];
- + direction:VECTOR3[REAL_32];
+ + position:VECTOR3(REAL_32);
+ + direction:VECTOR3(REAL_32);
- + particles:LINKED_LIST[PARTICLE];
- + constraints:LINKED_LIST[CONSTRAINT];
+ + particles:LINKED_LIST(PARTICLE);
+ + constraints:LINKED_LIST(CONSTRAINT);
- + palette:FAST_ARRAY[RGB];
+ + palette:FAST_ARRAY(RGB);
+ spawn_rate:REAL_32;
+ size:REAL_32;
+ life:REAL_32;
+ speed:REAL_32;
-
+
+ size_spread:REAL_32;
+ life_spread:REAL_32;
+ speed_spread:REAL_32;
- - create p:VECTOR3[REAL_32] :SELF <-
+ - create p:VECTOR3(REAL_32) :SELF <-
( + result:SELF;
result := SELF.clone;
result.make p;
result
);
- - make p:VECTOR3[REAL_32] <-
+ - make p:VECTOR3(REAL_32) <-
(
position := p;
- direction := VECTOR3[REAL_32].create (0.5,0.1,0.5);
+ direction := VECTOR3(REAL_32).create (0.5,0.1,0.5);
spawn_rate := 60;
@@ -76,10 +76,10 @@ Section Public
life := 5;
life_spread := 1;
- particles := LINKED_LIST[PARTICLE].create;
- constraints := LINKED_LIST[CONSTRAINT].create;
+ particles := LINKED_LIST(PARTICLE).create;
+ constraints := LINKED_LIST(CONSTRAINT).create;
- palette := FAST_ARRAY[RGB].create_with_capacity 12;
+ palette := FAST_ARRAY(RGB).create_with_capacity 12;
0.to 12 do { i:INTEGER;
palette.add_last (RGB.create (0,0,0));
};
@@ -118,14 +118,14 @@ Section Public
// Update
//
- - dir:VECTOR3[REAL_32] := VECTOR3[REAL_32].zero;
+ - dir:VECTOR3(REAL_32) := VECTOR3(REAL_32).zero;
- update time:REAL_32 <-
(
+ nb_new_particles:INTEGER;
+ p:PARTICLE;
+ sz,lifetime:REAL_32;
- // + dir:VECTOR3[REAL_32];
+ // + dir:VECTOR3(REAL_32);
+ k:INTEGER;
// spawn new particles
@@ -173,9 +173,9 @@ Section Public
);
- - render (dx,dy:VECTOR3[REAL_32]) <-
+ - render (dx,dy:VECTOR3(REAL_32)) <-
(
- + v:VECTOR3[REAL_32];
+ + v:VECTOR3(REAL_32);
+ frac:REAL_32;
+ col_int:INTEGER;
@@ -275,7 +275,7 @@ Section Private
val + r * spread_val * r.abs
);
- - random_vector v:VECTOR3[REAL_32] spread (sx,sy,sz:REAL_32) :VECTOR3[REAL_32] <-
+ - random_vector v:VECTOR3(REAL_32) spread (sx,sy,sz:REAL_32) :VECTOR3(REAL_32) <-
(
+ x,y,z:REAL_32;
@@ -283,10 +283,10 @@ Section Private
y := v.y * random_around 0 spread sy;
z := v.z * random_around 0 spread sz;
- VECTOR3[REAL_32].create (x, y, z)
+ VECTOR3(REAL_32).create (x, y, z)
);
- - get_random_vector v:VECTOR3[REAL_32] spread (sx,sy,sz:REAL_32) in vec:VECTOR3[REAL_32] <-
+ - get_random_vector v:VECTOR3(REAL_32) spread (sx,sy,sz:REAL_32) in vec:VECTOR3(REAL_32) <-
(
+ x,y,z:REAL_32;
diff --git a/3D/particles/point_force.li b/3D/particles/point_force.li
index ac18da6..31abc7e 100644
--- a/3D/particles/point_force.li
+++ b/3D/particles/point_force.li
@@ -35,7 +35,7 @@ Section Public
// Particle properties
//
- + position:VECTOR3[REAL_32];
+ + position:VECTOR3(REAL_32);
+ strength:REAL_32;
+ linear_attenuation:REAL_32;
@@ -46,14 +46,14 @@ Section Public
// Creation.
//
- - create (p:VECTOR3[REAL_32],s,la,qa:REAL_32) :SELF <-
+ - create (p:VECTOR3(REAL_32),s,la,qa:REAL_32) :SELF <-
( + result:SELF;
result := clone;
result.make (p,s,la,qa);
result
);
- - make (p:VECTOR3[REAL_32],s,la,qa:REAL_32) <-
+ - make (p:VECTOR3(REAL_32),s,la,qa:REAL_32) <-
(
position := p;
strength := s;
@@ -65,7 +65,7 @@ Section Public
- apply_to p:PARTICLE time t:REAL_32 <-
(
- + dir:VECTOR3[REAL_32];
+ + dir:VECTOR3(REAL_32);
+ dist:REAL_32;
dir := position - p.position;
diff --git a/3D/primitives/cone.li b/3D/primitives/cone.li
index 44fd522..29974a7 100644
--- a/3D/primitives/cone.li
+++ b/3D/primitives/cone.li
@@ -35,10 +35,10 @@ Section Public
+ height:REAL_32;
+ slices:REAL_32;
- + position:VECTOR3[REAL_32];
+ + position:VECTOR3(REAL_32);
- - create (p:VECTOR3[REAL_32],r,h,sl:REAL_32) :SELF <-
+ - create (p:VECTOR3(REAL_32),r,h,sl:REAL_32) :SELF <-
(
+ result:SELF;
result := SELF.clone;
@@ -46,7 +46,7 @@ Section Public
result
);
- - make (p:VECTOR3[REAL_32],r,h,sl:REAL_32) <-
+ - make (p:VECTOR3(REAL_32),r,h,sl:REAL_32) <-
(
radius_base := r;
height := h;
diff --git a/3D/primitives/cylinder.li b/3D/primitives/cylinder.li
index 6df0053..d5a9c76 100644
--- a/3D/primitives/cylinder.li
+++ b/3D/primitives/cylinder.li
@@ -39,10 +39,10 @@ Section Public
+ slices:REAL_32;
+ stacks:REAL_32;
- + position:VECTOR3[REAL_32];
+ + position:VECTOR3(REAL_32);
- - create (p:VECTOR3[REAL_32],r1,r2,h,sl,st:REAL_32) :SELF <-
+ - create (p:VECTOR3(REAL_32),r1,r2,h,sl,st:REAL_32) :SELF <-
(
+ result:SELF;
result := SELF.clone;
@@ -50,7 +50,7 @@ Section Public
result
);
- - make (p:VECTOR3[REAL_32],r1,r2,h,sl,st:REAL_32) <-
+ - make (p:VECTOR3(REAL_32),r1,r2,h,sl,st:REAL_32) <-
(
radius_top := r1;
radius_base := r2;
diff --git a/3D/primitives/sphere.li b/3D/primitives/sphere.li
index 55378c7..8f0bf74 100644
--- a/3D/primitives/sphere.li
+++ b/3D/primitives/sphere.li
@@ -35,10 +35,10 @@ Section Public
+ slices:REAL_32;
+ stacks:REAL_32;
- + position:VECTOR3[REAL_32];
+ + position:VECTOR3(REAL_32);
- - create (p:VECTOR3[REAL_32],r,sl,st:REAL_32) :SELF <-
+ - create (p:VECTOR3(REAL_32),r,sl,st:REAL_32) :SELF <-
(
+ result:SELF;
result := SELF.clone;
@@ -46,7 +46,7 @@ Section Public
result
);
- - make (p:VECTOR3[REAL_32],r,sl,st:REAL_32) <-
+ - make (p:VECTOR3(REAL_32),r,sl,st:REAL_32) <-
(
radius := r;
slices := sl;
diff --git a/3D/skybox.li b/3D/skybox.li
index 5f46c86..08982a2 100644
--- a/3D/skybox.li
+++ b/3D/skybox.li
@@ -32,23 +32,23 @@ Section Inherit
Section Public
// position in 3d world
- + position:VECTOR3[REAL_32];
+ + position:VECTOR3(REAL_32);
// 3d cube
- + vertex:FAST_ARRAY[VERTEX];
+ + vertex:FAST_ARRAY(VERTEX);
// skybox textures
- + textures:FAST_ARRAY[TEXTURE];
+ + textures:FAST_ARRAY(TEXTURE);
- - create (pos,dim:VECTOR3[REAL_32],tex:FAST_ARRAY[TEXTURE]) :SELF <-
+ - create (pos,dim:VECTOR3(REAL_32),tex:FAST_ARRAY(TEXTURE)) :SELF <-
( + result:SELF;
result := SELF.clone;
result.make (pos,dim,tex);
result
);
- - make (pos,dim:VECTOR3[REAL_32],tex:FAST_ARRAY[TEXTURE]) <-
+ - make (pos,dim:VECTOR3(REAL_32),tex:FAST_ARRAY(TEXTURE)) <-
(
+ v:VERTEX;
? {tex.count = 5};
@@ -57,7 +57,7 @@ Section Public
position := pos;
textures := tex;
- vertex := FAST_ARRAY[VERTEX].create_with_capacity 8;
+ vertex := FAST_ARRAY(VERTEX).create_with_capacity 8;
// top
v := VERTEX.create (pos.x - dim.x, pos.y + dim.y, pos.z + dim.z);
@@ -173,7 +173,7 @@ Section Public
renderer.vb.end;
);
- - set_position p:VECTOR3[REAL_32] <-
+ - set_position p:VECTOR3(REAL_32) <-
(
position := p;
);
diff --git a/3D/terrain.li b/3D/terrain.li
index 6580784..2a84ce6 100644
--- a/3D/terrain.li
+++ b/3D/terrain.li
@@ -39,8 +39,8 @@ Section Public
+ height_factor:REAL_32 := 2.5;
- + heights:FAST_ARRAY[REAL_32];
- + normals:FAST_ARRAY[VECTOR3[REAL_32]];
+ + heights:FAST_ARRAY(REAL_32);
+ + normals:FAST_ARRAY(VECTOR3(REAL_32));
+ texture:TEXTURE;
@@ -76,8 +76,8 @@ Section Public
width := map.width;
height := map.height;
- heights := FAST_ARRAY[REAL_32].create (width*height);
- normals := FAST_ARRAY[VECTOR3[REAL_32]].create_with_capacity (width*height);
+ heights := FAST_ARRAY(REAL_32).create (width*height);
+ normals := FAST_ARRAY(VECTOR3(REAL_32)).create_with_capacity (width*height);
// fill data with heights
0.to (height-1) do { j:INTEGER;
@@ -162,23 +162,23 @@ Section Public
compute_normals;
);
- - cross_product_p1 (x1,z1:INTEGER) p2 (x2,z2:INTEGER) p3 (x3,z3:INTEGER) :VECTOR3[REAL_32] <-
+ - cross_product_p1 (x1,z1:INTEGER) p2 (x2,z2:INTEGER) p3 (x3,z3:INTEGER) :VECTOR3(REAL_32) <-
// compute normal unit vector of the (p1,p2,p3) triangle
(
- + v1,v2:VECTOR3[REAL_32];
+ + v1,v2:VECTOR3(REAL_32);
// vector between p1 & p2
- v1 := VECTOR3[REAL_32].create ((x2-x1).to_real*w_step, heights.item (z2*width+x2) - heights.item (z1*width+x1), (z2-z1).to_real*h_step);
+ v1 := VECTOR3(REAL_32).create ((x2-x1).to_real*w_step, heights.item (z2*width+x2) - heights.item (z1*width+x1), (z2-z1).to_real*h_step);
// vector between p1 & p3
- v2 := VECTOR3[REAL_32].create ((x3-x1).to_real*w_step, heights.item (z3*width+x3) - heights.item (z1*width+x1), (z3-z1).to_real*h_step);
+ v2 := VECTOR3(REAL_32).create ((x3-x1).to_real*w_step, heights.item (z3*width+x3) - heights.item (z1*width+x1), (z3-z1).to_real*h_step);
(v1.cross v2).normalized
);
- compute_normals <-
(
- + v1,v2:VECTOR3[REAL_32];
+ + v1,v2:VECTOR3(REAL_32);
normals.clear;
@@ -248,7 +248,7 @@ Section Public
};
v1.normalize;
v1.set_z (-v1.z);
-
+
// add normal
normals.add_last v1;
};
diff --git a/abstract_renderer/abstract_evaluator.li b/abstract_renderer/abstract_evaluator.li
index b3bc92c..dc34010 100644
--- a/abstract_renderer/abstract_evaluator.li
+++ b/abstract_renderer/abstract_evaluator.li
@@ -46,7 +46,7 @@ Section Public
+ type:INTEGER;
+ capacity:INTEGER;
- + control_points:FAST_ARRAY[REAL_32];
+ + control_points:FAST_ARRAY(REAL_32);
- create (t, cap:INTEGER) :SELF <-
@@ -110,7 +110,7 @@ Section Public
- begin_control_points <-
(
- control_points := FAST_ARRAY[REAL_32].create_with_capacity capacity;
+ control_points := FAST_ARRAY(REAL_32).create_with_capacity capacity;
);
- end <- ();
- new_control_points body:BLOCK <-
diff --git a/abstract_renderer/alpha_test.li b/abstract_renderer/alpha_test.li
index 02fd09e..4a6de6b 100644
--- a/abstract_renderer/alpha_test.li
+++ b/abstract_renderer/alpha_test.li
@@ -18,7 +18,7 @@
// //
// http://isaacproject.u-strasbg.fr/ //
///////////////////////////////////////////////////////////////////////////////
-
+
Section Header
+ name := ALPHA_TEST;
@@ -29,7 +29,7 @@ Section Inherit
+ parent_state:Expanded STATE;
-Section Public
+Section Public
// pixel test functions
- always:INTEGER <- 0; // test always sucess
diff --git a/abstract_renderer/color.li b/abstract_renderer/color.li
index 35940d4..2be1701 100644
--- a/abstract_renderer/color.li
+++ b/abstract_renderer/color.li
@@ -36,4 +36,4 @@ Section Public
- b:REAL_32 <- deferred;
- a:REAL_32 <- deferred;
- - getv:FAST_ARRAY[REAL_32] <- deferred;
\ No newline at end of file
+ - getv:FAST_ARRAY(REAL_32) <- deferred;
\ No newline at end of file
diff --git a/abstract_renderer/error.li b/abstract_renderer/error.li
index 8d41764..e3cc4ea 100644
--- a/abstract_renderer/error.li
+++ b/abstract_renderer/error.li
@@ -18,7 +18,7 @@
// //
// http://isaacproject.u-strasbg.fr/ //
///////////////////////////////////////////////////////////////////////////////
-
+
Section Header
+ name := ERROR;
diff --git a/abstract_renderer/light.li b/abstract_renderer/light.li
index 25b24c8..ca9fe7d 100644
--- a/abstract_renderer/light.li
+++ b/abstract_renderer/light.li
@@ -35,14 +35,14 @@ Section Public
+ diffuse:COLOR; // conic light
+ specular:COLOR; // shininess
- + position:VECTOR3[REAL_32];
+ + position:VECTOR3(REAL_32);
+ is_directional:BOOLEAN; // if true 'position' is the direction
+ modified:BOOLEAN;
- - create (a,d,s:COLOR) at (pos:VECTOR3[REAL_32]) :SELF <-
+ - create (a,d,s:COLOR) at (pos:VECTOR3(REAL_32)) :SELF <-
(
+ result:SELF;
result := SELF.clone;
@@ -50,7 +50,7 @@ Section Public
result
);
- - make (a,d,s:COLOR, pos:VECTOR3[REAL_32]) <-
+ - make (a,d,s:COLOR, pos:VECTOR3(REAL_32)) <-
(
ambient := a;
diffuse := d;
@@ -92,7 +92,7 @@ Section Public
specular := c;
);
- - set_position p:VECTOR3[REAL_32] <-
+ - set_position p:VECTOR3(REAL_32) <-
(
notify;
position := p;
diff --git a/abstract_renderer/plane.li b/abstract_renderer/plane.li
index d617f9d..763f986 100644
--- a/abstract_renderer/plane.li
+++ b/abstract_renderer/plane.li
@@ -27,7 +27,7 @@ Section Header
Section Inherit
- + parent_vector:Expanded VECTOR4[REAL_32];
+ + parent_vector:Expanded VECTOR4(REAL_32);
+ parent_state:Expanded STATE;
diff --git a/abstract_renderer/renderer.li b/abstract_renderer/renderer.li
index a63d31f..bf5cb9d 100644
--- a/abstract_renderer/renderer.li
+++ b/abstract_renderer/renderer.li
@@ -43,7 +43,7 @@ Section Public
- viewport:VIEWPORT; // current viewport
- reshape:RESHAPE := RESHAPE; // for projection modification & re-sizing
-
+
//
// Renderer Modules
//
@@ -105,7 +105,7 @@ Section Public
// Selection mode
//
- - begin_selection_in buffer:FAST_ARRAY[UINTEGER_32] size sz:INTEGER <- deferred;
+ - begin_selection_in buffer:FAST_ARRAY(UINTEGER_32) size sz:INTEGER <- deferred;
- end_selection:INTEGER <- deferred;
// make with default settings
diff --git a/abstract_renderer/rgb.li b/abstract_renderer/rgb.li
index 606f1b1..a53f91b 100644
--- a/abstract_renderer/rgb.li
+++ b/abstract_renderer/rgb.li
@@ -27,7 +27,7 @@ Section Header
Section Inherit
- + parent_vector:Expanded VECTOR3[REAL_32];
+ + parent_vector:Expanded VECTOR3(REAL_32);
- parent_color:COLOR := COLOR;
@@ -37,4 +37,4 @@ Section Public
- g:REAL_32 <- y;
- b:REAL_32 <- z;
- - getv:FAST_ARRAY[REAL_32] <- parent_vector.getv;
\ No newline at end of file
+ - getv:FAST_ARRAY(REAL_32) <- parent_vector.getv;
\ No newline at end of file
diff --git a/abstract_renderer/rgba.li b/abstract_renderer/rgba.li
index 163d7aa..99bcae5 100644
--- a/abstract_renderer/rgba.li
+++ b/abstract_renderer/rgba.li
@@ -27,7 +27,7 @@ Section Header
Section Inherit
- + parent_vector:Expanded VECTOR4[REAL_32];
+ + parent_vector:Expanded VECTOR4(REAL_32);
- parent_color:COLOR := COLOR;
@@ -38,5 +38,5 @@ Section Public
- b:REAL_32 <- z;
- a:REAL_32 <- w;
- - getv:FAST_ARRAY[REAL_32] <- parent_vector.getv;
+ - getv:FAST_ARRAY(REAL_32) <- parent_vector.getv;
\ No newline at end of file
diff --git a/abstract_renderer/state.li b/abstract_renderer/state.li
index a8776da..cf5e121 100644
--- a/abstract_renderer/state.li
+++ b/abstract_renderer/state.li
@@ -31,7 +31,7 @@ Section Inherit
Section Private
- + stack:LINKED_LIST[BOOLEAN];
+ + stack:LINKED_LIST(BOOLEAN);
Section Public
@@ -74,7 +74,7 @@ Section Public
- save <-
(
(stack = NULL).if {
- stack := LINKED_LIST[BOOLEAN].create;
+ stack := LINKED_LIST(BOOLEAN).create;
};
stack.add_last is_enabled;
);
diff --git a/abstract_renderer/texture.li b/abstract_renderer/texture.li
index 31609fc..f715f5a 100644
--- a/abstract_renderer/texture.li
+++ b/abstract_renderer/texture.li
@@ -70,7 +70,7 @@ Section Public
result
);
- - create_from_data pixels:FAST_ARRAY[UINTEGER_8] size (w,h:INTEGER) type t:INTEGER :SELF <-
+ - create_from_data pixels:FAST_ARRAY(UINTEGER_8) size (w,h:INTEGER) type t:INTEGER :SELF <-
( + result:SELF;
result := SELF.clone;
result.make_from_data pixels size (w,h) type t;
@@ -92,10 +92,10 @@ Section Public
);
- make image:IMAGE <- deferred;
- - make_from_data pixels:FAST_ARRAY[UINTEGER_8] size (x,y,w,h:INTEGER) type t:INTEGER <- deferred;
+ - make_from_data pixels:FAST_ARRAY(UINTEGER_8) size (x,y,w,h:INTEGER) type t:INTEGER <- deferred;
- make_from_framebuffer (x,y,w,h:INTEGER) type t:INTEGER <- deferred;
- - replace_region (x,y,w,h:INTEGER) with_data (pixels:FAST_ARRAY[UINTEGER_8],type:INTEGER) <- deferred;
+ - replace_region (x,y,w,h:INTEGER) with_data (pixels:FAST_ARRAY(UINTEGER_8),type:INTEGER) <- deferred;
- replace_region (x,y,w,h:INTEGER) with image:IMAGE <- deferred;
- replace_region (x,y,w,h:INTEGER) with_framebuffer_at (x0,y0:INTEGER) <- deferred;
diff --git a/abstract_renderer/transform.li b/abstract_renderer/transform.li
index 598bc5a..2d2000a 100644
--- a/abstract_renderer/transform.li
+++ b/abstract_renderer/transform.li
@@ -43,8 +43,8 @@ Section Public
);
// operations on current matrix
- - load_matrix m:MATRIX4[REAL_32] <- deferred;
- - mult_matrix_by m:MATRIX4[REAL_32] <- deferred;
+ - load_matrix m:MATRIX4(REAL_32) <- deferred;
+ - mult_matrix_by m:MATRIX4(REAL_32) <- deferred;
//
@@ -57,7 +57,7 @@ Section Public
- rotatef (val,x,y,z:REAL_32) <- deferred;
- scalef (x,y,z:REAL_32) <- deferred;
- - get_modelview matrix:MATRIX4[REAL_32] <- deferred;
+ - get_modelview matrix:MATRIX4(REAL_32) <- deferred;
//
// Projection transformations
diff --git a/abstract_renderer/vertex.li b/abstract_renderer/vertex.li
index b7dd167..19be8a9 100644
--- a/abstract_renderer/vertex.li
+++ b/abstract_renderer/vertex.li
@@ -27,7 +27,7 @@ Section Header
Section Inherit
- + parent_vector:Expanded VECTOR3[REAL_32];
+ + parent_vector:Expanded VECTOR3(REAL_32);
Section Public
diff --git a/abstract_renderer/vertex_buffer.li b/abstract_renderer/vertex_buffer.li
index 29514e7..b01fc08 100644
--- a/abstract_renderer/vertex_buffer.li
+++ b/abstract_renderer/vertex_buffer.li
@@ -155,7 +155,7 @@ Section Public
- add_texel2f (s,t:REAL_32) <- deferred;
- add_normal3f (x,y,z:REAL_32) <- deferred;
- - add_normal v:VECTOR3[REAL_32] <- deferred;
+ - add_normal v:VECTOR3(REAL_32) <- deferred;
- add_color (c:COLOR) <- deferred;
- add_color3f (r,g,b:REAL_32) <- deferred;
@@ -169,7 +169,7 @@ Section Public
- draw_using index_array:INDEX_BUFFER <- deferred;
- - 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_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
diff --git a/abstract_renderer/viewport.li b/abstract_renderer/viewport.li
index c9d3435..d63b5b8 100644
--- a/abstract_renderer/viewport.li
+++ b/abstract_renderer/viewport.li
@@ -27,7 +27,7 @@ Section Header
Section Inherit
- + parent_vector:Expanded VECTOR4[UINTEGER_32];
+ + parent_vector:Expanded VECTOR4(UINTEGER_32);
Section Public
diff --git a/framework/framework.li b/framework/framework.li
index 67d0e80..38dec1a 100644
--- a/framework/framework.li
+++ b/framework/framework.li
@@ -62,7 +62,7 @@ Section Public
renderer := r;
- log := LOG.create "renderer.log" level 3;
+ log := LOG.create "renderer.log" level 3;
buf := STRING.create 256;
buf.append "Video Card Driver:\n";
@@ -193,7 +193,7 @@ Section Public
}.do_while {is_running};
// exit framework
- close;
+ close;
};
);
@@ -275,18 +275,18 @@ Section Public
//
// Event management
//
-
+
Section Private
- - key_listeners:LINKED_LIST[EVENT_LISTENER];
- - mouse_listeners:LINKED_LIST[EVENT_LISTENER];
+ - key_listeners:LINKED_LIST(EVENT_LISTENER);
+ - mouse_listeners:LINKED_LIST(EVENT_LISTENER);
Section Public
- add_key_listener kl:EVENT_LISTENER <-
(
(key_listeners = NULL).if {
- key_listeners := LINKED_LIST[EVENT_LISTENER].create;
+ key_listeners := LINKED_LIST(EVENT_LISTENER).create;
};
key_listeners.add_last kl;
);
@@ -294,7 +294,7 @@ Section Public
- add_mouse_listener ml:EVENT_LISTENER <-
(
(mouse_listeners = NULL).if {
- mouse_listeners := LINKED_LIST[EVENT_LISTENER].create;
+ mouse_listeners := LINKED_LIST(EVENT_LISTENER).create;
};
mouse_listeners.add_last ml;
);
diff --git a/framework/low_level/abstract_keycode.li b/framework/low_level/abstract_keycode.li
index 79d8622..b0c6670 100644
--- a/framework/low_level/abstract_keycode.li
+++ b/framework/low_level/abstract_keycode.li
@@ -31,7 +31,7 @@ Section Inherit
Section Private
- - keys:HASHED_DICTIONARY[INTEGER,INTEGER];
+ - keys:HASHED_DICTIONARY(INTEGER,INTEGER);
Section Public
diff --git a/framework/unix/opengl.li b/framework/unix/opengl.li
index 22c5ab6..114fa9b 100644
--- a/framework/unix/opengl.li
+++ b/framework/unix/opengl.li
@@ -89,7 +89,7 @@ Section Public
- do_make (w,h:INTEGER) title s:ABSTRACT_STRING <-
(
+ nb_mode,n,size:INTEGER;
- + title:NATIVE_ARRAY[CHARACTER];
+ + title:NATIVE_ARRAY(CHARACTER);
width := w;
height := h;
diff --git a/framework/windows/framework_event.li b/framework/windows/framework_event.li
index e15bbd0..932d5b5 100644
--- a/framework/windows/framework_event.li
+++ b/framework/windows/framework_event.li
@@ -145,10 +145,10 @@ Section Public
event_mouseclick 0;
);
- - 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/windows/keycode.li b/framework/windows/keycode.li
index 677be78..c86ba29 100644
--- a/framework/windows/keycode.li
+++ b/framework/windows/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 (`VK_BACK`:INTEGER);
keys.add k_tab to (`VK_TAB`:INTEGER);
diff --git a/framework/windows/opengl.li b/framework/windows/opengl.li
index 75beca0..78186db 100644
--- a/framework/windows/opengl.li
+++ b/framework/windows/opengl.li
@@ -89,10 +89,10 @@ Section Public
SCENE.set_renderer Self; // make Self current
);
- - do_make (w,h:INTEGER) title s:ABSTRACT_STRING <-
+ - do_make (w,h:INTEGER) title s:ABSTRACT_STRING <-
(
+ style,size:INTEGER;
- + wintitle:NATIVE_ARRAY[CHARACTER];
+ + wintitle:NATIVE_ARRAY(CHARACTER);
+ b:BOOLEAN;
width := w;
@@ -100,7 +100,7 @@ Section Public
viewport := VIEWPORT.create (0,0,w,h);
b := is_fullscreen;
- // Creation fenetre:
+ // Creation fenetre:
`fullscreen = @b;
memset(&win.class, 0, sizeof(WNDCLASS));
diff --git a/images/image.li b/images/image.li
index 9de8e58..879ab33 100644
--- a/images/image.li
+++ b/images/image.li
@@ -29,7 +29,7 @@ Section Inherit
Section IMAGE
- + image_data:FAST_ARRAY[UINTEGER_8];
+ + image_data:FAST_ARRAY(UINTEGER_8);
Section Public
@@ -73,7 +73,7 @@ Section Public
channels := n;
allocate.if {
- image_data := FAST_ARRAY[UINTEGER_8].create (w*h*n);
+ image_data := FAST_ARRAY(UINTEGER_8).create (w*h*n);
};
);
@@ -111,7 +111,7 @@ Section Public
image_data.item val;
);
- - get_pixels:FAST_ARRAY[UINTEGER_8] <- image_data;
+ - get_pixels:FAST_ARRAY(UINTEGER_8) <- image_data;
- set_size (w,h:INTEGER) <-
@@ -128,7 +128,7 @@ Section Public
parent_image_format := fmt;
);
- - set_data data:FAST_ARRAY[UINTEGER_8] <-
+ - set_data data:FAST_ARRAY(UINTEGER_8) <-
(
image_data := data;
);
diff --git a/opengl/extensions/arb_vertex_buffer_object.li b/opengl/extensions/arb_vertex_buffer_object.li
index fedf865..a609c53 100644
--- a/opengl/extensions/arb_vertex_buffer_object.li
+++ b/opengl/extensions/arb_vertex_buffer_object.li
@@ -67,12 +67,12 @@ Section Public
`ARB_vertex_buffer_object_id`:UINTEGER_32
);
- - genbuffers n:INTEGER :FAST_ARRAY[UINTEGER_32] <-
+ - genbuffers n:INTEGER :FAST_ARRAY(UINTEGER_32) <-
(
+ p:POINTER;
- + result:FAST_ARRAY[UINTEGER_32];
+ + result:FAST_ARRAY(UINTEGER_32);
- result := FAST_ARRAY[UINTEGER_32].create n;
+ result := FAST_ARRAY(UINTEGER_32).create n;
p := result.to_external;
`liglGenBuffersARB(@n, @p)`;
result
@@ -113,7 +113,7 @@ Section Public
`liglDeleteBuffersARB(1, (GLuint*)@id)`;
);
- - delete_buffers ids:FAST_ARRAY[UINTEGER_32] count n:INTEGER <-
+ - delete_buffers ids:FAST_ARRAY(UINTEGER_32) count n:INTEGER <-
(
+ p:POINTER;
diff --git a/opengl/gl_extension.li b/opengl/gl_extension.li
index 04922c3..f1fecb0 100644
--- a/opengl/gl_extension.li
+++ b/opengl/gl_extension.li
@@ -50,12 +50,12 @@ Section Public
- is_supported:BOOLEAN <-
(
- + extensions:NATIVE_ARRAY[CHARACTER];
+ + extensions:NATIVE_ARRAY(CHARACTER);
+ i:INTEGER;
+ result:BOOLEAN;
(extension_names = NULL).if {
- extensions := `glGetString(GL_EXTENSIONS)`:NATIVE_ARRAY[CHARACTER];
+ extensions := `glGetString(GL_EXTENSIONS)`:NATIVE_ARRAY(CHARACTER);
extension_names := STRING.create 256;
{extensions.item i != '\0'}.while_do {
diff --git a/opengl/gl_vertex_array.li b/opengl/gl_vertex_array.li
index b97c9c5..9b29e96 100644
--- a/opengl/gl_vertex_array.li
+++ b/opengl/gl_vertex_array.li
@@ -29,10 +29,10 @@ Section Inherit
Section Public
- + vertex:FAST_ARRAY[REAL_32];
- + texels:FAST_ARRAY[REAL_32];
- + normals:FAST_ARRAY[REAL_32];
- + colors:FAST_ARRAY[REAL_32];
+ + vertex:FAST_ARRAY(REAL_32);
+ + texels:FAST_ARRAY(REAL_32);
+ + normals:FAST_ARRAY(REAL_32);
+ + colors:FAST_ARRAY(REAL_32);
+ vertex_id:UINTEGER_32;
+ texels_id:UINTEGER_32;
@@ -46,10 +46,10 @@ Section Public
- make sz:INTEGER <-
(
- vertex := FAST_ARRAY[REAL_32].create_with_capacity sz;
- texels := FAST_ARRAY[REAL_32].create_with_capacity sz;
- normals := FAST_ARRAY[REAL_32].create_with_capacity sz;
- colors := FAST_ARRAY[REAL_32].create_with_capacity sz;
+ vertex := FAST_ARRAY(REAL_32).create_with_capacity sz;
+ texels := FAST_ARRAY(REAL_32).create_with_capacity sz;
+ normals := FAST_ARRAY(REAL_32).create_with_capacity sz;
+ colors := FAST_ARRAY(REAL_32).create_with_capacity sz;
capacity := sz;
);
@@ -141,7 +141,7 @@ Section Public
index_array.bind;
index_array.draw drawing_mode size capacity;
disable;
- );
+ );
- bind <-
(
@@ -349,7 +349,7 @@ Section Public
normals.add_last z;
);
- - add_normal v:VECTOR3[REAL_32] <-
+ - add_normal v:VECTOR3(REAL_32) <-
(
add_normal3f (v.x, v.y, v.z);
);
@@ -368,22 +368,22 @@ Section Public
colors.add_last b;
);
- - get_vertex_data:FAST_ARRAY[REAL_32] <-
+ - get_vertex_data:FAST_ARRAY(REAL_32) <-
(
vertex
);
- - get_texels_data:FAST_ARRAY[REAL_32] <-
+ - get_texels_data:FAST_ARRAY(REAL_32) <-
(
texels
);
- - get_normals_data:FAST_ARRAY[REAL_32] <-
+ - get_normals_data:FAST_ARRAY(REAL_32) <-
(
normals
);
- - get_colors_data:FAST_ARRAY[REAL_32] <-
+ - get_colors_data:FAST_ARRAY(REAL_32) <-
(
colors
);
diff --git a/opengl/opengl_abstract.li b/opengl/opengl_abstract.li
index 2f5c3da..36a0998 100644
--- a/opengl/opengl_abstract.li
+++ b/opengl/opengl_abstract.li
@@ -193,7 +193,7 @@ Section Public
// Render modes (GL_RENDER (default), GL_SELECT, GL_FEEDBACK)
//
- - begin_selection_in buffer:FAST_ARRAY[UINTEGER_32] size sz:INTEGER <-
+ - begin_selection_in buffer:FAST_ARRAY(UINTEGER_32) size sz:INTEGER <-
(
+ p:POINTER;
@@ -232,17 +232,15 @@ Section Public
);
-
-
Section Private
- get_value val:INTEGER on str:STRING <-
(
- + tmp:NATIVE_ARRAY[CHARACTER];
+ + tmp:NATIVE_ARRAY(CHARACTER);
+ i:INTEGER;
- tmp := `glGetString(@val)`:NATIVE_ARRAY[CHARACTER];
+ tmp := `glGetString(@val)`:NATIVE_ARRAY(CHARACTER);
{tmp.item i != '\0'}.while_do {
// string copy
str.add_last (tmp.item i);
diff --git a/opengl/opengl_specific.li b/opengl/opengl_specific.li
index 9c96c0e..703240c 100644
--- a/opengl/opengl_specific.li
+++ b/opengl/opengl_specific.li
@@ -65,7 +65,7 @@ Section Public
arb_vertex_shader := ARB_VERTEX_SHADER.create;
arb_vertex_shader != NULL
);
-
+
- use_arb_fragment_shader:BOOLEAN <-
(
arb_fragment_shader := ARB_FRAGMENT_SHADER.create;
--
Lisaac library opengl-binding
More information about the Lisaac-commits
mailing list