gesche
/
tibia-client
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge

This commit is contained in:
Eduardo Bart 2011-08-21 16:51:39 -03:00
parent f266b9fbc6 80211b9985
commit 4ebb201da2
8 changed files with 123 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/core_fonts/core_fonts.otmod
View File

@ -13,6 +13,11 @@ Module
importFont('helvetica-14px-bold')
importFont('terminus-14px-bold')
importFont('tibia-8px-antialised')
importFont('tibia-10px-antialised')
importFont('tibia-10px-monochrome')
importFont('tibia-12px-rounded')
setDefaultFont('helvetica-12px')
return true

53
src/otclient/core/creature.cpp
View File

@ -1,8 +1,9 @@
#include "creature.h"
#include "creature.h"
#include "datmanager.h"
#include <framework/graphics/graphics.h>
#include <framework/graphics/framebuffer.h>
#include "game.h"
#include <framework/graphics/fontmanager.h>
Creature::Creature() : Thing(THING_CREATURE)
{
@ -41,34 +42,46 @@ void Creature::draw(int x, int y)
g_graphics.bindBlendFunc(BLEND_NORMAL);
g_graphics.bindColor(Color::white);
}
}
// health bar
// TODO: draw outside framebuffer
Color healthColor = Color::black;
if(m_healthPercent > 60 && m_healthPercent <= 100) {
healthColor.setRed(0.0f);
healthColor.setGreen(0.75f);
} else if(m_healthPercent > 30 && m_healthPercent <= 60) {
healthColor.setRed(0.75f);
healthColor.setGreen(0.75f);
} else if(m_healthPercent > 10 && m_healthPercent <= 30) {
healthColor.setRed(0.75f);
healthColor.setGreen(0.00f);
} else if(m_healthPercent > 0 && m_healthPercent <= 10) {
healthColor.setRed(0.25f);
healthColor.setGreen(0.00f);
void Creature::drawInformation(int x, int y, bool useGray)
{
Color fillColor = Color(96, 96, 96);
if(!useGray) {
// health bar
fillColor = Color::black;
if(m_healthPercent > 60 && m_healthPercent <= 100) {
fillColor.setRed(0.0f);
fillColor.setGreen(0.75f);
} else if(m_healthPercent > 30 && m_healthPercent <= 60) {
fillColor.setRed(0.75f);
fillColor.setGreen(0.75f);
} else if(m_healthPercent > 10 && m_healthPercent <= 30) {
fillColor.setRed(0.75f);
fillColor.setGreen(0.00f);
} else if(m_healthPercent > 0 && m_healthPercent <= 10) {
fillColor.setRed(0.25f);
fillColor.setGreen(0.00f);
}
}
Rect healthRect = Rect(x - 14, y - 11, 27, 4);
Rect backgroundRect = Rect(x-(14.5), y-2, 27, 4);
Rect healthRect = backgroundRect.expanded(-1);
healthRect.setWidth((m_healthPercent/100.0)*25);
g_graphics.bindColor(Color::black);
g_graphics.drawBoundingRect(healthRect);
g_graphics.drawFilledRect(backgroundRect);
g_graphics.bindColor(healthColor);
g_graphics.drawFilledRect(healthRect.expanded(-1));
g_graphics.bindColor(fillColor);
g_graphics.drawFilledRect(healthRect);
// restore white color
g_graphics.bindColor(Color::white);
// name
FontPtr font = g_fonts.getFont("tibia-12px-rounded");
font->renderText(m_name, Rect(x-50, y-16, 100, 16), AlignTopCenter, fillColor);
}
const ThingAttributes& Creature::getAttributes()

1
src/otclient/core/creature.h
View File

@ -19,6 +19,7 @@ public:
virtual ~Creature() { }
virtual void draw(int x, int y);
void drawInformation(int x, int y, bool useGray);
void setName(const std::string& name) { m_name = name; }
void setHealthPercent(uint8 healthPercent) { m_healthPercent = healthPercent; }

49
src/otclient/core/map.cpp
View File

@ -6,7 +6,7 @@
Map g_map;
void Map::draw(int x, int y)
void Map::draw(const Rect& rect)
{
if(!m_framebuffer)
m_framebuffer = FrameBufferPtr(new FrameBuffer(15*32, 11*32));
@ -18,10 +18,11 @@ void Map::draw(int x, int y)
// player is above 7
int drawFloorStop = 0;
if(playerPos.z <= 7) {
// player pos it 8-6. check if we can draw upper floors.
int drawFloorStop = 0;
// if there is a window on north, east, south or west
//Position direction[4] = {Position(0, -1, 0), Position(1, 0, 0), Position(0, 1, 0), Position(-1, 0, 0)};
@ -50,17 +51,13 @@ void Map::draw(int x, int y)
if(iz == drawFloorStop)
break;
for(int step = 0; step < 4; ++step) {
// +1 in draws cause 64x64 items may affect view.
// +1 in draws cause 64x64 items may affect view.
for(int ix = -7+(playerPos.z-iz); ix < + 8+7; ++ix) {
for(int iy = -5+(playerPos.z-iz); iy < + 6+7; ++iy) {
Position itemPos = Position(playerPos.x + ix, playerPos.y + iy, iz);
if(const TilePtr& tile = m_tiles[itemPos])
tile->draw((ix + 7 - (playerPos.z-iz))*32, (iy + 5 - (playerPos.z-iz))*32, step);
}
for(int ix = -7+(playerPos.z-iz); ix < + 8+7; ++ix) {
for(int iy = -5+(playerPos.z-iz); iy < + 6+7; ++iy) {
Position itemPos = Position(playerPos.x + ix, playerPos.y + iy, iz);
if(const TilePtr& tile = m_tiles[itemPos])
tile->draw((ix + 7 - (playerPos.z-iz))*32, (iy + 5 - (playerPos.z-iz))*32);
}
}
}
@ -73,7 +70,33 @@ void Map::draw(int x, int y)
m_framebuffer->unbind();
g_graphics.bindColor(Color::white);
m_framebuffer->draw(Rect(x, y, g_graphics.getScreenSize()));
m_framebuffer->draw(rect);
// calculate stretch factor
float horizontalStretchFactor = (rect.width() - rect.x()) / (float)(15*32);
float verticalStretchFactor = (rect.height() - rect.y()) / (float)(11*32);
// draw player names and health bars
for(int ix = -7; ix <= 7; ++ix) {
for(int iy = -5; iy <= 5; ++iy) {
Position itemPos = Position(playerPos.x + ix, playerPos.y + iy, playerPos.z);
if(const TilePtr& tile = m_tiles[itemPos]) {
std::deque<ThingPtr> creatures = tile->getCreatures();
for(auto it = creatures.rbegin(), end = creatures.rend(); it != end; ++it) {
const ThingPtr& thing = *it;
const CreaturePtr& creature = thing->asCreature();
int x = (ix + 7)*32 + 5 - tile->getDrawNextOffset();
int y = (iy + 5)*32 - 8 - tile->getDrawNextOffset();
// TODO: create isCovered function.
bool useGray = (drawFloorStop != playerPos.z-1);
creature->drawInformation(x*horizontalStretchFactor, y*verticalStretchFactor, useGray);
}
}
}
}
}
void Map::addThing(ThingPtr thing, uint8 stackpos)

2
src/otclient/core/map.h
View File

@ -8,7 +8,7 @@
class Map
{
public:
void draw(int x, int y);
void draw(const Rect& rect);
void addThing(ThingPtr thing, uint8 stackpos = 0);
ThingPtr getThing(const Position& pos, uint8 stackpos);

119
src/otclient/core/tile.cpp
View File

@ -11,87 +11,64 @@ Tile::Tile()
m_drawNextOffset = 0;
}
void Tile::draw(int x, int y, int step)
void Tile::draw(int x, int y)
{
// STEP 0 = draw ground, top 1
// STEP 1 = top 2
// STEP 2 = top 3
// STEP 3 = bottom, creatures, names, etc
FontPtr font = g_fonts.getDefaultFont();
if(step == 0 && m_drawNextOffset != 0) {
logDebug("error with tile offset.");
return;
}
m_drawNextOffset = 0;
if(step == 0) {
if(m_ground)
m_ground->draw(x, y);
if(m_ground)
m_ground->draw(x, y);
for(const ThingPtr& thing : m_itemsTop) {
const ThingAttributes& thingAttributes = thing->getAttributes();
for(auto it = m_itemsTop.rbegin(), end = m_itemsTop.rend(); it != end; ++it) {
const ThingPtr& thing = *it;
const ThingAttributes& thingAttributes = thing->getAttributes();
if(thingAttributes.alwaysOnTopOrder == 1) {
thing->draw(x - m_drawNextOffset, y - m_drawNextOffset);
//font->renderText("T1", Rect(x + 5, y+5, 100, 100));
m_drawNextOffset += thingAttributes.drawNextOffset;
}
}
for(const ThingPtr& thing : m_itemsTop) {
const ThingAttributes& thingAttributes = thing->getAttributes();
if(thingAttributes.alwaysOnTopOrder == 2) {
thing->draw(x - m_drawNextOffset, y - m_drawNextOffset);
//font->renderText("T2", Rect(x + 5, y+5, 100, 100));
m_drawNextOffset += thingAttributes.drawNextOffset;
}
}
for(const ThingPtr& thing : m_itemsBottom) {
const ThingAttributes& thingAttributes = thing->getAttributes();
thing->draw(x - m_drawNextOffset, y - m_drawNextOffset);
//font->renderText("B0", Rect(x + 5, y+5, 100, 100));
m_drawNextOffset += thingAttributes.drawNextOffset;
}
for(const ThingPtr& thing : m_creatures) {
const ThingAttributes& thingAttributes = thing->getAttributes();
if(thingAttributes.alwaysOnTopOrder == 1) {
thing->draw(x - m_drawNextOffset, y - m_drawNextOffset);
//font->renderText("T1", Rect(x + 5, y+5, 100, 100));
m_drawNextOffset += thingAttributes.drawNextOffset;
}
}
for(const ThingPtr& thing : m_itemsTop) {
const ThingAttributes& thingAttributes = thing->getAttributes();
for(auto it = m_itemsTop.rbegin(), end = m_itemsTop.rend(); it != end; ++it) {
const ThingPtr& thing = *it;
const ThingAttributes& thingAttributes = thing->getAttributes();
if(thingAttributes.alwaysOnTopOrder == 3) {
thing->draw(x - m_drawNextOffset, y - m_drawNextOffset);
//font->renderText("T3", Rect(x + 5, y+5, 100, 100));
m_drawNextOffset += thingAttributes.drawNextOffset;
}
}
for(const ThingPtr& thing : m_effects) {
if(thingAttributes.alwaysOnTopOrder == 2) {
thing->draw(x - m_drawNextOffset, y - m_drawNextOffset);
//font->renderText("T2", Rect(x + 5, y+5, 100, 100));
m_drawNextOffset += thingAttributes.drawNextOffset;
}
m_drawNextOffset = 0;
}
else if(step == 1) {
for(auto it = m_itemsBottom.rbegin(), end = m_itemsBottom.rend(); it != end; ++it) {
const ThingPtr& thing = *it;
const ThingAttributes& thingAttributes = thing->getAttributes();
thing->draw(x - m_drawNextOffset, y - m_drawNextOffset);
//font->renderText("B0", Rect(x + 5, y+5, 100, 100));
m_drawNextOffset += thingAttributes.drawNextOffset;
}
else if(step == 2) {
for(auto it = m_creatures.rbegin(), end = m_creatures.rend(); it != end; ++it) {
const ThingPtr& thing = *it;
thing->draw(x - m_drawNextOffset, y - m_drawNextOffset);
}
else if(step == 3) {
for(auto it = m_itemsTop.rbegin(), end = m_itemsTop.rend(); it != end; ++it) {
const ThingPtr& thing = *it;
const ThingAttributes& thingAttributes = thing->getAttributes();
if(thingAttributes.alwaysOnTopOrder == 3) {
thing->draw(x, y);
//font->renderText("T3", Rect(x + 5, y+5, 100, 100));
}
}
for(auto it = m_effects.rbegin(), end = m_effects.rend(); it != end; ++it) {
const ThingPtr& thing = *it;
thing->draw(x - m_drawNextOffset, y - m_drawNextOffset);
}
}
@ -100,18 +77,6 @@ void Tile::addThing(ThingPtr thing, uint8 stackpos)
if(!thing)
return;
//8308
//2526
//5296
const ThingAttributes& item1 = g_dat.getItemAttributes(8308);
const ThingAttributes& item2 = g_dat.getItemAttributes(2526);
const ThingAttributes& item3 = g_dat.getItemAttributes(5296);
int j = item1.alwaysOnTopOrder + item2.alwaysOnTopOrder + item3.alwaysOnTopOrder;
j++;
if(thing->getPosition() == g_game.getLocalPlayer()->getPosition() + Position(-1, 0, 0) && thing->getAttributes().alwaysOnTop) {
logDebug((int)thing->getId());
}
@ -123,16 +88,16 @@ void Tile::addThing(ThingPtr thing, uint8 stackpos)
m_ground = thing;
else {
if(thingAttributes.alwaysOnTop)
m_itemsTop.push_front(thing);
m_itemsTop.push_back(thing);
else
m_itemsBottom.push_front(thing);
m_itemsBottom.push_back(thing);
}
}
else if(thing->asCreature()) {
m_creatures.push_front(thing);
m_creatures.push_back(thing);
}
else if(thing->asEffect()) {
m_effects.push_front(thing);
m_effects.push_back(thing);
}
}

10
src/otclient/core/tile.h
View File

@ -4,17 +4,12 @@
#include "declarations.h"
#include <framework/luascript/luaobject.h>
enum RenderStep
{
};
class Tile : public LuaObject
{
public:
Tile();
void draw(int x, int y, int step);
void draw(int x, int y);
void addThing(ThingPtr thing, uint8 stackpos);
ThingPtr getThing(uint8 stackpos);
@ -27,6 +22,9 @@ public:
int getStackSize();
std::deque<ThingPtr> getCreatures() { return m_creatures; }
int getDrawNextOffset() { return m_drawNextOffset; }
private:
ThingPtr m_ground;
std::deque<ThingPtr> m_itemsBottom;

2
src/otclient/otclient.cpp
View File

@ -209,7 +209,7 @@ void OTClient::render()
{
//TODO: UIMap for map drawing
if(g_game.isOnline())
g_map.draw(0, 0);
g_map.draw(Rect(0, 0, g_graphics.getScreenSize()));
// everything is rendered by UI components
g_ui.render();