summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeo2009-03-22 06:23:48 +0000
committerLeo2009-03-22 06:23:48 +0000
commitd092f7532be61db245abdfc9737c3a0ecc1b2e75 (patch)
treeb9a8f4b1c4fc42e22b19fa20da7bdfbb18452e78
parentaf984ac7c70952da843f459f5a25e06408e21522 (diff)
Changed color calls.
git-svn-id: http://svn.leocad.org/tags/leocad-0.75@752 c7d43263-9d01-0410-8a33-9dba5d9f93d6
-rw-r--r--common/camera.cpp6
-rw-r--r--common/light.cpp9
-rw-r--r--common/piece.cpp9
-rw-r--r--common/pieceinf.cpp30
4 files changed, 30 insertions, 24 deletions
diff --git a/common/camera.cpp b/common/camera.cpp
index 3713939..0b626df 100644
--- a/common/camera.cpp
+++ b/common/camera.cpp
@@ -555,7 +555,8 @@ void Camera::Render(float fLineWidth)
if (IsEyeSelected())
{
glLineWidth(fLineWidth*2);
- glColor3ubv(FlatColorArray[(m_nState & LC_CAMERA_FOCUSED) != 0 ? LC_COL_FOCUSED : LC_COL_SELECTED]);
+ int Color = (m_nState & LC_CAMERA_FOCUSED) != 0 ? LC_COL_FOCUSED : LC_COL_SELECTED;
+ glColor4ub(FlatColorArray[Color][0], FlatColorArray[Color][1], FlatColorArray[Color][2], 255);
}
else
{
@@ -595,7 +596,8 @@ void Camera::Render(float fLineWidth)
if (IsTargetSelected())
{
glLineWidth(fLineWidth*2);
- glColor3ubv(FlatColorArray[(m_nState & LC_CAMERA_TARGET_FOCUSED) != 0 ? LC_COL_FOCUSED : LC_COL_SELECTED]);
+ int Color = (m_nState & LC_CAMERA_TARGET_FOCUSED) != 0 ? LC_COL_FOCUSED : LC_COL_SELECTED;
+ glColor4ub(FlatColorArray[Color][0], FlatColorArray[Color][1], FlatColorArray[Color][2], 255);
}
else
{
diff --git a/common/light.cpp b/common/light.cpp
index cdd0536..1be2c7a 100644
--- a/common/light.cpp
+++ b/common/light.cpp
@@ -274,7 +274,8 @@ void Light::Render (float fLineWidth)
if (IsEyeSelected())
{
glLineWidth(fLineWidth*2);
- glColor3ubv(FlatColorArray[(m_nState & LC_LIGHT_FOCUSED) != 0 ? LC_COL_FOCUSED : LC_COL_SELECTED]);
+ int Color = (m_nState & LC_LIGHT_FOCUSED) != 0 ? LC_COL_FOCUSED : LC_COL_SELECTED;
+ glColor4ub(FlatColorArray[Color][0], FlatColorArray[Color][1], FlatColorArray[Color][2], 255);
DrawCone();
glLineWidth(fLineWidth);
}
@@ -287,7 +288,8 @@ void Light::Render (float fLineWidth)
if (IsTargetSelected())
{
glLineWidth(fLineWidth*2);
- glColor3ubv(FlatColorArray[(m_nState & LC_LIGHT_TARGET_FOCUSED) != 0 ? LC_COL_FOCUSED : LC_COL_SELECTED]);
+ int Color = (m_nState & LC_LIGHT_TARGET_FOCUSED) != 0 ? LC_COL_FOCUSED : LC_COL_SELECTED;
+ glColor4ub(FlatColorArray[Color][0], FlatColorArray[Color][1], FlatColorArray[Color][2], 255);
DrawTarget();
glLineWidth(fLineWidth);
}
@@ -377,7 +379,8 @@ void Light::Render (float fLineWidth)
if (IsEyeSelected ())
{
glLineWidth (fLineWidth*2);
- glColor3ubv (FlatColorArray[(m_nState & LC_LIGHT_FOCUSED) != 0 ? LC_COL_FOCUSED : LC_COL_SELECTED]);
+ int Color = (m_nState & LC_LIGHT_FOCUSED) != 0 ? LC_COL_FOCUSED : LC_COL_SELECTED;
+ glColor4ub(FlatColorArray[Color][0], FlatColorArray[Color][1], FlatColorArray[Color][2], 255);
DrawSphere();
glLineWidth (fLineWidth);
}
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();
diff --git a/common/pieceinf.cpp b/common/pieceinf.cpp
index cbf7635..3e44365 100644
--- a/common/pieceinf.cpp
+++ b/common/pieceinf.cpp
@@ -1112,7 +1112,7 @@ void PieceInfo::RenderPiece(int nColor)
m_pTextures[sh].texture->MakeCurrent();
if (m_pTextures[sh].color == LC_COL_DEFAULT)
- glColor3ubv(FlatColorArray[nColor]);
+ glColor4ub(FlatColorArray[nColor][0], FlatColorArray[nColor][1], FlatColorArray[nColor][2], 255);
if (nColor > 13 && nColor < 22)
{
glEnable (GL_BLEND);
@@ -1160,16 +1160,16 @@ void PieceInfo::RenderPiece(int nColor)
if (curcolor > 13 && curcolor < 22)
{
- glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
- glEnable (GL_BLEND);
- glDepthMask (GL_FALSE);
- glColor4ubv (ColorArray[curcolor]);
+ glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+ glEnable(GL_BLEND);
+ glDepthMask(GL_FALSE);
+ glColor4ub(ColorArray[curcolor][0], ColorArray[curcolor][1], ColorArray[curcolor][2], ColorArray[curcolor][3]);
}
else
{
- glDepthMask (GL_TRUE);
- glDisable (GL_BLEND);
- glColor3ubv (FlatColorArray[curcolor]);
+ glDepthMask(GL_TRUE);
+ glDisable(GL_BLEND);
+ glColor4ub(FlatColorArray[curcolor][0], FlatColorArray[curcolor][1], FlatColorArray[curcolor][2], 255);
}
if (*info)
@@ -1198,16 +1198,16 @@ void PieceInfo::RenderPiece(int nColor)
if (curcolor > 13 && curcolor < 22)
{
- glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
- glEnable (GL_BLEND);
- glDepthMask (GL_FALSE);
- glColor4ubv (ColorArray[curcolor]);
+ glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+ glEnable(GL_BLEND);
+ glDepthMask(GL_FALSE);
+ glColor4ub(ColorArray[curcolor][0], ColorArray[curcolor][1], ColorArray[curcolor][2], ColorArray[curcolor][3]);
}
else
{
- glDepthMask (GL_TRUE);
- glDisable (GL_BLEND);
- glColor3ubv(FlatColorArray[curcolor]);
+ glDepthMask(GL_TRUE);
+ glDisable(GL_BLEND);
+ glColor4ub(FlatColorArray[curcolor][0], FlatColorArray[curcolor][1], FlatColorArray[curcolor][2], 255);
}
if (*info)