Removed FpsCounter, changed FrameManager's constructor.

psde · Jun 27, 2010 · 3293297 · 3293297
1 parent 6e76c5d
commit 3293297
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 322 deletions.
diff --git a/FpsCounter/.gitignore b/FpsCounter/.gitignore
diff --git a/FpsCounter/FpsCounter_VS100.vcxproj b/FpsCounter/FpsCounter_VS100.vcxproj
diff --git a/FpsCounter/FpsCounter_VS100.vcxproj.filters b/FpsCounter/FpsCounter_VS100.vcxproj.filters
diff --git a/FpsCounter/FpsCounter_VS90.vcproj b/FpsCounter/FpsCounter_VS90.vcproj
diff --git a/FpsCounter/README.md b/FpsCounter/README.md
diff --git a/Frames/FrameManager.cpp b/Frames/FrameManager.cpp
@@ -60,11 +60,11 @@ void FrameSet::deleteWidget(Widget* widget) {
 	delete widget;
 }
 
-FrameManager::FrameManager(Gosu::Graphics* graphics, Gosu::Input* input, const std::wstring& setname):
+FrameManager::FrameManager(Gosu::Graphics& graphics, Gosu::Input& input, const std::wstring& setname):
 	pimpl(new Impl)
 {
-	pimpl->graphics = graphics;
-	pimpl->input = input;
+	pimpl->graphics = &graphics;
+	pimpl->input = &input;
 	pimpl->currentSet = new FrameSet(setname);
 	pimpl->namedSets[setname] = pimpl->currentSet;
 	currentSet().activate();
@@ -100,7 +100,7 @@ FrameSet::~FrameSet() {
 	pimpl->textInputWidget = NULL;
 }
 
-bool FrameManager::spawn(Gosu::Graphics* graphics, Gosu::Input* input, const std::wstring& setname) {
+bool FrameManager::spawn(Gosu::Graphics& graphics, Gosu::Input& input, const std::wstring& setname) {
 	if (FrameManager::gManager != NULL)
 		return false;
 	FrameManager::gManager = new FrameManager(graphics, input, setname);

diff --git a/Frames/FrameManager.hpp b/Frames/FrameManager.hpp
@@ -46,15 +46,15 @@ namespace GosuEx {
 			boost::scoped_ptr<Impl> pimpl;
 			static FrameManager* gManager;
 
-			FrameManager(Gosu::Graphics* graphics, Gosu::Input* input, const std::wstring& setname);
+			FrameManager(Gosu::Graphics& graphics, Gosu::Input& input, const std::wstring& setname);
 			~FrameManager();
 		public:
 			// Get the singleton
 			static FrameManager& singleton();
 			// Get the root widget
 			static Widget& root();
 			// Spawn the manager. This is required before any action is performed.
-			static bool spawn(Gosu::Graphics* graphics, Gosu::Input* input, const std::wstring& setname = L"default");
+			static bool spawn(Gosu::Graphics& graphics, Gosu::Input& input, const std::wstring& setname = L"default");
 			// Call this in ~Window.
 			static void despawn();
 			// Sets

diff --git a/README.md b/README.md
@@ -2,13 +2,13 @@ EXTENSIONS
 ==========
 <dl>
 <dt>Data</dt>
-<dd>Data is an easy interface to store digital data (i.e. savegames or other things). It provides functionality to compress the serialized data using zlib. The stored data can then either be sent with a Gosu::Socket or be stored in a file. For  file storages there are predefined functions available. This is a library based extension.</dd>
-<dt>FpsCounter</dt>
-<dd>Easy to use header-only fps counter</dd>
+<dd>Data is an easy interface to store digital data (i.e. savegames or other things). It provides functionality to compress the serialized data using zlib. The stored data can then either be sent with a Gosu::Socket or be stored in a file. For file storages there are predefined functions available. Library.</dd>
+<dt>FPSCounter</dt>
+<dd>Easy to use FPS counter class. Header-only.</dd>
 <dt>Shader</dt>
-<dd>Provides simple ways to load, run and debug shaders with gosu, header-only</dd>
+<dd>Provides simple ways to load, run and debug shaders with gosu. Header-only</dd>
 <dt>Frames</dt>
-<dd>Widgets for user interfaces. Easy to use (real now!). Not finished yet but quite stable and working.</dd>
+<dd>Widgets that can be used to build an user interface pretty fast and pretty easy in Gosu. Library.</dd>
 </dl>
 
 EXAMPLES