sera/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Revert 895182cbcb

Browse Source 
This was SVN commit r25313.
This commit is contained in:
Angen 2021-04-25 13:42:51 +00:00
parent 895182cbcb
commit 9977c73eb6
3 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/gui/ObjectTypes/CMiniMap.cpp
View File

@ -33,7 +33,6 @@
#include "lib/external_libraries/libsdl.h"
#include "lib/ogl.h"
#include "lib/timer.h"
#include "maths/MathUtil.h"
#include "ps/ConfigDB.h"
#include "ps/Filesystem.h"
#include "ps/Game.h"
@ -622,15 +621,6 @@ void CMiniMap::Draw()
}
else
{
if (cmpMinimap->UsesPlayerColor())
{
// Based on article: https://alaingalvan.tumblr.com/post/79864187609/glsl-color-correction-shaders
const int contrast = 10;
v.r = Clamp(((v.r - 128) * contrast) + 128, 0, 255);
v.g = Clamp(((v.g - 128) * contrast) + 128, 0, 255);
v.b = Clamp(((v.b - 128) * contrast) + 128, 0, 255);
}
addVertex(v, attrColor, attrPos);
++m_EntitiesDrawn;
}

7
source/simulation2/components/CCmpMinimap.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2021 Wildfire Games.
/* Copyright (C) 2019 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -195,11 +195,6 @@ public:
return true;
}
virtual bool UsesPlayerColor() const
{
return m_UsePlayerColor;
}
virtual bool CheckPing(double currentTime, double pingDuration)
{
if (!m_Active || !m_IsPinging)

4
source/simulation2/components/ICmpMinimap.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2021 Wildfire Games.
/* Copyright (C) 2018 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -45,8 +45,6 @@ public:
*/
virtual void UpdateColor() = 0;
virtual bool UsesPlayerColor() const = 0;
DECLARE_INTERFACE_TYPE(Minimap)
};