X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FHud.cc;h=5687ac88bdb1c27ab2f998775662ef951255c670;hp=b336b28f14a67558698bdc52a55de092259d8998;hb=ecfc966a7b2d8e37c7f5e29227d5ba4d00e54ded;hpb=a4debfe4a5f5d339410788971b698ba00cb7f09c diff --git a/src/Hud.cc b/src/Hud.cc index b336b28..5687ac8 100644 --- a/src/Hud.cc +++ b/src/Hud.cc @@ -1,155 +1,140 @@ -/******************************************************************************* - - 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 +/*] 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. +* +*****************************************************************************/ + +#include +#include +#include +#include #include "Hud.hh" -#include - -ProgressBar::ProgressBar(const Mf::Tilemap& tilemap, Mf::Tilemap::Index index) : - progress_(0.0), - tilemap_(tilemap) +ProgressBar::ProgressBar(const moof::sprite& tilemap, int index) : + mProgress(0.0), + mTilemap(tilemap, index) { - tilemap.getTileCoords(index, texCoords_); - - Mf::Scalar half = (texCoords_[2] - texCoords_[0]) / 2.0 + texCoords_[0]; - midCoords_[0] = half - 0.01; - midCoords_[1] = half + 0.01; + // TODO this is now broken + moof::scalar half = (mTexCoords[2] - mTexCoords[0]) / 2.0 + mTexCoords[0]; + mMidCoords[0] = half - 0.01; + mMidCoords[1] = half + 0.01; } -void ProgressBar::resize(const Mf::Rectangle& rect) +void ProgressBar::resize(const moof::rectangle& rect) { - Mf::Scalar height = rect.max[1] - rect.min[1]; - Mf::Scalar halfHeight = height / 2.0; - - width_ = rect.max[0] - rect.min[0] - height; - // assert width > 0 - - vertices_[0] = rect.min; - vertices_[1] = Mf::Vector2(rect.min[0] + halfHeight, rect.min[1]); - vertices_[2] = vertices_[1]; - vertices_[3] = Mf::Vector2(rect.min[0] + height, rect.min[1]); - vertices_[4] = Mf::Vector2(rect.min[0] + height, rect.max[1]); - vertices_[5] = Mf::Vector2(rect.min[0] + halfHeight, rect.max[1]); - vertices_[6] = vertices_[5]; - vertices_[7] = Mf::Vector2(rect.min[0], rect.max[1]); - - setProgress(progress_); + moof::log_info << "rect: " << rect.min << ", " << rect.max << std::endl; + moof::scalar height = rect.max[1] - rect.min[1]; + moof::scalar halfHeight = height / 2.0; + + mWidth = rect.max[0] - rect.min[0] - height; + ASSERT(mWidth > 0); + + mVertices[0] = rect.min; + mVertices[1] = moof::vector2(rect.min[0] + halfHeight, rect.min[1]); + mVertices[2] = mVertices[1]; + mVertices[3] = moof::vector2(rect.min[0] + height, rect.min[1]); + mVertices[4] = moof::vector2(rect.min[0] + height, rect.max[1]); + mVertices[5] = moof::vector2(rect.min[0] + halfHeight, rect.max[1]); + mVertices[6] = mVertices[5]; + mVertices[7] = moof::vector2(rect.min[0], rect.max[1]); + + setProgress(mProgress); } -void ProgressBar::setProgress(Mf::Scalar progress) +void ProgressBar::setProgress(moof::scalar progress) { - Mf::Scalar halfHeight = (vertices_[7][1] - vertices_[0][1]) / 2.0; + moof::scalar halfHeight = (mVertices[7][1] - mVertices[0][1]) / 2.0; - vertices_[2][0] = vertices_[1][0] + progress * width_; - vertices_[3][0] = vertices_[1][0] + progress * width_ + halfHeight; - vertices_[4][0] = vertices_[1][0] + progress * width_ + halfHeight; - vertices_[5][0] = vertices_[1][0] + progress * width_; + mVertices[2][0] = mVertices[1][0] + progress * mWidth; + mVertices[3][0] = mVertices[1][0] + progress * mWidth + halfHeight; + mVertices[4][0] = mVertices[1][0] + progress * mWidth + halfHeight; + mVertices[5][0] = mVertices[1][0] + progress * mWidth; - progress_ = progress; + mProgress = progress; } -void ProgressBar::draw(Mf::Scalar alpha) const +void ProgressBar::draw(moof::scalar alpha) const { - if (Mf::isEqual(progress_, 0.0)) - { - // don't draw anything if the progress is 0% - return; - } + if (moof::is_equal(mProgress, 0.0)) return; + // don't draw anything if the progress is 0% glColor4f(1.0f, 1.0f, 1.0f, 0.85f); - tilemap_.bind(); + mTilemap.bind(); glBegin(GL_QUADS); - glTexCoord2(texCoords_[0], texCoords_[1]); - glVertex2v(vertices_[0].data()); - glTexCoord2(midCoords_[0], texCoords_[3]); - glVertex2v(vertices_[1].data()); - glTexCoord2(midCoords_[0], texCoords_[5]); - glVertex2v(vertices_[6].data()); - glTexCoord2(texCoords_[6], texCoords_[7]); - glVertex2v(vertices_[7].data()); - - glTexCoord2(midCoords_[0], texCoords_[1]); - glVertex2v(vertices_[1].data()); - glTexCoord2(midCoords_[1], texCoords_[3]); - glVertex2v(vertices_[2].data()); - glTexCoord2(midCoords_[1], texCoords_[5]); - glVertex2v(vertices_[5].data()); - glTexCoord2(midCoords_[0], texCoords_[7]); - glVertex2v(vertices_[6].data()); - - glTexCoord2(midCoords_[1], texCoords_[1]); - glVertex2v(vertices_[2].data()); - glTexCoord2(texCoords_[2], texCoords_[3]); - glVertex2v(vertices_[3].data()); - glTexCoord2(texCoords_[4], texCoords_[5]); - glVertex2v(vertices_[4].data()); - glTexCoord2(midCoords_[1], texCoords_[7]); - glVertex2v(vertices_[5].data()); + glTexCoord(mTexCoords[0], mTexCoords[1]); + glVertex(mVertices[0]); + glTexCoord(mMidCoords[0], mTexCoords[3]); + glVertex(mVertices[1]); + glTexCoord(mMidCoords[0], mTexCoords[5]); + glVertex(mVertices[6]); + glTexCoord(mTexCoords[6], mTexCoords[7]); + glVertex(mVertices[7]); + + glTexCoord(mMidCoords[0], mTexCoords[1]); + glVertex(mVertices[1]); + glTexCoord(mMidCoords[1], mTexCoords[3]); + glVertex(mVertices[2]); + glTexCoord(mMidCoords[1], mTexCoords[5]); + glVertex(mVertices[5]); + glTexCoord(mMidCoords[0], mTexCoords[7]); + glVertex(mVertices[6]); + + glTexCoord(mMidCoords[1], mTexCoords[1]); + glVertex(mVertices[2]); + glTexCoord(mTexCoords[2], mTexCoords[3]); + glVertex(mVertices[3]); + glTexCoord(mTexCoords[4], mTexCoords[5]); + glVertex(mVertices[4]); + glTexCoord(mMidCoords[1], mTexCoords[7]); + glVertex(mVertices[5]); glEnd(); } -Hud::Hud() : - bar1_(Mf::Tilemap("StatusBars"), 0), - bar2_(Mf::Tilemap("StatusBars"), 2), - font_("Font") +Hud::Hud(GameState& state) : + state_(state), + mBar1(moof::sprite("StatusBars"), 0), + mBar2(moof::sprite("StatusBars"), 2), + mFont("Font") { - resize(800, 600); + ASSERT(moof::video::ready() && "a current video context should be set"); + moof::video& video = moof::video::current(); + resize(video.width(), video.height()); } - void Hud::resize(int width, int height) { - cml::matrix_orthographic_RH(projection_, - SCALAR(0.0), - Mf::Scalar(width), SCALAR(0.0), Mf::Scalar(height), - SCALAR(1.0), SCALAR(-1.0), cml::z_clip_neg_one); + moof::matrix_orthographic_RH(mProjection, SCALAR(0.0), + moof::scalar(width), SCALAR(0.0), + moof::scalar(height), SCALAR(1.0), + SCALAR(-1.0), moof::z_clip_neg_one); // position the two progress bars at the top-left of the screen - bar1_.resize(Mf::Rectangle(20, height - 51, - 0.7 * width, height - 3)); - bar2_.resize(Mf::Rectangle(20, height - 28, - 0.7 * width, height - 70)); + mBar1.resize(moof::rectangle(20, height - 51, 0.7 * width, height - 3)); + mBar2.resize(moof::rectangle(20, height - 28, 0.7 * width, height - 70)); setBar1Progress(0.05); setBar2Progress(0.0); } +void Hud::update(moof::scalar t, moof::scalar dt) +{ + state_.interp.update(t, dt); + setBar1Progress(state_.interp.state(dt)); + setBar2Progress(1.0 - state_.interp.state(dt)); +} -void Hud::draw(Mf::Scalar alpha) const +void Hud::draw(moof::scalar alpha) const { glMatrixMode(GL_PROJECTION); glPushMatrix(); - glLoadMatrix(projection_.data()); + glLoadMatrix(mProjection.data()); glMatrixMode(GL_MODELVIEW); glPushMatrix(); @@ -158,8 +143,8 @@ void Hud::draw(Mf::Scalar alpha) const glDisable(GL_DEPTH_TEST); glEnable(GL_BLEND); - bar1_.draw(); - bar2_.draw(); + mBar1.draw(); + mBar2.draw(); glDisable(GL_BLEND); glEnable(GL_DEPTH_TEST); @@ -171,18 +156,26 @@ void Hud::draw(Mf::Scalar alpha) const glPopMatrix(); } -bool Hud::handleEvent(Mf::Event& event) +bool Hud::handle_event(const moof::event& event) { switch (event.type) { - case SDL_VIDEORESIZE: - resize(event.resize.w, event.resize.h); - break; + case SDL_KEYUP: + if (event.key.keysym.sym == SDLK_h) + { + // don't want the hud anymore + //parent().remove_child(this); + + moof::log_warning("okay bye bye hud"); + return true; + } + break; + + case SDL_VIDEORESIZE: + resize(event.resize.w, event.resize.h); + break; } return false; } - -/** vim: set ts=4 sw=4 tw=80: *************************************************/ -