X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FTitleLayer.cc;h=9e33c361f532b0345fc52910375e0be3dfbde477;hp=afe13e91771a5f3ac2e7b7edb3639e2a1a124d91;hb=c78934a448d0126709fccec3d5a636b3baa87da4;hpb=4f9eb9259092994de9690cf12f11437c35a6791e

diff --git a/src/TitleLayer.cc b/src/TitleLayer.cc
index afe13e9..9e33c36 100644
--- a/src/TitleLayer.cc
+++ b/src/TitleLayer.cc
@@ -1,76 +1,65 @@
 
-/*******************************************************************************
-
- Copyright (c) 2009, Charles McGarvey
- All rights reserved.
- 
- Redistribution   and   use  in  source  and  binary  forms,  with  or  without
- modification, are permitted provided that the following conditions are met:
- 
-   * Redistributions  of  source  code  must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
-   * Redistributions  in binary form must reproduce the above copyright notice,
-     this  list of conditions and the following disclaimer in the documentation
-     and/or other materials provided with the distribution.
- 
- THIS  SOFTWARE  IS  PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND  ANY  EXPRESS  OR  IMPLIED  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED.  IN  NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR  ANY  DIRECT,  INDIRECT,  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES  (INCLUDING,  BUT  NOT  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES;  LOSS  OF  USE,  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED  AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR  TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-#include <Moof/Core.hh>
+/*]  Copyright (c) 2009-2010, Charles McGarvey  [**************************
+**]  All rights reserved.
+*
+* vi:ts=4 sw=4 tw=75
+*
+* Distributable under the terms and conditions of the 2-clause BSD license;
+* see the file COPYING for a complete text of the license.
+*
+**************************************************************************/
+
 #include <Moof/OpenGL.hh>
-#include <Moof/Transition.hh>
 
 #include "GameLayer.hh"
 #include "TitleLayer.hh"
 
 
-void TitleLayer::addedToCore()
+void TitleLayer::didAddToView()
 {
 	mFadeIn.init(0.0, 1.0);
 	mFadeIn.reset(0.1);
 
-	mGameLayer = GameLayer::alloc();
+	//mGameLayer = GameLayer::alloc();
 }
 
 void TitleLayer::update(Mf::Scalar t, Mf::Scalar dt)
 {
 	mFadeIn.update(t, dt);
+	Mf::View::update(t, dt);
 }
 
 void TitleLayer::draw(Mf::Scalar alpha) const
 {
 	glClearColor(0.0, 0.0, mFadeIn.getState(alpha), 1.0);
 	glClear(GL_COLOR_BUFFER_BIT);
+	Mf::View::draw(alpha);
 }
 
 bool TitleLayer::handleEvent(const Mf::Event& event)
 {
+	if (Mf::View::handleEvent(event)) return true;
+
 	switch (event.type)
 	{
 		case SDL_KEYUP:
 			if (event.key.keysym.sym == SDLK_ESCAPE)
 			{
-				break;
+				parent().stop();
+				return true;
 			}
 
-			Mf::LayerP titleLayer = Mf::core.pop(this);
+			mGameLayer = GameLayer::alloc();
+			parent().addChild(mGameLayer);
+
+			parent().removeChild(this);
 
-			Mf::Lerp interp(0.1);
-			interp.init(0.0, 1.0);
+			//Mf::Lerp interp(0.1);
+			//interp.init(0.0, 1.0);
 
-			Mf::Transition<Mf::Lerp>::Ptr transition =
-				Mf::Transition<Mf::Lerp>::alloc(mGameLayer, titleLayer, interp);
-			Mf::core.push(transition);
+			//Mf::Transition<Mf::Lerp>::Ptr transition =
+				//Mf::Transition<Mf::Lerp>::alloc(mGameLayer, titleLayer,
+												//interp);
 
 			return true;
 	}
@@ -78,6 +67,3 @@ bool TitleLayer::handleEvent(const Mf::Event& event)
 	return false;
 }
 
-
-/** vim: set ts=4 sw=4 tw=80: *************************************************/
-