paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-13 10:59:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

* merged

Browse Source
This commit is contained in:
peter 2000-09-03 22:17:17 +00:00
parent cbfd0a67d6
commit a78ac30522
16 changed files with 140 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/opengl/build/gl_w32d.tem
View File

@ -234,7 +234,7 @@ var
function GetProc(handle: HInstance; name: PChar): Pointer; function GetProc(handle: HInstance; name: PChar): Pointer;
begin begin
Result := GetProcAddress(handle, name); Result := GetProcAddress(handle, name);
if (Result = nil) and GLUDumpUnresolvedFunctions then if (Result = nil) and GLDumpUnresolvedFunctions then
WriteLn('Unresolved: ', name); WriteLn('Unresolved: ', name);
end; end;
@ -288,7 +288,13 @@ end.
{ {
$Log$ $Log$
Revision 1.1 2000-09-03 21:25:45 peter Revision 1.2 2000-09-03 22:17:17 peter
* merged
Revision 1.1.2.1 2000/09/03 22:15:06 peter
* typo fix
Revision 1.1 2000/09/03 21:25:45 peter
* new updated version * new updated version
* gtkglarea unit and demo * gtkglarea unit and demo
* win32 opengl headers * win32 opengl headers

2
packages/opengl/build/glut_w32d.tem
View File

@ -45,7 +45,7 @@ var
function GetProc(handle: HInstance; name: PChar): Pointer; function GetProc(handle: HInstance; name: PChar): Pointer;
begin begin
Result := GetProcAddress(handle, name); Result := GetProcAddress(handle, name);
if (Result = nil) and GLUDumpUnresolvedFunctions then if (Result = nil) and GLUTDumpUnresolvedFunctions then
WriteLn('Unresolved: ', name); WriteLn('Unresolved: ', name);
end; end;

13
packages/opengl/examples/glutdemo.pp
View File

@ -10,6 +10,15 @@
{$MODE objfpc} {$MODE objfpc}
{$H+} {$H+}
{$MACRO ON}
{$ifdef win32}
{$define extdecl := stdcall;}
{$endif}
{$ifdef linux}
{$define extdecl := cdecl;}
{$endif}
program GLUTDemo; program GLUTDemo;
uses uses
GL, GLU,GLUT; GL, GLU,GLUT;
@ -60,7 +69,7 @@ begin
end; end;
procedure DisplayWindow; cdecl; procedure DisplayWindow; extdecl
var var
x, y: Integer; x, y: Integer;
begin begin
@ -94,7 +103,7 @@ begin
glutSwapBuffers; glutSwapBuffers;
end; end;
procedure OnTimer(value: Integer); cdecl; procedure OnTimer(value: Integer); extdecl
begin begin
glutPostRedisplay; glutPostRedisplay;
glutTimerFunc(20, @OnTimer, 0); glutTimerFunc(20, @OnTimer, 0);

43
packages/opengl/examples/morph3d.pp
View File

@ -36,6 +36,15 @@ program morph3d;
{$Mode objfpc} {$Mode objfpc}
{$INLINE ON} {$INLINE ON}
{$MACRO ON}
{$ifdef win32}
{$define extdecl := stdcall;}
{$endif}
{$ifdef linux}
{$define extdecl := cdecl;}
{$endif}
{ {
This document is VERY incomplete, but tries to describe the mathematics used This document is VERY incomplete, but tries to describe the mathematics used
in the program. At this moment it just describes how the polyhedra are in the program. At this moment it just describes how the polyhedra are
@ -134,7 +143,7 @@ So the angle is:
} }
uses uses
GL,GLU,GLUT; GL,GLUT;
type type
float = single; float = single;
@ -700,7 +709,7 @@ begin
end; end;
procedure do_draw;cdecl; procedure do_draw;extdecl
begin begin
glClear( GL_COLOR_BUFFER_BIT or GL_DEPTH_BUFFER_BIT ); glClear( GL_COLOR_BUFFER_BIT or GL_DEPTH_BUFFER_BIT );
@ -727,13 +736,13 @@ begin
end; end;
procedure do_idle;cdecl; procedure do_idle;extdecl
begin begin
glutPostRedisplay(); glutPostRedisplay();
end; end;
procedure do_reshape(width,height:longint);cdecl; procedure do_reshape(width,height:longint);extdecl
begin begin
WindW:=width; WindW:=width;
WindH:=height; WindH:=height;
@ -843,9 +852,9 @@ begin
end; end;
procedure do_key(k:char;x,y:integer);cdecl; procedure do_key(k:char;x,y:integer);extdecl
begin begin
{ case k of case k of
'1' : _object:=1; '1' : _object:=1;
'2' : _object:=2; '2' : _object:=2;
'3' : _object:=3; '3' : _object:=3;
@ -855,11 +864,23 @@ begin
#13 : smooth:=not smooth; #13 : smooth:=not smooth;
#27 : halt(0); #27 : halt(0);
end; end;
pinit;} pinit;
end; end;
begin begin
if not GLInitialized then
begin
writeln('OpenGL Not Availble');
halt(1);
end;
if not GLUTInitialized then
begin
writeln('GLUT Not Availble');
halt(1);
end;
writeln('Morph 3D - Shows morphing platonic polyhedra'); writeln('Morph 3D - Shows morphing platonic polyhedra');
writeln('Author: Marcelo Fernandes Vianna (vianna@cat.cbpf.br)'); writeln('Author: Marcelo Fernandes Vianna (vianna@cat.cbpf.br)');
writeln(' [1] - Tetrahedron'); writeln(' [1] - Tetrahedron');
@ -919,7 +940,13 @@ begin
end. end.
{ {
$Log$ $Log$
Revision 1.1 2000-09-03 21:25:45 peter Revision 1.2 2000-09-03 22:17:17 peter
* merged
Revision 1.1.2.1 2000/09/03 22:10:47 peter
* fixed for win32
Revision 1.1 2000/09/03 21:25:45 peter
* new updated version * new updated version
* gtkglarea unit and demo * gtkglarea unit and demo
* win32 opengl headers * win32 opengl headers

2
packages/opengl/win32/Makefile
View File

@ -190,7 +190,7 @@ endif
# Targets # Targets
override UNITOBJECTS+=gl glut glaux gl_sl glut_sl glaux_sl gtkglarea override UNITOBJECTS+=gl glut glaux gl_sl glut_sl glaux_sl
# Clean # Clean

2
packages/opengl/win32/Makefile.fpc
View File

@ -9,7 +9,7 @@ defaulttarget=win32
packages=gtk packages=gtk
[targets] [targets]
units=gl glut glaux gl_sl glut_sl glaux_sl gtkglarea units=gl glut glaux gl_sl glut_sl glaux_sl
[dirs] [dirs]
fpcdir=../../.. fpcdir=../../..

20
packages/opengl/win32/gl.pp
View File

@ -1490,7 +1490,7 @@ var
function GetProc(handle: HInstance; name: PChar): Pointer; function GetProc(handle: HInstance; name: PChar): Pointer;
begin begin
Result := GetProcAddress(handle, name); Result := GetProcAddress(handle, name);
if (Result = nil) and GLUDumpUnresolvedFunctions then if (Result = nil) and GLDumpUnresolvedFunctions then
WriteLn('Unresolved: ', name); WriteLn('Unresolved: ', name);
end; end;
@ -2032,7 +2032,13 @@ end.
{ {
$Log$ $Log$
Revision 1.1 2000-09-03 21:25:46 peter Revision 1.2 2000-09-03 22:17:17 peter
* merged
Revision 1.1.2.1 2000/09/03 22:14:40 peter
* regenerated
Revision 1.1 2000/09/03 21:25:45 peter
* new updated version * new updated version
* gtkglarea unit and demo * gtkglarea unit and demo
* win32 opengl headers * win32 opengl headers
@ -2049,10 +2055,10 @@ end.
{ {
$Log$ $Log$
Revision 1.1 2000-09-03 21:25:46 peter Revision 1.2 2000-09-03 22:17:17 peter
* new updated version * merged
* gtkglarea unit and demo
* win32 opengl headers Revision 1.1.2.1 2000/09/03 22:14:40 peter
* morph3d demo * regenerated
} }

10
packages/opengl/win32/gl_sl.pp
View File

@ -1485,10 +1485,10 @@ END.
{ {
$Log$ $Log$
Revision 1.1 2000-09-03 21:25:46 peter Revision 1.2 2000-09-03 22:17:17 peter
* new updated version * merged
* gtkglarea unit and demo
* win32 opengl headers Revision 1.1.2.1 2000/09/03 22:14:40 peter
* morph3d demo * regenerated
} }

10
packages/opengl/win32/glaux.pp
View File

@ -504,10 +504,10 @@ end.
{ {
$Log$ $Log$
Revision 1.1 2000-09-03 21:25:46 peter Revision 1.2 2000-09-03 22:17:18 peter
* new updated version * merged
* gtkglarea unit and demo
* win32 opengl headers Revision 1.1.2.1 2000/09/03 22:14:41 peter
* morph3d demo * regenerated
} }

10
packages/opengl/win32/glaux_sl.pp
View File

@ -504,10 +504,10 @@ end.
{ {
$Log$ $Log$
Revision 1.1 2000-09-03 21:25:46 peter Revision 1.2 2000-09-03 22:17:18 peter
* new updated version * merged
* gtkglarea unit and demo
* win32 opengl headers Revision 1.1.2.1 2000/09/03 22:14:41 peter
* morph3d demo * regenerated
} }

20
packages/opengl/win32/glu.pp
View File

@ -349,11 +349,11 @@ end.
{ {
$Log$ $Log$
Revision 1.1 2000-09-03 21:25:46 peter Revision 1.2 2000-09-03 22:17:18 peter
* new updated version * merged
* gtkglarea unit and demo
* win32 opengl headers Revision 1.1.2.1 2000/09/03 22:14:41 peter
* morph3d demo * regenerated
Revision 1.1 2000/07/13 06:34:18 michael Revision 1.1 2000/07/13 06:34:18 michael
+ Initial import + Initial import
@ -366,10 +366,10 @@ end.
{ {
$Log$ $Log$
Revision 1.1 2000-09-03 21:25:46 peter Revision 1.2 2000-09-03 22:17:18 peter
* new updated version * merged
* gtkglarea unit and demo
* win32 opengl headers Revision 1.1.2.1 2000/09/03 22:14:41 peter
* morph3d demo * regenerated
} }

18
packages/opengl/win32/glu_sl.pp
View File

@ -260,7 +260,13 @@ end.
{ {
$Log$ $Log$
Revision 1.1 2000-09-03 21:25:46 peter Revision 1.2 2000-09-03 22:17:18 peter
* merged
Revision 1.1.2.1 2000/09/03 22:14:41 peter
* regenerated
Revision 1.1 2000/09/03 21:25:45 peter
* new updated version * new updated version
* gtkglarea unit and demo * gtkglarea unit and demo
* win32 opengl headers * win32 opengl headers
@ -277,10 +283,10 @@ end.
{ {
$Log$ $Log$
Revision 1.1 2000-09-03 21:25:46 peter Revision 1.2 2000-09-03 22:17:18 peter
* new updated version * merged
* gtkglarea unit and demo
* win32 opengl headers Revision 1.1.2.1 2000/09/03 22:14:41 peter
* morph3d demo * regenerated
} }

12
packages/opengl/win32/glut.pp
View File

@ -302,7 +302,7 @@ var
function GetProc(handle: HInstance; name: PChar): Pointer; function GetProc(handle: HInstance; name: PChar): Pointer;
begin begin
Result := GetProcAddress(handle, name); Result := GetProcAddress(handle, name);
if (Result = nil) and GLUDumpUnresolvedFunctions then if (Result = nil) and GLUTDumpUnresolvedFunctions then
WriteLn('Unresolved: ', name); WriteLn('Unresolved: ', name);
end; end;
@ -416,10 +416,10 @@ end.
{ {
$Log$ $Log$
Revision 1.1 2000-09-03 21:25:46 peter Revision 1.2 2000-09-03 22:17:18 peter
* new updated version * merged
* gtkglarea unit and demo
* win32 opengl headers Revision 1.1.2.1 2000/09/03 22:14:41 peter
* morph3d demo * regenerated
} }

10
packages/opengl/win32/glut_sl.pp
View File

@ -312,10 +312,10 @@ end.
{ {
$Log$ $Log$
Revision 1.1 2000-09-03 21:25:46 peter Revision 1.2 2000-09-03 22:17:18 peter
* new updated version * merged
* gtkglarea unit and demo
* win32 opengl headers Revision 1.1.2.1 2000/09/03 22:14:41 peter
* morph3d demo * regenerated
} }

20
packages/opengl/win32/glx.pp
View File

@ -237,11 +237,11 @@ end.
{ {
$Log$ $Log$
Revision 1.1 2000-09-03 21:25:46 peter Revision 1.2 2000-09-03 22:17:18 peter
* new updated version * merged
* gtkglarea unit and demo
* win32 opengl headers Revision 1.1.2.1 2000/09/03 22:14:41 peter
* morph3d demo * regenerated
Revision 1.1 2000/07/13 06:34:18 michael Revision 1.1 2000/07/13 06:34:18 michael
+ Initial import + Initial import
@ -254,10 +254,10 @@ end.
{ {
$Log$ $Log$
Revision 1.1 2000-09-03 21:25:46 peter Revision 1.2 2000-09-03 22:17:18 peter
* new updated version * merged
* gtkglarea unit and demo
* win32 opengl headers Revision 1.1.2.1 2000/09/03 22:14:41 peter
* morph3d demo * regenerated
} }

18
packages/opengl/win32/glx_sl.pp
View File

@ -166,7 +166,13 @@ end.
{ {
$Log$ $Log$
Revision 1.1 2000-09-03 21:25:46 peter Revision 1.2 2000-09-03 22:17:18 peter
* merged
Revision 1.1.2.1 2000/09/03 22:14:41 peter
* regenerated
Revision 1.1 2000/09/03 21:25:45 peter
* new updated version * new updated version
* gtkglarea unit and demo * gtkglarea unit and demo
* win32 opengl headers * win32 opengl headers
@ -183,10 +189,10 @@ end.
{ {
$Log$ $Log$
Revision 1.1 2000-09-03 21:25:46 peter Revision 1.2 2000-09-03 22:17:18 peter
* new updated version * merged
* gtkglarea unit and demo
* win32 opengl headers Revision 1.1.2.1 2000/09/03 22:14:41 peter
* morph3d demo * regenerated
} }