Digitalstack/otclient
2
0
Fork 0
mirror of https://github.com/edubart/otclient.git synced 2025-11-04 20:46:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

BEAWARE all game functionality is disabled with this commit for a while

Browse Source 
* rework client modules
* hide main window when loading
* remake top menu functions
* rework modules autoload
* improve path resolving for otml and lua
* move core_widgets to core_lib
* fix tooltip issues
* split some styles
* add bit32 lua library
* fix assert issues
* fix compilation on linux 32 systems
* rework gcc compile options
* renable and fix some warnings
* remove unused constants
* speedup sprite cache
* move UIGame to lua (not funcional yet)
* fix a lot of issues in x11 window
* fix crash handler
* add some warnings do uiwidget
and much more...
This commit is contained in:
Eduardo Bart
2012-02-20 00:27:08 -02:00
parent 96358b317d
commit e03bf33f58
201 changed files with 1443 additions and 707 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/framework/graphics/particle.cpp
View File

@@ -73,8 +73,6 @@ void Particle::update(double elapsedTime)
void Particle::updatePosition(double elapsedTime)
{
bool mustRedraw = false;
if(m_ignorePhysicsAfter < 0 || m_elapsedTime < m_ignorePhysicsAfter ) {
// update position
PointF delta = m_velocity * elapsedTime;
@@ -83,7 +81,6 @@ void Particle::updatePosition(double elapsedTime)
PointF position = m_position + delta;
if(m_position != position) {
mustRedraw = true;
m_position += delta;
}
@@ -96,11 +93,8 @@ void Particle::updatePosition(double elapsedTime)
void Particle::updateSize()
{
bool mustRedraw = false;
Size size = m_startSize + (m_finalSize - m_startSize) / m_duration * m_elapsedTime;
if(m_size != size) {
mustRedraw = true;
m_size = size;
}
@@ -109,15 +103,12 @@ void Particle::updateSize()
void Particle::updateColor()
{
bool mustRedraw = false;
if(m_elapsedTime < m_colorsStops[1]) {
Color color = Color(m_colors[0].r() + (m_colors[1].r() - m_colors[0].r()) / (m_colorsStops[1] - m_colorsStops[0]) * (m_elapsedTime - m_colorsStops[0]),
m_colors[0].g() + (m_colors[1].g() - m_colors[0].g()) / (m_colorsStops[1] - m_colorsStops[0]) * (m_elapsedTime - m_colorsStops[0]),
m_colors[0].b() + (m_colors[1].b() - m_colors[0].b()) / (m_colorsStops[1] - m_colorsStops[0]) * (m_elapsedTime - m_colorsStops[0]),
m_colors[0].a() + (m_colors[1].a() - m_colors[0].a()) / (m_colorsStops[1] - m_colorsStops[0]) * (m_elapsedTime - m_colorsStops[0]));
if(m_color != color) {
mustRedraw = true;
m_color = color;
}
}
@@ -128,7 +119,6 @@ void Particle::updateColor()
}
else {
if(m_color != m_colors[0]) {
mustRedraw = true;
m_color = m_colors[0];
}
}