This is an automated email from the git hooks/post-receive script.
odyx pushed a commit to branch upstream/latest
in repository colobot.
commit c509bc1709fe33f52f12abb070fb96f8f3f08014
Author: krzys-h <krzy...@interia.pl>
Date: Wed Nov 12 15:04:13 2014 +0100
Fixed PowerCell/Tracked animations (closes #389)
---
src/object/auto/autoportico.cpp | 4 ++--
src/object/motion/motionvehicle.cpp | 8 ++++----
src/object/object.cpp | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/object/auto/autoportico.cpp b/src/object/auto/autoportico.cpp
index c0c4988..1d955e2 100644
--- a/src/object/auto/autoportico.cpp
+++ b/src/object/auto/autoportico.cpp
@@ -411,11 +411,11 @@ void CAutoPortico::UpdateTrackMapping(float left, float
right)
rank = m_object->GetObjectRank(0);
- m_engine->TrackTextureMapping(rank, mat, Gfx::ENG_RSTATE_PART1,
"lemt.png", "",
+ m_engine->TrackTextureMapping(rank, mat, Gfx::ENG_RSTATE_PART1,
"objects/lemt.png", "",
Gfx::LOD_Constant, Gfx::ENG_TEX_MAPPING_X,
right, 8.0f, 8.0f, 192.0f, 256.0f);
- m_engine->TrackTextureMapping(rank, mat, Gfx::ENG_RSTATE_PART2,
"lemt.png", "",
+ m_engine->TrackTextureMapping(rank, mat, Gfx::ENG_RSTATE_PART2,
"objects/lemt.png", "",
Gfx::LOD_Constant, Gfx::ENG_TEX_MAPPING_X,
left, 8.0f, 8.0f, 192.0f, 256.0f);
}
diff --git a/src/object/motion/motionvehicle.cpp
b/src/object/motion/motionvehicle.cpp
index 2197d6f..86d1d13 100644
--- a/src/object/motion/motionvehicle.cpp
+++ b/src/object/motion/motionvehicle.cpp
@@ -1889,11 +1889,11 @@ void CMotionVehicle::UpdateTrackMapping(float left,
float right, ObjectType type
if (type == OBJECT_MOBILEdr)
{
- m_engine->TrackTextureMapping(rRank, mat, Gfx::ENG_RSTATE_PART1,
"drawer.png", "",
+ m_engine->TrackTextureMapping(rRank, mat, Gfx::ENG_RSTATE_PART1,
"objects/drawer.png", "",
Gfx::LOD_Constant,
Gfx::ENG_TEX_MAPPING_X,
right, 1.0f, 8.0f, 192.0f, 256.0f);
- m_engine->TrackTextureMapping(lRank, mat, Gfx::ENG_RSTATE_PART2,
"drawer.png", "",
+ m_engine->TrackTextureMapping(lRank, mat, Gfx::ENG_RSTATE_PART2,
"objects/drawer.png", "",
Gfx::LOD_Constant,
Gfx::ENG_TEX_MAPPING_X,
left, 1.0f, 8.0f, 192.0f, 256.0f);
}
@@ -1901,11 +1901,11 @@ void CMotionVehicle::UpdateTrackMapping(float left,
float right, ObjectType type
{
for (int i = 0; i < 2; i++)
{
- m_engine->TrackTextureMapping(rRank, mat, Gfx::ENG_RSTATE_PART1,
"lemt.png", "",
+ m_engine->TrackTextureMapping(rRank, mat, Gfx::ENG_RSTATE_PART1,
"objects/lemt.png", "",
(i == 0) ? Gfx::LOD_High :
Gfx::LOD_Medium, Gfx::ENG_TEX_MAPPING_X,
right, 1.0f, 8.0f, 192.0f, 256.0f);
- m_engine->TrackTextureMapping(lRank, mat, Gfx::ENG_RSTATE_PART2,
"lemt.png", "",
+ m_engine->TrackTextureMapping(lRank, mat, Gfx::ENG_RSTATE_PART2,
"objects/lemt.png", "",
(i == 0) ? Gfx::LOD_High :
Gfx::LOD_Medium, Gfx::ENG_TEX_MAPPING_X,
left, 1.0f, 8.0f, 192.0f, 256.0f);
}
diff --git a/src/object/object.cpp b/src/object/object.cpp
index 7d8b4cf..6ee0924 100644
--- a/src/object/object.cpp
+++ b/src/object/object.cpp
@@ -5806,7 +5806,7 @@ void CObject::UpdateEnergyMapping()
for (int j = 0; j < 3; j++)
{
m_engine->ChangeTextureMapping(m_objectPart[0].object,
- mat, Gfx::ENG_RSTATE_PART3, "lemt.png",
"",
+ mat, Gfx::ENG_RSTATE_PART3,
"objects/lemt.png", "",
lodLevels[j], Gfx::ENG_TEX_MAPPING_1Y,
au, bu, 1.0f, 0.0f);
}
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/colobot.git
_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
