Other patches
parent
52880eaf1a
commit
eaee0c16e1
|
@ -425,6 +425,9 @@ struct SEvent
|
|||
// Y position of simple touch.
|
||||
s32 Y;
|
||||
|
||||
// Number of current touches
|
||||
s32 touchedCount;
|
||||
|
||||
//! Type of touch event.
|
||||
ETOUCH_INPUT_EVENT Event;
|
||||
};
|
||||
|
|
|
@ -197,6 +197,12 @@ namespace core
|
|||
return ROUNDING_ERROR_f64;
|
||||
}
|
||||
|
||||
template <>
|
||||
inline s16 roundingError()
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
template <>
|
||||
inline s32 roundingError()
|
||||
{
|
||||
|
@ -243,7 +249,7 @@ namespace core
|
|||
|
||||
//! returns if a equals b, taking possible rounding errors into account
|
||||
template <class T>
|
||||
inline bool equals(const T a, const T b, const T tolerance = roundingError<T>())
|
||||
inline bool equals(const T a, const T b, const T tolerance = roundingError<T>())
|
||||
{
|
||||
return (a + tolerance >= b) && (a - tolerance <= b);
|
||||
}
|
||||
|
@ -766,4 +772,3 @@ namespace core
|
|||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
@ -128,9 +128,9 @@ class COpenGLCoreCacheHandler
|
|||
}
|
||||
|
||||
Texture[index] = static_cast<const TOpenGLTexture*>(texture);
|
||||
|
||||
if (prevTexture)
|
||||
prevTexture->drop();
|
||||
// dblfreefix (?)
|
||||
/*if (prevTexture)
|
||||
prevTexture->drop();*/
|
||||
}
|
||||
|
||||
status = true;
|
||||
|
|
Loading…
Reference in New Issue