zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-11 15:22:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/rheit/zdoom

Browse source
This commit is contained in:
Christoph Oelckers 2016-09-24 17:54:53 +02:00
commit 7d978a115e
4 changed files with 31 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/m_swap.h
View file

@ -46,6 +46,11 @@ inline short LittleShort(int x)
return OSSwapLittleToHostInt16((uint16_t)x); return OSSwapLittleToHostInt16((uint16_t)x);
} }
inline unsigned short LittleShort(unsigned int x)
{
return OSSwapLittleToHostInt16((uint16_t)x);
}
inline int LittleLong(int x) inline int LittleLong(int x)
{ {
return OSSwapLittleToHostInt32((uint32_t)x); return OSSwapLittleToHostInt32((uint32_t)x);
@ -56,6 +61,16 @@ inline unsigned int LittleLong(unsigned int x)
return OSSwapLittleToHostInt32(x); return OSSwapLittleToHostInt32(x);
} }
inline int LittleLong(long x)
{
return OSSwapLittleToHostInt32((uint32_t)x);
}
inline unsigned int LittleLong(unsigned long x)
{
return OSSwapLittleToHostInt32((uint32_t)x);
}
inline short BigShort(short x) inline short BigShort(short x)
{ {
return (short)OSSwapBigToHostInt16((uint16_t)x); return (short)OSSwapBigToHostInt16((uint16_t)x);

25
src/p_mobj.cpp
View file

@ -70,6 +70,7 @@
#include "p_spec.h" #include "p_spec.h"
#include "p_checkposition.h" #include "p_checkposition.h"
#include "serializer.h" #include "serializer.h"
#include "r_utility.h"
// MACROS ------------------------------------------------------------------ // MACROS ------------------------------------------------------------------
@ -1040,10 +1041,10 @@ bool AActor::IsInsideVisibleAngles() const
if (players[consoleplayer].camera == nullptr) if (players[consoleplayer].camera == nullptr)
return true; return true;
DAngle anglestart = VisibleStartAngle.Normalized180(); DAngle anglestart = VisibleStartAngle;
DAngle angleend = VisibleEndAngle.Normalized180(); DAngle angleend = VisibleEndAngle;
DAngle pitchstart = VisibleStartPitch.Normalized180(); DAngle pitchstart = VisibleStartPitch;
DAngle pitchend = VisibleEndPitch.Normalized180(); DAngle pitchend = VisibleEndPitch;
if (anglestart > angleend) if (anglestart > angleend)
{ {
@ -1052,28 +1053,26 @@ bool AActor::IsInsideVisibleAngles() const
angleend = temp; angleend = temp;
} }
if (pitchstart > angleend) if (pitchstart > pitchend)
{ {
DAngle temp = pitchstart; DAngle temp = pitchstart;
pitchstart = pitchend; pitchstart = pitchend;
pitchend = temp; pitchend = temp;
} }
player_t* pPlayer = players[consoleplayer].camera->player;
if (pPlayer && pPlayer->mo) AActor *mo = players[consoleplayer].camera;
if (mo != nullptr)
{ {
AActor *mo = pPlayer->mo;
DVector3 diffang = Vec3To(mo); DVector3 diffang = ViewPos - Pos();
DAngle to = diffang.Angle(); DAngle to = diffang.Angle();
if (!(renderflags & RF_ABSMASKANGLE)) if (!(renderflags & RF_ABSMASKANGLE))
to = deltaangle(Angles.Yaw, to); to = deltaangle(Angles.Yaw, to);
// Note that this check is inversed due to only being able to vectorize if ((to >= anglestart && to <= angleend))
// from one way (this actor to the player). It still means to pass
// if the player is within the visible angles.
if ((to <= anglestart || to >= angleend))
{ {
to = diffang.Pitch(); to = diffang.Pitch();
if (!(renderflags & RF_ABSMASKPITCH)) if (!(renderflags & RF_ABSMASKPITCH))

2
src/serializer.cpp
View file

@ -1294,7 +1294,7 @@ FSerializer &SerializePointer(FSerializer &arc, const char *key, T *&value, T **
assert(base != nullptr); assert(base != nullptr);
if (arc.isReading() || !arc.w->inObject() || defval == nullptr || value != *defval) if (arc.isReading() || !arc.w->inObject() || defval == nullptr || value != *defval)
{ {
ptrdiff_t vv = value == nullptr ? -1 : value - base; int64_t vv = value == nullptr ? -1 : value - base;
Serialize(arc, key, vv, nullptr); Serialize(arc, key, vv, nullptr);
value = vv < 0 ? nullptr : base + vv; value = vv < 0 ? nullptr : base + vv;
} }

4
src/thingdef/thingdef_properties.cpp
View file

@ -1437,7 +1437,7 @@ DEFINE_PROPERTY(spriterotation, F, Actor)
DEFINE_PROPERTY(visibleangles, Ff, Actor) DEFINE_PROPERTY(visibleangles, Ff, Actor)
{ {
PROP_DOUBLE_PARM(visstart, 0); PROP_DOUBLE_PARM(visstart, 0);
PROP_DOUBLE_PARM(visend, 0); PROP_DOUBLE_PARM(visend, 1);
defaults->VisibleStartAngle = visstart; defaults->VisibleStartAngle = visstart;
defaults->VisibleEndAngle = visend; defaults->VisibleEndAngle = visend;
} }
@ -1448,7 +1448,7 @@ DEFINE_PROPERTY(visibleangles, Ff, Actor)
DEFINE_PROPERTY(visiblepitch, Ff, Actor) DEFINE_PROPERTY(visiblepitch, Ff, Actor)
{ {
PROP_DOUBLE_PARM(visstart, 0); PROP_DOUBLE_PARM(visstart, 0);
PROP_DOUBLE_PARM(visend, 0); PROP_DOUBLE_PARM(visend, 1);
defaults->VisibleStartPitch = visstart; defaults->VisibleStartPitch = visstart;
defaults->VisibleEndPitch = visend; defaults->VisibleEndPitch = visend;
} }