summaryrefslogtreecommitdiffstats
path: root/src/render/PlayerSkin.cpp
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2020-08-24 21:37:38 +0200
committerSergeanur <s.anureev@yandex.ua>2020-08-24 21:37:38 +0200
commit041d342faf492e4ceb46b997b522579ecfbdadfb (patch)
tree9224840e8bf6ebc15975b82eaeed89fe12bdbd5f /src/render/PlayerSkin.cpp
parentMerge branch 'master' into miami (diff)
downloadre3-041d342faf492e4ceb46b997b522579ecfbdadfb.tar
re3-041d342faf492e4ceb46b997b522579ecfbdadfb.tar.gz
re3-041d342faf492e4ceb46b997b522579ecfbdadfb.tar.bz2
re3-041d342faf492e4ceb46b997b522579ecfbdadfb.tar.lz
re3-041d342faf492e4ceb46b997b522579ecfbdadfb.tar.xz
re3-041d342faf492e4ceb46b997b522579ecfbdadfb.tar.zst
re3-041d342faf492e4ceb46b997b522579ecfbdadfb.zip
Diffstat (limited to 'src/render/PlayerSkin.cpp')
-rw-r--r--src/render/PlayerSkin.cpp12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/render/PlayerSkin.cpp b/src/render/PlayerSkin.cpp
index d66f7ce4..b3e82cd9 100644
--- a/src/render/PlayerSkin.cpp
+++ b/src/render/PlayerSkin.cpp
@@ -15,6 +15,8 @@
#include "Timer.h"
#include "Lights.h"
+//--MIAMI: file done
+
RpClump *gpPlayerClump;
float gOldFov;
@@ -109,9 +111,7 @@ CPlayerSkin::GetSkinTexture(const char *texName)
tex = RwTextureCreate(raster);
RwTextureSetName(tex, texName);
-#ifdef FIX_BUGS
- RwTextureSetFilterMode(tex, rwFILTERLINEAR); // filtering bugfix from VC
-#endif
+ RwTextureSetFilterMode(tex, rwFILTERLINEAR);
RwTexDictionaryAddTexture(CTxdStore::GetSlot(m_txdSlot)->texDict, tex);
RwImageDestroy(image);
@@ -143,8 +143,7 @@ CPlayerSkin::RenderFrontendSkinEdit(void)
static float rotation = 0.0f;
RwRGBAReal AmbientColor = { 0.65f, 0.65f, 0.65f, 1.0f };
const RwV3d pos = { 1.35f, 0.35f, 7.725f };
- const RwV3d axis1 = { 1.0f, 0.0f, 0.0f };
- const RwV3d axis2 = { 0.0f, 0.0f, 1.0f };
+ const RwV3d axis = { 0.0f, 1.0f, 0.0f };
static uint32 LastFlash = 0;
RwFrame *frame = RpClumpGetFrame(gpPlayerClump);
@@ -157,8 +156,7 @@ CPlayerSkin::RenderFrontendSkinEdit(void)
}
RwFrameTransform(frame, RwFrameGetMatrix(RwCameraGetFrame(Scene.camera)), rwCOMBINEREPLACE);
RwFrameTranslate(frame, &pos, rwCOMBINEPRECONCAT);
- RwFrameRotate(frame, &axis1, -90.0f, rwCOMBINEPRECONCAT);
- RwFrameRotate(frame, &axis2, rotation, rwCOMBINEPRECONCAT);
+ RwFrameRotate(frame, &axis, rotation, rwCOMBINEPRECONCAT);
RwFrameUpdateObjects(frame);
SetAmbientColours(&AmbientColor);
RpClumpRender(gpPlayerClump);