summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan C <ianc@noddybox.co.uk>2011-01-14 15:14:14 +0000
committerIan C <ianc@noddybox.co.uk>2011-01-14 15:14:14 +0000
commit44525767b158902ea0183b4e5e36973bea010a08 (patch)
tree5e677e61168aa0e2ebedd04255bccbcf475846b1
parentbb652fd56a4515acecae5631641d3a0ac2909bef (diff)
Development checkin
-rw-r--r--config/config40
-rw-r--r--src/graviface.h (renamed from include/graviface.h)1
2 files changed, 21 insertions, 20 deletions
diff --git a/config/config b/config/config
index 288fdb8..1238e11 100644
--- a/config/config
+++ b/config/config
@@ -10,29 +10,13 @@
#
-# This defines the GFX driver. If left undefined then the data generated is
-# simply dumped to stdout.
+# This defines the output driver. If left undefined then the data generated is
+# simply dumped to stdout in a simple XML format.
#
# Drivers can have their own personal configuration section elsewhere.
#
-[gfx]
-driver = drivers/sdl-gl.so
-
-
-# Example driver configuration.
-#
-[sdl-gl]
-width = 800
-height = 600
-fullscreen = yes
-
-
-# This defines any textures to load, and the names applied to them. Supported
-# image formats will depend on the loaded GFX driver.
-#
-[textures]
-example1 = files/file.png
-example2 = files/file.png
+[output]
+driver = sdl-gl.so
# This defines the bodies that will be placed in the simulation and the
@@ -50,3 +34,19 @@ example2 = files/file.png
G = 1
body = sun
body = planet
+
+
+# Example sdl-gl driver configuration.
+#
+[sdl-gl]
+width = 800
+height = 600
+fullscreen = yes
+
+[sdl-gl-textures]
+example1 = files/file1.png
+example2 = files/file2.png
+
+[sdl-gl-texture-mappings]
+sun = example1
+planet = example2
diff --git a/include/graviface.h b/src/graviface.h
index a632e3d..a34f7b5 100644
--- a/include/graviface.h
+++ b/src/graviface.h
@@ -84,6 +84,7 @@ typedef struct
typedef struct
{
mpz_t id;
+ const char *name;
} grav_public_mass_t;