summaryrefslogtreecommitdiff
path: root/common/piece.cpp
diff options
context:
space:
mode:
authorLeo2009-03-22 06:23:48 +0000
committerLeo2009-03-22 06:23:48 +0000
commitd092f7532be61db245abdfc9737c3a0ecc1b2e75 (patch)
treeb9a8f4b1c4fc42e22b19fa20da7bdfbb18452e78 /common/piece.cpp
parentaf984ac7c70952da843f459f5a25e06408e21522 (diff)
Changed color calls.
git-svn-id: http://svn.leocad.org/tags/leocad-0.75@752 c7d43263-9d01-0410-8a33-9dba5d9f93d6
Diffstat (limited to 'common/piece.cpp')
-rw-r--r--common/piece.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/common/piece.cpp b/common/piece.cpp
index 5386f49..21e2af5 100644
--- a/common/piece.cpp
+++ b/common/piece.cpp
@@ -31,9 +31,9 @@ inline static void SetCurrentColor(unsigned char nColor, bool* bTrans, bool bLig
bool Transparent = (nColor > 13 && nColor < 22);
if (bLighting || Transparent)
- glColor4ubv(ColorArray[nColor]);
+ glColor4ub(ColorArray[nColor][0], ColorArray[nColor][1], ColorArray[nColor][2], ColorArray[nColor][3]);
else
- glColor3ubv(FlatColorArray[nColor]);
+ glColor4ub(FlatColorArray[nColor][0], FlatColorArray[nColor][1], FlatColorArray[nColor][2], 255);
if (nColor > 27)
return;
@@ -1065,7 +1065,8 @@ void Piece::RenderBox(bool bHilite, float fLineWidth)
if (bHilite && ((m_nState & LC_PIECE_SELECTED) != 0))
{
- glColor3ubv(FlatColorArray[m_nState & LC_PIECE_FOCUSED ? LC_COL_FOCUSED : LC_COL_SELECTED]);
+ int Color = m_nState & LC_PIECE_FOCUSED ? LC_COL_FOCUSED : LC_COL_SELECTED;
+ glColor4ub(FlatColorArray[Color][0], FlatColorArray[Color][1], FlatColorArray[Color][2], 255);
glLineWidth(2*fLineWidth);
glPushAttrib(GL_POLYGON_BIT);
glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
@@ -1075,7 +1076,7 @@ void Piece::RenderBox(bool bHilite, float fLineWidth)
}
else
{
- glColor3ubv(FlatColorArray[m_nColor]);
+ glColor4ub(FlatColorArray[m_nColor][0], FlatColorArray[m_nColor][1], FlatColorArray[m_nColor][2], 255);
m_pPieceInfo->RenderBox();
}
glPopMatrix();