mirror/openlara
1
0
Fork 0
mirror of https://github.com/XProger/OpenLara.git synced 2025-08-11 07:34:33 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/XProger/OpenLara

Browse Source
This commit is contained in:
XProger
2017-04-18 02:00:03 +03:00
parent f9aac9739b 8c6daf981d
commit a8d54272cd
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/format.h
View File

@@ -175,8 +175,8 @@ namespace TR {
struct Color16 {
uint16 r:5, g:5, b:5, a:1;
operator Color24() const { return Color24(r << 3, g << 3, b << 3); }
operator Color32() const { return Color32(r << 3, g << 3, b << 3, -a); }
operator Color24() const { return Color24((r << 3) | (r >> 2), (g << 3) | (g >> 2), (b << 3) | (b >> 2)); }
operator Color32() const { return Color32((r << 3) | (r >> 2), (g << 3) | (g >> 2), (b << 3) | (b >> 2), -a); }
};
struct Vertex {

2
src/utils.h
View File

@@ -31,7 +31,7 @@
#define EPS FLT_EPSILON
#define INF INFINITY
#define INF INFINITY
#define PI 3.14159265358979323846f
#define PI2 (PI * 2.0f)
#define DEG2RAD (PI / 180.0f)