Commit Graph

25 Commits

Author SHA1 Message Date
Julien Fischer
81e2d33789 Replace use of I/O globals in OpenGL maze example.
extras/graphics/samples/maze/maze.m:
    As above, use mutables intead of the I/O globals.

extras/graphics/samples/maze/globals.m:
    Delete this module; it is no longer required.
2022-03-20 16:29:01 +11:00
Julien Fischer
12731885e5 Update OpenGL maze example.
extras/graphics/samples/maze/maze.m:
    Use the new random number generator framework.

    Seed the random number generator using the system RNG, if
    the user does not provide a seed.

    Use the list shuffling code from the standard library.
2022-03-20 16:08:20 +11:00
Julien Fischer
f3d0812f4b Simplify OpenGL maze example.
extras/graphics/samples/maze/maze.m:
    As above.
2022-01-23 15:39:01 +11:00
Julien Fischer
03c441fa8a Update programming style in OpenGL maze example.
Fix Makefiles for OpenGL examples on macOS.

extras/graphics/samples/maze.m:
extras/graphics/samples/globals.m:
    Update programming style.

    Replace tabs with spaces.

extras/graphics/samples/gears/Mmakefile.MacOSX:
extras/graphics/samples/maze/Mmakefile.MacOSX:
    Set header includes for the C compiler.

    Add a "run" target that sets DYLD_LIBRARY_PATH appropriately
    for running the examples in situ.
2022-01-23 14:49:50 +11:00
Fabrice Nicol
3180f3197d Fix compilation of OpenGL example. 2022-01-05 14:53:35 +11:00
Paul Bone
fc4b3ff196 Remove .cvsignore files
Remove old .cvsignore files, moving their contents to .gitignore files.
There are now no .cvsignore files in the repository.

I've also sorted some .gitignore files and avoided repeating a pattern in a
subdirectory's .gitignore file when it is already mentioned in the parent
.gitignore file.
2017-04-04 12:05:56 +10:00
Julien Fischer
e7010327d9 Delete references to picreg.
browser/interactive_query.m:
extras/dynamic_linking/Mmakefile:
extras/graphics/mercury_glut/Mmakefile:
extras/graphics/mercury_glut/Mmakefile.MacOSX:
extras/graphics/samples/calc/Makefile:
extras/graphics/samples/gears/Mmakefile:
extras/graphics/samples/maze/Mmakefile:
extras/graphics/samples/pent/Mmakefile:
extras/morphine/non-regression-tests/Mmakefile:
extras/morphine/source/collect.op:
    As above.
2016-04-26 14:03:04 +10:00
Zoltan Somogyi
d33273d033 Tell vim not to expand tabs in Makefiles.
This file-specific setting will override a default setting of expandtabs
in $HOME/.vimrc.

*/Makefile:
*/Mmakefile:
    As above.

tests/hard_coded/.gitignore:
    Don't ignore the purity subdir. This ignore must have been left over
    from when purity.m was a test in hard_coded, not hard_coded/purity,
    and it ignored an executable, not a directory.
2015-01-08 22:07:29 +11:00
Julien Fischer
aff3343c68 Fix more compilation errors in extras.
extras/trailed_update/tr_store.m:
	Conform to runtime changes.

extras/gator/genotype.m:
extras/gator/phenotype.m:
extras/graphics/samples/maze/maze.m:
extras/trailed_update/samples/interpreter.m:
	Conform to standard library changes.
2014-02-06 03:31:59 +11:00
Julien Fischer
1fbaa8f97c Conform to the recent change to the argument ordering of map.set/4.
Branches: main

extras/graphics/samples/maze/globals.m:
	Conform to the recent change to the argument ordering of map.set/4.
2011-05-18 03:52:34 +00:00
Julien Fischer
1b63613bfb Fix a bug in the OpenGL maze example.
extras/graphics/samples/maze/maze.m:
	Fix some code that didn't confrom to the current representation of
	the maze.  (This wasn't caught at compile-time because of the use
	of dynamic typing in this example.)
2008-11-27 03:42:37 +00:00
Julien Fischer
368df5703e Make the globals field in the I/O state non-unique.
Estimated hours taken: 0.5
Branches: main

Make the globals field in the I/O state non-unique.  There is an obvious
flaw in the unique version in that you can obtain multiple references
to a unique object just by calling the get_globals/3 predicate twice.
Also, the uniqueness aspect is rarely ever useful; most code that uses
it just ends up call unsafe_promise_unique/2.

library/io.m:
	Make the globals field in the I/O state non-unique.

NEWS:
	Mention this change.

compiler/globals.m:
extras/graphics/samples/maze/globals.m:
tests/hard_coded/io_globals_deadlock.m:
	Conform to the above change.
2007-02-11 04:05:45 +00:00
Julien Fischer
456d23953a Update the OpenGL samples to conform with recent standard library
Estimated hours taken: 0.1
Branches: main

Update the OpenGL samples to conform with recent standard library
changes.

extras/graphics/samples/gears/gears.m:
extras/graphics/samples/maze/maze.m:
extras/graphics/samples/maze/globals.m:
	Conform to recent library changes.

extras/graphics/mercury_glut/Mmakefile:
extras/graphics/mercury_opengl/Mmakefile:
extras/graphics/samples/gears/Mmakefile:
extras/graphics/samples/maze/Mmakefile:
	Update the list of X libraries required by Mesa.
2006-03-30 02:52:45 +00:00
Julien Fischer
aeca8fd712 Provide an example of how to use an initialise declaration in a library
Estimated hours taken: 0.1
Branches: main

Provide an example of how to use an initialise declaration in a library
binding.

extras/graphics/mercury_glut/glut.m:
	Use an initialise declaration to automatically initialise the GLUT
	binding.

extras/graphics/samples/gears/gears.m:
extras/graphics/samples/maze/maze.m:
	Conform to the above change.
2005-10-06 09:25:23 +00:00
Julien Fischer
cf0e6bc496 Make the OpenGL/GLUT bindings compatible with OS X.
Estimated hours taken: 3
Branches: main, release

Make the OpenGL/GLUT bindings compatible with OS X.

extras/graphics/mercury_opengl/mogl.m:
extras/graphics/mercury_opengl/mglu.m:
extras/graphics/mercury_glut/glut*.m:
	Make sure the appropriate header files are included on OS X
	systems.

	Remove some unecessary imports and change the imports so that
	they are one-per-line.

	Workaround a problem with Apple's OpenGL implementation.

extras/graphics/mercury_glut/README:
extras/graphics/mercury_opengl/README:
	Refer users to Mmakefile.MacOSX for instructions on how to build
	the binding on OS X.

extras/graphics/mercury_opengl/Mmakefile.MacOSX:
extras/graphics/mercury_glut/Mmakefile.MacOSX:
	New file.  OS X specific Mmakefile for the GLUT binding.

extras/graphics/samples/gears/*.m:
	Remove unecessary module imports.  Import modules
	one-per-line.

extras/graphics/*/.cvsignore:
	Add .cvsignore files.
2005-06-29 05:21:45 +00:00
Julien Fischer
d90e0150db Convert the opengl maze demo to use glut rather than mtogl.
Estimated hours taken: 0.5 + unknown amount of time a while back
Branches: main

Convert the opengl maze demo to use glut rather than mtogl.
(It's more useful in this form since mtogl doesn't really work
anymore).

extras/graphics/samples/maze/maze.m:
extras/graphics/samples/maze/globals.m:
	Use glut rather than mtgol.

	Fix a problem where the maze wasn't resizing
	properly when the window was resized.

	Add a keyboard handler to make it easier to
	quit.

	Various syntax cleanups.

extras/graphics/samples/maze/Mmakefile:
	Use glut rather than mtogl and tcl/tk.
2005-01-20 04:50:22 +00:00
Fergus Henderson
4d9f101e33 Delete extraneous space after backslash,
Estimated hours taken: 0.1
Branches: main

extras/graphics/samples/maze/Mmakefile:
	Delete extraneous space after backslash,
	so that the backslash is treated as a line continuation marker.
2003-08-14 03:09:57 +00:00
Fergus Henderson
95050e9d28 Delete extraneous space after backslash,
Estimated hours taken: 0.1
Branches: main

extras/graphics/samples/maze/Mmakefile:
	Delete extraneous space after backslash,
	so that the backslash is treated as a line continuation marker.
2003-08-14 03:08:50 +00:00
Julien Fischer
15b576701c Remove dependency between mercury_opengl and mercury_tcltk by making
Estimated hours taken: 14.
Branches: main.

Remove dependency between mercury_opengl and mercury_tcltk by making
mtogl a separate library.

Modify togl so that it works with Tcl/Tk 8.0.5
(XXX It doesn't work (easily) with versions of Tcl/Tk greater than 8.0,
 we probably ought to consider using togl 1.6 at some point).

Make a number of small changes (mainly adding casts and missing MR_* prefixes)
to prevent compiler warnings.

extras/graphics/README:
	Mention the `mtogl' package.

extras/graphics/mercury_opengl/mercury_opengl.m:
extras/graphics/mercury_opengl/mglu.m:
extras/graphics/mercury_opengl/mogl.m:
	Remove mtogl from mercury_opengl package.
	Define quadric using pragma foreign_type
	Add some missing MR_* prefixes.

extras/graphics/mercury_opengl/mtogl:
	Remove references to header files that are no longer generated
	by the compiler.
	Use the new foreign language interface.
	Add some missing MR_* prefixes.

extras/graphics/mercury_opengl/togl.c:
	Allow the use of tk version 8.0.5
extras/graphics/mercury_opengl/tkInt8.0p5.h:
	New file.  (This is a part of tk)

extras/graphics/mercury_opengl/Mmakefile:
	Update mmakefile to reflect above changes.

extras/graphics/mercury_opengl/README:
	Mention mtogl.

extras/graphics/samples/calc/calc.m:
	Add some missing underscores; this prevents compiler warnings
	when compiling with intermodule-optimization enabled.

extras/graphics/samples/maze/Mmakefile:
extras/graphics/samples/pent/Mmakefile:
	Update mmakefiles to reflect above changes.
2003-08-13 05:54:33 +00:00
Simon Taylor
da2e0433c6 Use C2INITARGS or MLFLAGS instead of C2INITFLAGS.
Estimated hours taken: 0.25
Branches: main

bytecode/Mmakefile:
compiler/Mmakefile:
extras/aditi/Mmakefile:
extras/curses/sample/Mmakefile:
extras/graphics/samples/calc/Mmakefile:
extras/graphics/samples/maze/Mmakefile:
extras/graphics/samples/pent/Mmakefile:
extras/morphine/non-regression-tests/Mmakefile:
samples/c_interface/simpler_c_calls_mercury/Mmakefile:
samples/c_interface/simpler_cplusplus_calls_mercury/Mmakefile:
tests/benchmarks/Mmakefile:
tests/debugger/Mmakefile:
tests/debugger/declarative/Mmakefile:
tests/hard_coded/Mmakefile:
	Use C2INITARGS or MLFLAGS instead of C2INITFLAGS.
2001-12-19 15:08:30 +00:00
Tyson Dowd
1b3227a1d3 Update the README file to accurately describe the directory.
Estimated hours taken: 0.5

extras/README:
	Update the README file to accurately describe the directory.

samples/maze/globals.m:
	Add the copyright message.
1998-09-29 05:57:19 +00:00
Tyson Dowd
037e0a752f Clean up samples to use the library versions of the graphics
Estimated hours taken: 3

samples/calc/Mmakefile:
samples/maze/Mmakefile:
samples/maze/globals.m:
samples/maze/maze.m:
	Clean up samples to use the library versions of the graphics
	packages.
1998-09-06 08:22:10 +00:00
Fergus Henderson
87788d9f14 Rename Mmake' as Mmakefile', since using the name `Mmake'
Estimated hours taken: 0.25

*/Mmake:
	Rename `Mmake' as `Mmakefile', since using the name `Mmake'
	causes problems on case-insensitive file systems.
1997-09-29 17:56:36 +00:00
Thomas Conway
8d79000cf8 Place various bits of sample code in the public domain.
Estimated hours taken: 0.1

Place various bits of sample code in the public domain.

extras/complex_numbers/samples/fft.m:
extras/graphics/samples/calc/calc.m:
extras/graphics/samples/maze/maze.m:
samples/ultra_sub.m:
	place the source in the public domain.
1997-09-11 22:08:56 +00:00
Thomas Conway
d3fffdb9ab A sample program for the OpenGL stuff.
Estimated hours taken: somewhere between 1 and 100

graphics/samples/maze:
	A sample program for the OpenGL stuff.
1997-07-18 05:04:26 +00:00