zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-12-01 16:32:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fix model rotation some more

Browse source 
- a couple compiler warning fixes
This commit is contained in:
Rachael Alexanderson 2017-11-23 22:37:07 -05:00
parent 5181e3ebb2
commit 297f00aa4b
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/gl/models/gl_models.cpp
View file

@ -76,7 +76,7 @@ void FModelRenderer::RenderModel(float x, float y, float z, FSpriteModelFrame *s
float scaleFactorZ = actor->Scale.Y * smf->zscale; float scaleFactorZ = actor->Scale.Y * smf->zscale;
float pitch = 0; float pitch = 0;
float roll = 0; float roll = 0;
float rotateOffset = 0; double rotateOffset = 0;
float angle = actor->Angles.Yaw.Degrees; float angle = actor->Angles.Yaw.Degrees;
// [BB] Workaround for the missing pitch information. // [BB] Workaround for the missing pitch information.
@ -102,8 +102,8 @@ void FModelRenderer::RenderModel(float x, float y, float z, FSpriteModelFrame *s
if (smf->flags & MDL_ROTATING) if (smf->flags & MDL_ROTATING)
{ {
const double time = smf->rotationSpeed*GetTimeFloat() / 200.f; const double time = smf->rotationSpeed*GetTimeFloat() / 200.;
rotateOffset = float((time - xs_FloorToInt(time)) *360.f); rotateOffset = double((time - xs_FloorToInt(time)) *360.);
} }
// Added MDL_USEACTORPITCH and MDL_USEACTORROLL flags processing. // Added MDL_USEACTORPITCH and MDL_USEACTORROLL flags processing.

4
src/i_time.cpp
View file

@ -63,7 +63,7 @@ CUSTOM_CVAR(Float, i_timescale, 1.0f, CVAR_NOINITCALL)
else else
{ {
I_FreezeTime(true); I_FreezeTime(true);
float clampValue = (self < 0.05) ? 0.05 : self; float clampValue = (self < 0.05) ? 0.05f : self;
if (self != clampValue) if (self != clampValue)
self = clampValue; self = clampValue;
TimeScale = self; TimeScale = self;
@ -74,7 +74,7 @@ CUSTOM_CVAR(Float, i_timescale, 1.0f, CVAR_NOINITCALL)
static uint64_t GetClockTimeNS() static uint64_t GetClockTimeNS()
{ {
using namespace std::chrono; using namespace std::chrono;
return (uint64_t)duration_cast<nanoseconds>(steady_clock::now().time_since_epoch()).count() * TimeScale; return (uint64_t)((duration_cast<nanoseconds>(steady_clock::now().time_since_epoch()).count()) * TimeScale);
} }
static uint64_t MSToNS(unsigned int ms) static uint64_t MSToNS(unsigned int ms)