First version of states::ingame and the machine

You can start the program via build/insula. It'll show the terrain and
it allows camera movement. That'll basically be the freelook mode
later.

Author: phillemann

graphics/shader.cpp

@@ -71,3 +71,5 @@ insula::graphics::shader::program()
 {
 	return program_;
 }
+
+insula::graphics::shader::~shader() {}

graphics/shader.hpp

@@ -65,6 +65,8 @@ class shader
 
 	sge::renderer::glsl::program_ptr const
 	program();
+
+	~shader();
 private:
 	typedef
 	fcppt::container::map

graphics/stats.cpp

@@ -52,3 +52,5 @@ insula::graphics::stats::update_and_render(
 		sge::font::align_v::top,
 		sge::font::flags::none);
 }
+
+insula::graphics::stats::~stats() {}

graphics/stats.hpp

@@ -31,6 +31,8 @@ class stats
 	void
 	update_and_render(
 		fcppt::string const &additional_stats = FCPPT_TEXT(""));
+
+	~stats();
 private:
 	sge::time::frames_counter counter_;
 	sge::renderer::device_ptr const renderer_;

height_map/object.cpp

@@ -311,6 +311,8 @@ insula::height_map::object::height_scaling() const
 		height_scaling_;
 }
 
+insula::height_map::object::~object() {}
+
 void
 insula::height_map::object::regenerate(
 	graphics::scalar const &cell_size,

height_map/object.hpp

@@ -67,6 +67,8 @@ class object
 
 	graphics::scalar
 	height_scaling() const;
+
+	~object();
 private:
 	graphics::camera::object const &camera_;
 	sge::renderer::device_ptr const renderer_;

insula.cpp

@@ -1,5 +1,6 @@
 #include "create_variables_map.hpp"
 #include "machine.hpp"
+#include "states/ingame.hpp"
 #include "help_needed.hpp"
 #include <sge/time/timer.hpp>
 #include <sge/time/second.hpp>
@@ -16,6 +17,8 @@ try
 			argc,
 			argv));
 
+	m.initiate();
+
 	sge::time::timer frame_timer(
 		sge::time::second(1));
 	while (m.running())

machine.cpp

@@ -248,3 +248,5 @@ insula::machine::running() const
 {
 	return running_;
 }
+
+insula::machine::~machine() {}

machine.hpp

@@ -58,6 +58,8 @@ class machine
 	// it's false)
 	bool 
 	running() const;
+
+	~machine();
 private:
 	bool running_;
 	sge::parse::json::object config_file_;

media/config.json

@@ -0,0 +1,18 @@
+{
+	"music" : 
+	{  
+		"events" : 
+		{
+		},
+		"random" :
+		[
+		],
+		"crossfade_seconds" : 5
+	},
+	"sounds" : 
+	{
+		"events" : 
+		{
+		}
+	}
+}

model/object.cpp

@@ -271,3 +271,5 @@ insula::model::object::bounding_box() const
 {
 	return bounding_box_;
 }
+
+insula::model::object::~object() {}

model/object.hpp

@@ -44,6 +44,8 @@ class object
 
 	sge::model::object_ptr const
 	raw();
+
+	~object();
 private:
 	sge::model::object_ptr const raw_;
 	graphics::camera::object const &camera_;

music_controller.cpp

@@ -144,6 +144,8 @@ insula::music_controller::stop()
 		silence_source_);
 }
 
+insula::music_controller::~music_controller() {}
+
 void
 insula::music_controller::do_play(
 	sge::audio::sound::base_ptr b)

music_controller.hpp

@@ -40,8 +40,9 @@ class music_controller
 	play_random();
 
 	void
-
 	stop();
+
+	~music_controller();
 private:
 	typedef
 	std::map

notizen.org

@@ -608,7 +608,7 @@ Sollte eine Klasse sein, die ein Model reinbekommt, sowie einen Parameter, der a
 ** TODO Sounds [0/1]
 *** TODO Looping von Musik fixen
 Man kann bei Streamingsounds loop einstellen, das funzt aber nicht richtig
-** TODO Diverses [20/26]
+** TODO Diverses [21/27]
 *** DONE Framecounter einbauen
 		 CLOSED: [2010-07-30 Fri 18:24]
 *** DONE gizmo_init fixen
@@ -710,7 +710,8 @@ wurde.
 Wieso ist die Farbe ganz unten nicht korrekt, wenn man einen weniger
 detailreichen Skydome erzeugt?
 *** TODO Textur tst spiegelverkehrt
-*** TODO sge::model Flag einbauen, ob y und z gedreht werden sollen
+*** DONE sge::model Flag einbauen, ob y und z gedreht werden sollen
+		 CLOSED: [2010-08-21 Sat 17:06]
 *** TODO physics von model abkoppeln
 
 Erstelle eine Funktion, die eine shape aus einem sge::model::object,

physics/debug_drawer.cpp

@@ -270,3 +270,5 @@ insula::physics::debug_drawer::render()
 			vb_->size()),
 		sge::renderer::nonindexed_primitive_type::line);
 }
+
+insula::physics::debug_drawer::~debug_drawer() {}

physics/debug_drawer.hpp

@@ -92,6 +92,8 @@ class debug_drawer
 
 	void
 	render();
+
+	~debug_drawer();
 private:
 	typedef
 	std::vector

skydome/object.cpp

@@ -404,3 +404,5 @@ insula::skydome::object::gradient() const
 {
 	return gradient_;
 }
+
+insula::skydome::object::~object() {}

skydome/object.hpp

@@ -46,6 +46,8 @@ class object
 
 	insula::skydome::gradient const
 	gradient() const;
+
+	~object();
 private:
 	graphics::camera::object const &camera_;
 	sge::renderer::device_ptr const renderer_;

sound_controller.cpp

@@ -88,3 +88,5 @@ insula::sound_controller::update()
 {
 	pool_.update();
 }
+
+insula::sound_controller::~sound_controller() {}

sound_controller.hpp

@@ -58,6 +58,8 @@ class sound_controller
 	// deleted properly
 	void
 	update();
+
+	~sound_controller();
 private:
 	typedef
 	std::map

states/ingame.cpp

@@ -11,9 +11,12 @@
 #include "../physics/vec3.hpp"
 #include "../graphics/box.hpp"
 #include "../console/object.hpp"
+#include "../events/tick.hpp"
+#include "../events/render.hpp"
 #include <sge/console/object.hpp>
 #include <fcppt/math/box/structure_cast.hpp>
 #include <fcppt/text.hpp>
+#include <fcppt/io/cout.hpp>
 
 insula::states::ingame::ingame(
 	my_context ctx)
@@ -104,7 +107,7 @@ insula::states::ingame::react(
 		sge::renderer::state::cull_mode::back);
 	water_->render();
 
-	if (toggle_physics_debug_)
+	if (physics_debug_)
 	{
 		physics_debug_drawer_.setDebugMode(
 			btIDebugDraw::DBG_DrawWireframe);
@@ -113,3 +116,5 @@ insula::states::ingame::react(
 
 	return discard_event();
 }
+
+insula::states::ingame::~ingame() {}

states/ingame.hpp

@@ -12,10 +12,14 @@
 #include "../physics/debug_drawer.hpp"
 #include "../water/object_ptr.hpp"
 #include "../water/console_proxy.hpp"
-#include "../events/tick_fwd.hpp"
-#include "../events/render_fwd.hpp"
+// Why do these have to be completely defined? I thought forward
+// declaring them was enough o_O
+#include "../events/tick.hpp"
+#include "../events/render.hpp"
 #include <boost/statechart/state.hpp>
 #include <boost/statechart/result.hpp>
+#include <boost/statechart/custom_reaction.hpp>
+#include <boost/mpl/list/list10.hpp>
 
 namespace insula
 {
@@ -30,6 +34,14 @@ class ingame
 	public boost::statechart::state<ingame,machine>
 {
 public:
+	typedef 
+	boost::mpl::list2
+	<
+		boost::statechart::custom_reaction<events::tick>,
+		boost::statechart::custom_reaction<events::render>
+	> 
+	reactions;
+
 	explicit
 	ingame(
 		my_context);
@@ -43,6 +55,9 @@ class ingame
 	boost::statechart::result
 	react(
 		events::render const &);
+
+	// We've got pointers to forward-declared objects here
+	~ingame();
 private:
 	// The heightmap has to be initialized first because it's needed for
 	// the physics world