Author: maustin
Date: Tue Nov 1 21:53:29 2005
New Revision: 10321
Modified:
trunk/libraries/inertia/inertia-events.dylan
trunk/libraries/inertia/inertia-exports.dylan
trunk/libraries/inertia/inertia-geometry.dylan
trunk/libraries/inertia/inertia-gl-utils.dylan
trunk/libraries/inertia/inertia-main.dylan
trunk/libraries/inertia/inertia-shapes.dylan
trunk/libraries/inertia/inertia-widgets.dylan
trunk/libraries/inertia/inertia.layout
trunk/libraries/inertia/tests/inertia-test-exports.dylan
trunk/libraries/inertia/tests/inertia-test-main.dylan
trunk/libraries/libopengl-dylan/opengl-glu.intr
Log:
job: 7268
job: 7269
A few more opengl tweaks, more functionality in Inertia
Modified: trunk/libraries/inertia/inertia-events.dylan
==============================================================================
--- trunk/libraries/inertia/inertia-events.dylan (original)
+++ trunk/libraries/inertia/inertia-events.dylan Tue Nov 1 21:53:29 2005
@@ -1,9 +1,13 @@
module: inertia-shapes
-synopsis: Core UI shapes
+synopsis: Core events
author: Mike Austin
copyright: Copyright (C) 2005 Mike L. Austin. All rights reserved.
license: MIT/BSD, see LICENCE.txt for details
+//
+// inertia-events.dylan
+//
+
define class <event> (<object>)
end;
@@ -30,8 +34,16 @@
// event method definitions
//
----------------------------------------------------------------------------------------------
//
+// send-event is called from the windows event callbacks with the topmost
level shape, the *screen*,
+// and is handled by classes in different ways depending on the type of shape
and the type of event.
+
+define generic send-event (shape :: <shape>, event :: <event>, data ::
<object>) => (result :: <shape>);
+
+// <shape> handles converting between coordinate systems, locating the shape
in the children
+// hierarchy, and finally sending an on-mouse-event() to the shape.
+
define method send-event (shape :: <shape>, event :: <mouse-event>, button ::
<integer>) => (result :: <shape>)
- //format-out ("send-event (<shape>, <mouse-event>)\n");
+ format-out ("send-event (%=, %=, %=)\n", shape, event, button);
block (return)
for (child in shape.children)
let x = event.origin.point-x - child.origin.point-x;
@@ -67,50 +79,26 @@
//
----------------------------------------------------------------------------------------------
//
-define method send-event (screen :: <screen>, event :: <mouse-event>, button
:: <integer>)
+// <screen> handles mouse grabbing and setting the mouse location in
mouse-origin
+
+define method send-event (screen :: <screen>, event :: <mouse-event>, button
:: <integer>) => (result :: <shape>)
screen.mouse-origin := event.origin;
next-method ();
end;
-define method send-event (screen :: <screen>, event :: <mouse-down-event>,
button :: <integer>)
- *grabbed-shape* := next-method (screen, event, button);
- *grabbed-shape*.first-mouse := event.origin - *grabbed-shape*.origin;
- //*grabbed-shape*.first-mouse := event.origin -
*grabbed-shape*.screen-origin;
-end;
-
-define method send-event (screen :: <screen>, event :: <mouse-down-event>,
button == $GLUT-RIGHT-BUTTON)
- *menu*.origin := event.origin - *menu*.extent / 2.0;
-end;
-
-define method send-event (screen :: <screen>, event :: <mouse-up-event>,
button :: <integer>)
- *grabbed-shape*.mouse-mode := #"normal";
- on-mouse-event (*grabbed-shape*, event, 0);
- let shape = *grabbed-shape*;
- *grabbed-shape* := #f;
-end;
-
-define method send-event (screen :: <screen>, event :: <mouse-drag-event>,
button :: <integer>)
- if (*grabbed-shape*.mouse-mode == #"gripper")
- //let delta = event.origin - *grabbed-shape*.origin;
- let delta = event.origin - *grabbed-shape*.screen-origin;
-
- block ()
- *grabbed-shape*.z-angle := atan2 (delta.point-y, delta.point-x) / ($PI /
180.0);
- exception (<error>)
- // Don't care if x and y are both 0
- end;
- *grabbed-shape*.z-scale := point-length (delta) / 50.0;
- else
- *grabbed-shape*.origin := event.origin - *grabbed-shape*.first-mouse;
- end;
- on-mouse-event (*grabbed-shape*, event, 0);
- *grabbed-shape*;
+define method send-event (screen :: <screen>, event :: <mouse-down-event>,
button :: <integer>) => (result :: <shape>)
+ screen.grabbed-shape := next-method (screen, event, button);
+ screen.grabbed-shape;
end;
-define method send-event (screen :: <screen>, event :: <mouse-drag-event>,
button == $GLUT-RIGHT-BUTTON)
+define method send-event (screen :: <screen>, event :: <mouse-drag-event>,
button :: <integer>) => (result :: <shape>)
+ event.origin := event.origin - screen.grabbed-shape.screen-origin;
+ on-mouse-event (screen.grabbed-shape, event, button);
+ screen.grabbed-shape;
end;
-define method send-event (screen :: <screen>, event :: <mouse-up-event>,
button == $GLUT-RIGHT-BUTTON)
- *menu*.origin := *screen*.origin;
+define method send-event (screen :: <screen>, event :: <mouse-up-event>,
button :: <integer>) => (result :: <shape>)
+ on-mouse-event (screen.grabbed-shape, event, button);
+ screen.grabbed-shape;
end;
Modified: trunk/libraries/inertia/inertia-exports.dylan
==============================================================================
--- trunk/libraries/inertia/inertia-exports.dylan (original)
+++ trunk/libraries/inertia/inertia-exports.dylan Tue Nov 1 21:53:29 2005
@@ -1,9 +1,13 @@
module: dylan-user
-synopsis: Core UI shapes
+synopsis: Inertia exports
author: Mike Austin
copyright: Copyright (C) 2005 Mike L. Austin. All rights reserved.
license: MIT/BSD, see LICENCE.txt for details
+//
+// inertia-exports.dylan
+//
+
define library inertia
use common-dylan;
use random;
@@ -79,7 +83,8 @@
mouse-origin, mouse-origin-setter,
<shape-menu>,
<shape-editor>,
- <push-button>;
+ <push-button>,
+ <window>;
export
<event>,
Modified: trunk/libraries/inertia/inertia-geometry.dylan
==============================================================================
--- trunk/libraries/inertia/inertia-geometry.dylan (original)
+++ trunk/libraries/inertia/inertia-geometry.dylan Tue Nov 1 21:53:29 2005
@@ -1,5 +1,5 @@
module: inertia-geometry
-synopsis: Core UI shapes
+synopsis: Core geometry
author: Mike Austin
copyright: Copyright (C) 2005 Mike L. Austin. All rights reserved.
license: MIT/BSD, see LICENCE.txt for details
@@ -36,18 +36,4 @@
define method print-object (point :: <point>, stream :: <stream>) => ()
format (stream, "here\n");
end;
-
-/*
-define method point-x (point :: <point>) => (<integer>)
- point.x;
-end;
-
-define method point-y (point :: <point>) => (<integer>)
- point.y;
-end;
-*/
-
-//define method point-x-setter (point :: <point>, x :: <double-float>) => ()
-// point.point-x := x;
-//end;
Modified: trunk/libraries/inertia/inertia-gl-utils.dylan
==============================================================================
--- trunk/libraries/inertia/inertia-gl-utils.dylan (original)
+++ trunk/libraries/inertia/inertia-gl-utils.dylan Tue Nov 1 21:53:29 2005
@@ -1,5 +1,5 @@
module: inertia-gl-utils
-synopsis: Core UI shapes
+synopsis: OpenGL utilities
author: Mike Austin
copyright: Copyright (C) 2005 Mike L. Austin. All rights reserved.
license: MIT/BSD, see LICENCE.txt for details
Modified: trunk/libraries/inertia/inertia-main.dylan
==============================================================================
--- trunk/libraries/inertia/inertia-main.dylan (original)
+++ trunk/libraries/inertia/inertia-main.dylan Tue Nov 1 21:53:29 2005
@@ -1,11 +1,11 @@
module: inertia
-synopsis: Core UI shapes
+synopsis: Inertia initializations
author: Mike Austin
copyright: Copyright (C) 2005 Mike L. Austin. All rights reserved.
license: MIT/BSD, see LICENCE.txt for details
//
-// inertia-mail.dylan
+// inertia-main.dylan
//
c-include("/usr/include/w32api/GL/glu.h");
@@ -14,14 +14,12 @@
//define variable reshape = callback-method (width :: <integer>, height ::
<integer>) => ();
glMatrixMode ($GL-PROJECTION);
glLoadIdentity ();
- //gluPerspective (60.0, as(<double-float>, width) / as(<double-float>,
height), 0.5, 10.0);
gluOrtho2D (0.0, as(<double-float>, width), as(<double-float>, height),
0.0);
glMatrixMode ($GL-MODELVIEW);
glViewport (0, 0, width, height);
end;
define variable display :: <function> = callback-method () => ();
- //format-out ("display\n");
glClear ($GL-COLOR-BUFFER-BIT + $GL-DEPTH-BUFFER-BIT);
glLoadIdentity ();
glTranslate (0.375, 0.375, 0.0);
@@ -76,10 +74,6 @@
glutMouseFunc (mouse-callback);
glutMotionFunc (motion-callback);
- //gluTessCallback (*tess-object*, $GLU-BEGIN, polygon-begin);
- //gluTessCallback (*tess-object*, $GLU-VERTEX, polygon-vertex);
- //gluTessCallback (*tess-object*, $GLU-END, polygon-end);
-
glClearColor (1.0s0, 1.0s0, 1.0s0, 1.0s0);
glEnable ($GL-BLEND); glBlendFunc ($GL-SRC-ALPHA, $GL-ONE-MINUS-SRC-ALPHA);
@@ -87,19 +81,23 @@
define variable *tess-object* = gluNewTess ();
- call-out ("gluTessCallback", void:, ptr: *tess-object*.raw-value, int:
100100, ptr: c-expr( ptr: "glBegin"));
- call-out ("gluTessCallback", void:, ptr: *tess-object*.raw-value, int:
100101, ptr: c-expr( ptr: "glVertex3dv"));
- call-out ("gluTessCallback", void:, ptr: *tess-object*.raw-value, int:
100102, ptr: c-expr( ptr: "glEnd"));
+ call-out ("gluTessCallback", void:, ptr: *tess-object*.raw-value, int:
100100, ptr: c-expr (ptr: "glBegin"));
+ call-out ("gluTessCallback", void:, ptr: *tess-object*.raw-value, int:
100101, ptr: c-expr (ptr: "glVertex3dv"));
+ call-out ("gluTessCallback", void:, ptr: *tess-object*.raw-value, int:
100102, ptr: c-expr (ptr: "glEnd"));
define variable *screen* = make (<screen>, width: 800.0, height: 600.0);
- define variable *menu* = make (<shape-menu>, x: 100.0, y: 100.0, width:
100.0, height: 180.0);
+ define variable *menu* = make (<shape-menu>, width: 100.0, height: 180.0);
define variable *editor* = make (<shape-editor>, width: 500.0, height:
500.0);
+ define variable *window* = make (<window>, x: 400.0, y: 200.0, caption:
"Window 1");
+ add-child (*window*, make (<push-button>, caption: "Press Me", x: 190.0, y:
165.0));
add-child (*editor*, make (<polygon>, x: 200.0, y: 200.0));
add-child (*editor*, make (<spinning-polygon>, x: 300.0, y: 300.0));
add-child (*editor*, make (<rectangle>, x: 400.0, y: 400.0));
- add-child (*editor*, make (<push-button>, caption: "Press Me"));
+ add-child (*editor*, make (<push-button>, caption: "Another"));
+ add-child (*screen*, make (<window>, x: 400.0, y: 200.0, caption: "Window
2"));
add-child (*screen*, *editor*);
+ add-child (*screen*, *window*);
add-child (*screen*, *menu*);
end;
Modified: trunk/libraries/inertia/inertia-shapes.dylan
==============================================================================
--- trunk/libraries/inertia/inertia-shapes.dylan (original)
+++ trunk/libraries/inertia/inertia-shapes.dylan Tue Nov 1 21:53:29 2005
@@ -4,12 +4,16 @@
copyright: Copyright (C) 2005 Mike L. Austin. All rights reserved.
license: MIT/BSD, see LICENCE.txt for details
+//
+// inertia-shapes.dylan
+//
+
//
----------------------------------------------------------------------------------------------
//
// all class definitions
//
----------------------------------------------------------------------------------------------
//
define variable *angle* = 0.0;
-define variable *grabbed-shape* = #f;
+//define variable *grabbed-shape* = #f;
define variable timer :: <function> = callback-method (n :: <integer>) => ();
glutTimerFunc (n, timer, n);
@@ -27,7 +31,6 @@
virtual slot point-y :: <double-float>;
slot z-angle :: <double-float> = 0.0;
slot z-scale :: <double-float> = 1.0;
- slot first-mouse;
slot mouse-mode = #"normal";
slot line-width = 3.0;
slot fill-color = vector (random-float (0.5) + 0.5, random-float (0.5) +
0.5, random-float (0.5) + 0.5, 0.9);
@@ -64,6 +67,7 @@
define class <screen> (<rectangle>)
inherited slot fill-color = vector (1.0, 1.0, 1.0, 1.0);
slot mouse-origin :: <point>;
+ slot grabbed-shape;
end;
define method class-name (screen :: <screen>) "<screen>" end;
@@ -123,6 +127,11 @@
shape.children := add! (shape.children, child);
end;
+define method remove-child (shape :: <shape>, child :: <shape>) => ()
+ child.parent := shape;
+ shape.children := remove! (shape.children, child);
+end;
+
define method draw-shape (shape :: <shape>) => ()
glPushMatrix ();
glTranslate (shape.origin.point-x, shape.origin.point-y, 0.0);
@@ -175,8 +184,8 @@
glColor (1.0, 1.0, 1.0, 0.6); glVertex (shape.extent.point-x,
0.0, 0.0);
glColor (0.0, 0.0, 0.0, 0.0); glVertex ( 0.0,
shape.extent.point-y / 2.0, 0.0);
- glColor (0.0, 0.0, 0.0, 0.15); glVertex ( 0.0,
shape.extent.point-y, 0.0);
- glColor (0.0, 0.0, 0.0, 0.15); glVertex (shape.extent.point-x,
shape.extent.point-y, 0.0);
+ glColor (0.0, 0.0, 0.0, 0.1); glVertex ( 0.0,
shape.extent.point-y, 0.0);
+ glColor (0.0, 0.0, 0.0, 0.1); glVertex (shape.extent.point-x,
shape.extent.point-y, 0.0);
glColor (0.0, 0.0, 0.0, 0.0); glVertex (shape.extent.point-x,
shape.extent.point-y / 2.0, 0.0);
glEnd ();
end;
@@ -418,11 +427,8 @@
glPopMatrix ();
end;
-define method draw-effects (menu :: <shape-menu-center>)
-end;
-
-define method draw-outline (menu :: <shape-menu-center>) => ()
-end;
+define method draw-effects (menu :: <shape-menu-center>) end;
+define method draw-outline (menu :: <shape-menu-center>) end;
//
----------------------------------------------------------------------------------------------
//
@@ -440,11 +446,8 @@
glPopMatrix ();
end;
-define method draw-effects (menu :: <shape-menu>)
-end;
-
-define method draw-outline (menu :: <shape-menu>) => ()
-end;
+define method draw-effects (menu :: <shape-menu>) end;
+define method draw-outline (menu :: <shape-menu>) end;
define method draw-centered-string (x, y, string :: <string>)
local draw-string (x, y, string)
Modified: trunk/libraries/inertia/inertia-widgets.dylan
==============================================================================
--- trunk/libraries/inertia/inertia-widgets.dylan (original)
+++ trunk/libraries/inertia/inertia-widgets.dylan Tue Nov 1 21:53:29 2005
@@ -1,20 +1,30 @@
module: inertia-shapes
-synopsis: Core UI shapes
+synopsis: Core UI widgets
author: Mike Austin
copyright: Copyright (C) 2005 Mike L. Austin. All rights reserved.
license: MIT/BSD, see LICENCE.txt for details
//
-// inertia-widgets
+// inertia-widgets.dylan
//
+// A <widget> is a shape that more closely resembles a standard control, such
as a button, window
+// or scroll-bar.
+
define class <widget> (<rectangle>)
+ inherited slot line-width = 1.0;
+ inherited slot line-color = vector (0.5, 0.5, 0.5, 1.0);
end;
+// A <shape-editor> is used to edit shape geometries. It defines a few
send-event so that it can
+// capture mouse events.
+
define class <shape-editor> (<widget>)
inherited slot line-width = 1.0;
//inherited slot fill-color = vector (1.0, 1.0, 1.0, 1.0);
- inherited slot line-color = vector (0.25, 0.25, 0.25, 1.0);
+ inherited slot line-color = vector (0.5, 0.5, 0.5, 1.0);
+ slot grabbed-shape :: <shape>;
+ slot first-mouse :: <point>;
end;
define class <label> (<widget>)
@@ -26,15 +36,40 @@
define class <push-button> (<button>)
inherited slot line-width = 1.0;
inherited slot fill-color = vector (0.9, 0.9, 0.9, 1.0);
- inherited slot line-color = vector (0.4, 0.4, 0.4, 1.0);
+ inherited slot line-color = vector (0.5, 0.5, 0.5, 1.0);
+ slot caption :: <string> = "", init-keyword: caption:;
//inherited slot extent = make (<point>, x: 100.0, y: 25.0);
keyword width: = 100.0;
keyword height: = 25.0;
- slot caption :: <string> = "", init-keyword: caption:;
end;
define method class-name (button :: <push-button>) "<push-button>" end;
+define class <title-bar> (<widget>)
+ inherited slot fill-color = vector (0.75, 0.87, 1.0, 1.0);
+ slot first-mouse :: <point>;
+end;
+
+define method class-name (button :: <title-bar>) "<title-bar>" end;
+
+define class <window> (<widget>)
+ inherited slot line-width = 1.0;
+ inherited slot fill-color = vector (0.95, 0.95, 0.95, 1.0);
+ inherited slot line-color = vector (0.5, 0.5, 0.5, 1.0);
+ slot caption :: <string> = "", init-keyword: caption:;
+ keyword width: = 300.0;
+ keyword height: = 200.0;
+end;
+
+define method class-name (button :: <window>) "<window>" end;
+
+define method initialize (window :: <window>, #rest init-args, #key) => ()
+ next-method ();
+ add-child (window, make (<title-bar>, width: 300.0, height: 25.0));
+end;
+
+//
----------------------------------------------------------------------------------------------
//
+// push-button methods definitions
//
----------------------------------------------------------------------------------------------
//
define method draw-overlay (shape :: <shape>, menu :: <push-button>)
@@ -46,13 +81,90 @@
glPopMatrix ();
end;
-define method xsend-event
- (shape :: <shape-editor>, event :: <mouse-event>, button :: <integer>)
+//
----------------------------------------------------------------------------------------------
//
+// title-bar methods definitions
+//
----------------------------------------------------------------------------------------------
//
+
+define method draw-overlay (shape :: <shape>, menu :: <title-bar>)
+ next-method ();
+ glColor (0.0, 0.0, 0.0, 1.0);
+ glPushMatrix ();
+ glTranslate (shape.extent.point-x / 2.0, shape.extent.point-y / 2.0, 0.0);
+ draw-centered-string (0, 5, shape.parent.caption);
+ glPopMatrix ();
+end;
+
+define method on-mouse-event (title-bar :: <title-bar>, event ::
<mouse-down-event>, button == $GLUT-LEFT-BUTTON)
+ title-bar.first-mouse := event.origin;
+ next-method ();
+end;
+
+//define method on-mouse-event (title-bar :: <title-bar>, event ::
<mouse-drag-event>, button == $left-button)
+define method on-mouse-event (title-bar :: <title-bar>, event ::
<mouse-drag-event>, button == $GLUT-LEFT-BUTTON)
+ title-bar.parent.origin := title-bar.parent.origin + (event.origin -
title-bar.first-mouse);
+ next-method ();
+end;
+
+//
----------------------------------------------------------------------------------------------
//
+// window methods definitions
+//
----------------------------------------------------------------------------------------------
//
+
+define method send-event
+ (window :: <window>, event :: <mouse-down-event>, button :: <integer>)
+ => (result :: <shape>)
+ remove-child (window.parent, window);
+ add-child (window.parent, window);
+ next-method ();
+end;
+
+//
----------------------------------------------------------------------------------------------
//
+// shape-editor methods definitions
+//
----------------------------------------------------------------------------------------------
//
+
+define method send-event
+ (editor :: <shape-editor>, event :: <mouse-down-event>, button ==
$GLUT-LEFT-BUTTON)
+ => (result :: <shape>)
+ editor.grabbed-shape := next-method ();
+ editor.first-mouse := event.origin - editor.grabbed-shape.origin;
+ editor;
+end;
+
+define method send-event
+ (editor :: <shape-editor>, event :: <mouse-down-event>, button ==
$GLUT-RIGHT-BUTTON)
=> (result :: <shape>)
- format-out ("send-event (<shape-editor>)\n");
- shape;
+ *menu*.origin := event.origin - *menu*.extent / 2.0;
+ editor;
end;
-define method xdraw-shape (editor :: <shape-editor>) => ()
+define method on-mouse-event
+ (editor :: <shape-editor>, event :: <mouse-drag-event>, button ==
$GLUT-LEFT-BUTTON)
+ => ()
+ if (editor.grabbed-shape.mouse-mode == #"gripper")
+ let delta = event.origin - editor.grabbed-shape.screen-origin;
+
+ block ()
+ editor.grabbed-shape.z-angle := atan2 (delta.point-y, delta.point-x) /
($PI / 180.0);
+ exception (<error>)
+ // Don't care if x and y are both 0
+ end;
+ editor.grabbed-shape.z-scale := point-length (delta) / 50.0;
+ else
+ editor.grabbed-shape.origin := event.origin - editor.first-mouse;
+ end;
+ editor;
+end;
+
+define method on-mouse-event
+ (editor :: <shape-editor>, event :: <mouse-up-event>, button :: <integer>)
+ => (result :: <shape>)
+ editor.grabbed-shape.mouse-mode := #"normal";
+ editor;
+end;
+
+define method send-event
+ (editor :: <shape-editor>, event :: <mouse-up-event>, button ==
$GLUT-RIGHT-BUTTON)
+ => (result :: <shape>)
+ *menu*.origin := *screen*.origin;
+ editor;
end;
Modified: trunk/libraries/inertia/inertia.layout
==============================================================================
--- trunk/libraries/inertia/inertia.layout (original)
+++ trunk/libraries/inertia/inertia.layout Tue Nov 1 21:53:29 2005
@@ -1,20 +1,20 @@
[Editor_0]
-CursorCol=1
-CursorRow=1
+CursorCol=19
+CursorRow=8
TopLine=1
LeftChar=1
-Open=1
+Open=0
Top=0
[Editor_1]
CursorCol=1
-CursorRow=6
+CursorRow=39
TopLine=1
LeftChar=1
-Open=1
+Open=0
Top=0
[Editor_2]
-CursorCol=1
-CursorRow=6
+CursorCol=5
+CursorRow=34
TopLine=1
LeftChar=1
Open=1
@@ -34,27 +34,27 @@
Open=0
Top=0
[Editor_5]
-CursorCol=11
-CursorRow=1
+CursorCol=24
+CursorRow=8
TopLine=1
LeftChar=1
Open=0
Top=0
[Editor_6]
-CursorCol=12
-CursorRow=1
+CursorCol=8
+CursorRow=8
TopLine=1
LeftChar=1
Open=0
Top=0
[Editors]
-Order=0,7,1,10,9,2,11
+Order=11,2,10
Focused=11
[Editor_7]
-Open=1
+Open=0
Top=0
-CursorCol=1
-CursorRow=6
+CursorCol=28
+CursorRow=2
TopLine=1
LeftChar=1
[Editor_8]
@@ -65,23 +65,23 @@
TopLine=1
LeftChar=1
[Editor_10]
-CursorCol=1
-CursorRow=2
-TopLine=1
+CursorCol=5
+CursorRow=91
+TopLine=49
LeftChar=1
Open=1
Top=0
[Editor_9]
-Open=1
+Open=0
Top=0
-CursorCol=1
-CursorRow=6
+CursorCol=15
+CursorRow=1
TopLine=1
LeftChar=1
[Editor_11]
Open=1
Top=1
-CursorCol=1
-CursorRow=6
-TopLine=1
+CursorCol=20
+CursorRow=50
+TopLine=17
LeftChar=1
Modified: trunk/libraries/inertia/tests/inertia-test-exports.dylan
==============================================================================
--- trunk/libraries/inertia/tests/inertia-test-exports.dylan (original)
+++ trunk/libraries/inertia/tests/inertia-test-exports.dylan Tue Nov 1
21:53:29 2005
@@ -1,8 +1,12 @@
module: dylan-user
-synopsis: Core UI shapes
+synopsis: Inertia-test exports
author: Mike Austin
copyright: Copyright (C) 2005 Mike L. Austin. All rights reserved.
license: MIT/BSD, see LICENCE.txt for details
+
+//
+// inertia-test-exports.dylan
+//
define library inertia-test
use common-dylan;
Modified: trunk/libraries/inertia/tests/inertia-test-main.dylan
==============================================================================
--- trunk/libraries/inertia/tests/inertia-test-main.dylan (original)
+++ trunk/libraries/inertia/tests/inertia-test-main.dylan Tue Nov 1
21:53:29 2005
@@ -1,5 +1,5 @@
module: inertia-test
-synopsis: Core UI shapes
+synopsis: Inertia test program
author: Mike Austin
copyright: Copyright (C) 2005 Mike L. Austin. All rights reserved.
license: MIT/BSD, see LICENCE.txt for details
Modified: trunk/libraries/libopengl-dylan/opengl-glu.intr
==============================================================================
--- trunk/libraries/libopengl-dylan/opengl-glu.intr (original)
+++ trunk/libraries/libopengl-dylan/opengl-glu.intr Tue Nov 1 21:53:29 2005
@@ -6,9 +6,12 @@
define interface
#include "GL/glu.h",
name-mapper: minimal-name-mapping,
+ exclude: {"gluUnProject4"},
// Generally useful mappings:
map: {"char*" => <byte-string>},
equate: {"char*" => <c-string>};
+ //pointer "GLdouble*" => <c-double-vector>, superclasses: {<c-vector>};
+ pointer "GLdouble*" => <GLdouble*>, superclasses: {<c-vector>};
end interface;
--
Gd-chatter mailing list
Gd-chatter@xxxxxxxxxxxxxxxx
https://gauss.gwydiondylan.org/mailman/listinfo/gd-chatter
|
