]> git.itanic.dy.fi Git - sdl-planets/log
sdl-planets
14 years agopoll_events: Quit when requested to quit
Timo Kokkonen [Tue, 30 Mar 2010 17:30:00 +0000 (20:30 +0300)]
poll_events: Quit when requested to quit

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>
14 years agomain.c: Switch to microsecond resolution time source
Timo Kokkonen [Tue, 30 Mar 2010 17:24:45 +0000 (20:24 +0300)]
main.c: Switch to microsecond resolution time source

This is needed if the simulation step lenght is very short.

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>
14 years agoquadtree: Add support to walk through the tree
Timo Kokkonen [Sat, 27 Mar 2010 14:44:06 +0000 (16:44 +0200)]
quadtree: Add support to walk through the tree

An iterator structure can be used to walk only desired parts of the
tree, while the rest of the tree is left untouched.

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>
14 years agoquadtree.c: Add a missing include
Timo Kokkonen [Sat, 27 Mar 2010 08:47:47 +0000 (10:47 +0200)]
quadtree.c: Add a missing include

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>
14 years agoquadtree: Move quadtree_add function in quadtree.c
Timo Kokkonen [Sat, 27 Mar 2010 08:30:47 +0000 (10:30 +0200)]
quadtree: Move quadtree_add function in quadtree.c

The function in question is higly recursive. It is not likely the compiler will
be able to optimize it if it is kept in the header file as an inline function.

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>
14 years agoQuadtree: Initial commit
Timo Kokkonen [Fri, 26 Mar 2010 21:24:44 +0000 (23:24 +0200)]
Quadtree: Initial commit

Add an initial and very basic form of the quadtree implementation. At
this point there is code only for the actual quadtree structure and a
function for adding nodes into the tree.

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>
14 years agomain.c: Make it possible to scale the time step at run time
Timo Kokkonen [Sat, 20 Mar 2010 20:36:35 +0000 (22:36 +0200)]
main.c: Make it possible to scale the time step at run time

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>
14 years agomain.c: Add some alternative keys for zooming
Timo Kokkonen [Sat, 20 Mar 2010 20:13:47 +0000 (22:13 +0200)]
main.c: Add some alternative keys for zooming

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>
14 years agomain.c: Set window caption
Timo Kokkonen [Sat, 20 Mar 2010 20:10:12 +0000 (22:10 +0200)]
main.c: Set window caption

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>
14 years agoplanet.c: Fix minor style issue
Timo Kokkonen [Sat, 20 Mar 2010 15:27:28 +0000 (17:27 +0200)]
planet.c: Fix minor style issue

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>
14 years agorandom.c: Remove unused label
Timo Kokkonen [Sat, 20 Mar 2010 15:25:15 +0000 (17:25 +0200)]
random.c: Remove unused label

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>
14 years agorandom.c: Close file handles, even on error conditions
Timo Kokkonen [Sat, 20 Mar 2010 15:15:20 +0000 (17:15 +0200)]
random.c: Close file handles, even on error conditions

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>
14 years agoFix some compiler warnings
Timo Kokkonen [Sat, 20 Mar 2010 15:09:59 +0000 (17:09 +0200)]
Fix some compiler warnings

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>
14 years agomain.c: Adjust minimum time step
Timo Kokkonen [Sat, 20 Mar 2010 15:07:59 +0000 (17:07 +0200)]
main.c: Adjust minimum time step

50fps might be better than 100fps

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>
14 years agocreate_planets: Remove unneeded debug print
Timo Kokkonen [Sat, 20 Mar 2010 15:07:28 +0000 (17:07 +0200)]
create_planets: Remove unneeded debug print

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>
14 years agomain.c: Define maximum time step
Timo Kokkonen [Sat, 20 Mar 2010 13:29:12 +0000 (15:29 +0200)]
main.c: Define maximum time step

Set it intially to 10ms, which equals to 100fps

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>
14 years agomain.c: Change the command line parameter usage
Timo Kokkonen [Sat, 20 Mar 2010 13:19:23 +0000 (15:19 +0200)]
main.c: Change the command line parameter usage

Allow total mass and the range of the system to be defined from the
command line.

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>
14 years agoGenerate plantes in a "starsystem" like form
Timo Kokkonen [Sat, 20 Mar 2010 13:14:48 +0000 (15:14 +0200)]
Generate plantes in a "starsystem" like form

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>
14 years agorandom.c: Add support for generating floating point random numbers
Timo Kokkonen [Sat, 20 Mar 2010 13:13:54 +0000 (15:13 +0200)]
random.c: Add support for generating floating point random numbers

This will generate numbers from range [0..1)

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>
14 years agogravitize_planets: Fix approximation from the gravity equation
Timo Kokkonen [Sat, 20 Mar 2010 12:08:18 +0000 (14:08 +0200)]
gravitize_planets: Fix approximation from the gravity equation

This was needed when there was no collosions between the planets and
the planets could "explode" when they got too close to each others.

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>
14 years agodraw_planet: Draw circular planets
Timo Kokkonen [Sat, 20 Mar 2010 11:51:40 +0000 (13:51 +0200)]
draw_planet: Draw circular planets

This looks better than square planets, doh...

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>
14 years agoplanet.c: Size of the planet is the planet radius
Timo Kokkonen [Sat, 20 Mar 2010 11:15:18 +0000 (13:15 +0200)]
planet.c: Size of the planet is the planet radius

Thus, rename the 'size' variable to 'radius'.

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>
14 years agomain.c: Move event handling in a separate function
Timo Kokkonen [Sat, 20 Mar 2010 11:11:31 +0000 (13:11 +0200)]
main.c: Move event handling in a separate function

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>
14 years agoMake planet initialization independent from the screen size
Timo Kokkonen [Sat, 20 Mar 2010 10:23:05 +0000 (12:23 +0200)]
Make planet initialization independent from the screen size

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>
14 years agocamera: Make moving the camera relative to the zoom level
Timo Kokkonen [Sat, 20 Mar 2010 10:19:34 +0000 (12:19 +0200)]
camera: Make moving the camera relative to the zoom level

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>
14 years agoAdd support for zooming the camera
Timo Kokkonen [Sat, 20 Mar 2010 10:15:13 +0000 (12:15 +0200)]
Add support for zooming the camera

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>
14 years agoMove camera initialization in camera.c
Timo Kokkonen [Sat, 20 Mar 2010 09:44:49 +0000 (11:44 +0200)]
Move camera initialization in camera.c

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>
14 years agomain.c: Fix minor style issue with the code
Timo Kokkonen [Sun, 7 Mar 2010 16:28:11 +0000 (18:28 +0200)]
main.c: Fix minor style issue with the code

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>
14 years agoImplement a moving camera
Timo Kokkonen [Sun, 7 Mar 2010 16:22:25 +0000 (18:22 +0200)]
Implement a moving camera

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>
14 years agomain.c: Make the window resizable
Timo Kokkonen [Sun, 7 Mar 2010 15:48:46 +0000 (17:48 +0200)]
main.c: Make the window resizable

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>
14 years agomain.c: Simplify the list access a bit
Timo Kokkonen [Sun, 7 Mar 2010 15:25:17 +0000 (17:25 +0200)]
main.c: Simplify the list access a bit

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>
14 years agodraw_planet: Use Better size for the drawing the planet
Timo Kokkonen [Sun, 7 Mar 2010 12:36:47 +0000 (14:36 +0200)]
draw_planet: Use Better size for the drawing the planet

Now the outer dimensions of the planet match to the inner dimensions
of the rectangular. We still don't draw circle planets though..

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>
14 years agoreshape_planet: Better size estimation for the planet
Timo Kokkonen [Sun, 7 Mar 2010 12:35:40 +0000 (14:35 +0200)]
reshape_planet: Better size estimation for the planet

The size is now proprtional to the cubic root of the planet mass.

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>
14 years agomain.c: Read some parameters from the command line
Timo Kokkonen [Sun, 7 Mar 2010 12:14:58 +0000 (14:14 +0200)]
main.c: Read some parameters from the command line

The number of planets and screen resolution can be now changed from
the command line parameters.

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>
14 years agomerge_planets: Don't move the heavier planet when they are merged
Timo Kokkonen [Sun, 7 Mar 2010 12:06:46 +0000 (14:06 +0200)]
merge_planets: Don't move the heavier planet when they are merged

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>
14 years agodraw_planet: Minimum size for a planet should be one pixel
Timo Kokkonen [Sun, 7 Mar 2010 11:59:32 +0000 (13:59 +0200)]
draw_planet: Minimum size for a planet should be one pixel

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>
14 years agomain.c: Print some white space at the end of the status line
Timo Kokkonen [Sun, 7 Mar 2010 11:58:24 +0000 (13:58 +0200)]
main.c: Print some white space at the end of the status line

Without this, the status line looks bit odd due to the remaining
characters from the last line, at least when the line shrinks.

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>
14 years agomain.c: Merge two planets into one at collision point
Timo Kokkonen [Sun, 7 Mar 2010 11:57:59 +0000 (13:57 +0200)]
main.c: Merge two planets into one at collision point

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>
14 years agoplanets: Add function to merge two planets at one
Timo Kokkonen [Sun, 7 Mar 2010 11:56:29 +0000 (13:56 +0200)]
planets: Add function to merge two planets at one

This is used when two planets collide and other planet is merged in
the another one.

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>
14 years agoplanet.c: Add function to reshape the size of the planet
Timo Kokkonen [Sun, 7 Mar 2010 11:55:02 +0000 (13:55 +0200)]
planet.c: Add function to reshape the size of the planet

This will be used when planets can be merged together at collision.

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>
14 years agogravitize_planets: Return true in even of a collision
Timo Kokkonen [Sun, 7 Mar 2010 11:18:19 +0000 (13:18 +0200)]
gravitize_planets: Return true in even of a collision

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>
14 years agoMakefile: Re-enable optimizations
Timo Kokkonen [Sun, 7 Mar 2010 11:15:20 +0000 (13:15 +0200)]
Makefile: Re-enable optimizations

These were accidentally disabled at some point..

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>
14 years agoStore the planets in a linked list
Timo Kokkonen [Sun, 7 Mar 2010 11:14:41 +0000 (13:14 +0200)]
Store the planets in a linked list

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>
14 years agoprint_planet: Also print the size of the planet
Timo Kokkonen [Sun, 7 Mar 2010 11:13:38 +0000 (13:13 +0200)]
print_planet: Also print the size of the planet

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>
14 years agoUtilize lists correctly
Timo Kokkonen [Sun, 7 Mar 2010 11:13:20 +0000 (13:13 +0200)]
Utilize lists correctly

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>
14 years agolist.h: Make it compile outside of the linux kernel tree
Timo Kokkonen [Sun, 7 Mar 2010 11:11:56 +0000 (13:11 +0200)]
list.h: Make it compile outside of the linux kernel tree

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>
14 years agoPrepare for having planets in linked list
Timo Kokkonen [Sat, 6 Mar 2010 20:48:25 +0000 (22:48 +0200)]
Prepare for having planets in linked list

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>
14 years agoAdd list.h
Timo Kokkonen [Sat, 6 Mar 2010 20:36:32 +0000 (22:36 +0200)]
Add list.h

This was taken directly from Linux kernel

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>
14 years agoDraw rectangular planets
Timo Kokkonen [Sat, 6 Mar 2010 18:41:49 +0000 (20:41 +0200)]
Draw rectangular planets

These look bit silly now, but it's easier to draw rectangular planets
instead of round ones..

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>
14 years agomain.c: Clear the window instead of fading it
Timo Kokkonen [Sat, 6 Mar 2010 18:41:06 +0000 (20:41 +0200)]
main.c: Clear the window instead of fading it

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>
14 years agoAdd utils.h
Timo Kokkonen [Sat, 6 Mar 2010 16:40:28 +0000 (18:40 +0200)]
Add utils.h

For random misc utils.

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>
14 years agoLarger window is better
Timo Kokkonen [Sun, 21 Feb 2010 11:48:20 +0000 (13:48 +0200)]
Larger window is better

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>
14 years agoMerge branch 'master' of /home/git/sdl-planets
Timo Kokkonen [Sun, 21 Feb 2010 11:47:07 +0000 (13:47 +0200)]
Merge branch 'master' of /home/git/sdl-planets

Conflicts:
Makefile

14 years agoStyle fixes
Timo Kokkonen [Sun, 21 Feb 2010 10:20:00 +0000 (12:20 +0200)]
Style fixes

No functional changes. These will silence checkpatch.pl warnings

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>
14 years agoMakefile: Add suport for sparse and checkpatch.pl
Timo Kokkonen [Sun, 21 Feb 2010 10:18:15 +0000 (12:18 +0200)]
Makefile: Add suport for sparse and checkpatch.pl

These utils can be used to statically evaluate both code syntax and
style.

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>
14 years agoMakefile: Hide compiler commands
Timo Kokkonen [Sun, 21 Feb 2010 09:56:38 +0000 (11:56 +0200)]
Makefile: Hide compiler commands

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>
14 years agoMakefile: Enable debug symbols
Timo Kokkonen [Sun, 21 Feb 2010 09:54:04 +0000 (11:54 +0200)]
Makefile: Enable debug symbols

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>
14 years agoInitialize last_fps variable before using it
Timo Kokkonen [Sat, 6 Feb 2010 10:07:11 +0000 (12:07 +0200)]
Initialize last_fps variable before using it

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>
14 years agoMerge branch 'remote'
Timo Kokkonen [Sat, 6 Feb 2010 10:05:29 +0000 (12:05 +0200)]
Merge branch 'remote'

Conflicts:
Makefile
main.c

14 years agoOnly exit when esc key is pressed
Timo Kokkonen [Sat, 6 Feb 2010 09:06:39 +0000 (11:06 +0200)]
Only exit when esc key is pressed

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>
14 years agoAdd FPS counter
Timo Kokkonen [Sat, 6 Feb 2010 09:06:13 +0000 (11:06 +0200)]
Add FPS counter

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>
14 years agoMakefile: Also clean dependencies
Timo Kokkonen [Sat, 6 Feb 2010 09:00:41 +0000 (11:00 +0200)]
Makefile: Also clean dependencies

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>
14 years agoMakefile: Prettify compiling messages
Timo Kokkonen [Sat, 6 Feb 2010 09:00:18 +0000 (11:00 +0200)]
Makefile: Prettify compiling messages

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>
14 years agoMoving colourful planets, whoo
Timo Kokkonen [Mon, 1 Feb 2010 20:06:04 +0000 (22:06 +0200)]
Moving colourful planets, whoo

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>
14 years agoMoving colorful planets, whoo!
Timo Kokkonen [Sun, 31 Jan 2010 15:32:04 +0000 (17:32 +0200)]
Moving colorful planets, whoo!

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>