ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:supertuxkart/stk-code

Browse Source
This commit is contained in:
hiker 2014-09-17 13:41:54 +10:00
commit 8efc7110c8
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/shaders/glow_object.vert
View File

@ -19,6 +19,6 @@ void main(void)
{ {
mat4 ModelMatrix = getWorldMatrix(Origin, Orientation, Scale); mat4 ModelMatrix = getWorldMatrix(Origin, Orientation, Scale);
mat4 TransposeInverseModelView = transpose(getInverseWorldMatrix(Origin, Orientation, Scale) * InverseViewMatrix); mat4 TransposeInverseModelView = transpose(getInverseWorldMatrix(Origin, Orientation, Scale) * InverseViewMatrix);
gl_Position = ProjectionMatrix * ViewMatrix * ModelMatrix * vec4(Position, 1.); gl_Position = ProjectionViewMatrix * ModelMatrix * vec4(Position, 1.);
glowColor = GlowColor; glowColor = GlowColor;
} }

3
src/karts/kart.cpp
View File

@ -66,6 +66,7 @@
#include "utils/constants.hpp" #include "utils/constants.hpp"
#include "utils/log.hpp" //TODO: remove after debugging is done #include "utils/log.hpp" //TODO: remove after debugging is done
#include "utils/vs.hpp" #include "utils/vs.hpp"
#include "utils/profiler.hpp"
#include <ICameraSceneNode.h> #include <ICameraSceneNode.h>
#include <ISceneManager.h> #include <ISceneManager.h>
@ -1161,7 +1162,9 @@ void Kart::update(float dt)
m_kart_gfx->update(dt); m_kart_gfx->update(dt);
if (m_collision_particles) m_collision_particles->update(dt); if (m_collision_particles) m_collision_particles->update(dt);
PROFILER_PUSH_CPU_MARKER("Kart::updatePhysics", 0x60, 0x34, 0x7F);
updatePhysics(dt); updatePhysics(dt);
PROFILER_POP_CPU_MARKER();
if(!m_controls.m_fire) m_fire_clicked = 0; if(!m_controls.m_fire) m_fire_clicked = 0;