-/*******************************************************************************
+/*] Copyright (c) 2009-2011, Charles McGarvey [*****************************
+**] All rights reserved.
+*
+* Distributable under the terms and conditions of the 2-clause BSD license;
+* see the file COPYING for a complete text of the license.
+*
+*****************************************************************************/
- 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/Sound.hh>
+#include <moof/log.hh>
+#include <moof/sound.hh>
#include "Heroine.hh"
-#include "Log.hh"
-
+
Heroine::Heroine() :
Character("Heroine") {}
-
-void Heroine::update(Mf::Scalar t, Mf::Scalar dt)
+void Heroine::update(moof::scalar t, moof::scalar dt)
{
Character::update(t, dt);
- Mf::Vector3 at(0.0, 0.0, 0.0);
- const Mf::Vector3 up(0.0, 1.0, 0.0);
+ moof::vector3 at(0.0, 0.0, 0.0);
+ const moof::vector3 up(0.0, 1.0, 0.0);
- if (mState.velocity[0] < 0.0) at[0] = -1.0;
- else at[0] = 1.0;
+ if (state_.velocity[0] < 0.0) at[0] = -1.0;
+ else at[0] = 1.0;
- Mf::Sound::setListenerPosition(Mf::promote(mState.position));
- Mf::Sound::setListenerVelocity(Mf::promote(mState.velocity));
- Mf::Sound::setListenerOrientation(at, up);
+ moof::sound::listener_position(moof::promote(state_.position));
+ moof::sound::listener_velocity(moof::promote(state_.velocity));
+ moof::sound::listener_orientation(at, up);
}
-
-bool Heroine::handleEvent(const Mf::Event& event)
+bool Heroine::handle_event(const moof::event& event)
{
- Mf::Scalar force = 40.0;
+ moof::scalar force = 40.0;
switch (event.type)
{
- case SDL_KEYDOWN:
- if (event.key.keysym.sym == SDLK_a)
- {
- mState.force += Mf::Vector2(-force, 0.0);
- return true;
- }
- else if (event.key.keysym.sym == SDLK_d)
- {
- mState.force += Mf::Vector2(force, 0.0);
- return true;
- }
- else if (event.key.keysym.sym == SDLK_s)
- {
- mState.force += Mf::Vector2(0.0, -force);
- return true;
- }
- else if (event.key.keysym.sym == SDLK_w)
- {
- mState.force += Mf::Vector2(0.0, force);
- return true;
- }
-
- case SDL_KEYUP:
- if (event.key.keysym.sym == SDLK_a)
- {
- mState.force += Mf::Vector2(force, 0.0);
- return true;
- }
- else if (event.key.keysym.sym == SDLK_d)
- {
- mState.force += Mf::Vector2(-force, 0.0);
- return true;
- }
- else if (event.key.keysym.sym == SDLK_s)
- {
- mState.force += Mf::Vector2(0.0, force);
- return true;
- }
- else if (event.key.keysym.sym == SDLK_w)
- {
- mState.force += Mf::Vector2(0.0, -force);
- return true;
- }
+ case SDL_KEYDOWN:
+ if (event.key.keysym.sym == SDLK_a)
+ {
+ state_.force += moof::vector2(-force, 0.0);
+ return true;
+ }
+ else if (event.key.keysym.sym == SDLK_d)
+ {
+ state_.force += moof::vector2(force, 0.0);
+ return true;
+ }
+ else if (event.key.keysym.sym == SDLK_s)
+ {
+ state_.force += moof::vector2(0.0, -force);
+ return true;
+ }
+ else if (event.key.keysym.sym == SDLK_w)
+ {
+ state_.force += moof::vector2(0.0, force);
+ return true;
+ }
+ break;
+
+ case SDL_KEYUP:
+ if (event.key.keysym.sym == SDLK_a)
+ {
+ state_.force += moof::vector2(force, 0.0);
+ return true;
+ }
+ else if (event.key.keysym.sym == SDLK_d)
+ {
+ state_.force += moof::vector2(-force, 0.0);
+ return true;
+ }
+ else if (event.key.keysym.sym == SDLK_s)
+ {
+ state_.force += moof::vector2(0.0, force);
+ return true;
+ }
+ else if (event.key.keysym.sym == SDLK_w)
+ {
+ state_.force += moof::vector2(0.0, -force);
+ return true;
+ }
+ break;
}
return false;
}
-
-/** vim: set ts=4 sw=4 tw=80: *************************************************/
-
projects / chaz / yoink / blobdiff