From b75053750d9d30972222df2c1ee2970a6041049a Mon Sep 17 00:00:00 2001 From: leo Date: Thu, 19 Apr 2012 01:11:24 +0000 Subject: [PATCH] Removed old color names. --- common/globals.cpp | 14 -------------- common/globals.h | 2 -- common/lc_colors.cpp | 6 +++++- common/lc_colors.h | 1 + common/lc_mesh.cpp | 4 ++-- common/project.cpp | 21 +++++++++++++-------- win/propertiesgridctrl.cpp | 3 ++- 7 files changed, 23 insertions(+), 28 deletions(-) diff --git a/common/globals.cpp b/common/globals.cpp index 5de0b466..44a6856e 100644 --- a/common/globals.cpp +++ b/common/globals.cpp @@ -9,20 +9,6 @@ Messenger* messenger; MainWnd* main_window; -const char* colornames[LC_MAXCOLORS] = { "Red", "Orange", "Green", - "Light Green", "Blue", "Light Blue", "Yellow", "White", - "Dark Gray", "Black", "Brown", "Pink", "Purple", "Gold", - "Clear Red", "Clear Orange", "Clear Green", "Clear Light Green", - "Clear Blue", "Clear Light Blue", "Clear Yellow", "Clear White", - "Light Gray", "Tan", "Light Brown", "Light Pink", "Turquoise", "Silver" }; - -const char* altcolornames[LC_MAXCOLORS] = { "Red", "Orange", "Green", - "LightGreen", "Blue", "LightBlue", "Yellow", "White", - "DarkGray", "Black", "Brown", "Pink", "Purple", "Gold", - "ClearRed", "ClearOrange", "ClearGreen", "ClearLightGreen", - "ClearBlue", "ClearLightBlue", "ClearYellow", "ClearWhite", - "LightGray", "Tan", "LightBrown", "LightPink", "Turquoise", "Silver" }; - unsigned char FlatColorArray[31][3] = { { 166, 25, 25 }, // 0 - Red { 255, 127, 51 }, // 1 - Orange diff --git a/common/globals.h b/common/globals.h index 45b64032..fce65fe7 100644 --- a/common/globals.h +++ b/common/globals.h @@ -12,7 +12,5 @@ extern MainWnd* main_window; extern unsigned char FlatColorArray[31][3]; extern unsigned char ColorArray[31][4]; -extern const char* colornames[LC_MAXCOLORS]; -extern const char* altcolornames[LC_MAXCOLORS]; #endif // _GLOBALS_H_ diff --git a/common/lc_colors.cpp b/common/lc_colors.cpp index a2ab7f39..fa4ab4b6 100644 --- a/common/lc_colors.cpp +++ b/common/lc_colors.cpp @@ -209,6 +209,7 @@ static void LoadColorFile(lcFile& File) MainColor.Edge[2] = 0.2f; MainColor.Edge[3] = 1.0f; strcpy(MainColor.Name, "Main Color"); + strcpy(MainColor.SafeName, "Main_Color"); EdgeColor.Code = 24; EdgeColor.Translucent = false; @@ -221,6 +222,7 @@ static void LoadColorFile(lcFile& File) EdgeColor.Edge[2] = 0.2f; EdgeColor.Edge[3] = 1.0f; strcpy(EdgeColor.Name, "Edge Color"); + strcpy(EdgeColor.SafeName, "Edge_Color"); while (File.ReadLine(Line, sizeof(Line))) { @@ -249,6 +251,7 @@ static void LoadColorFile(lcFile& File) GetToken(Ptr, Token); strncpy(Color.Name, Token, sizeof(Color.Name)); Color.Name[LC_MAX_COLOR_NAME - 1] = 0; + strncpy(Color.SafeName, Color.Name, sizeof(Color.SafeName)); for (char* Ptr = strchr((char*)Color.Name, '_'); Ptr; Ptr = strchr(Ptr, '_')) *Ptr = ' '; @@ -381,7 +384,8 @@ int lcGetColorIndex(lcuint32 ColorCode) Color.Edge[1] = 0.2f; Color.Edge[2] = 0.2f; Color.Edge[3] = 1.0f; - sprintf(Color.Name, "Color %06x", ColorCode & 0xffffff); + sprintf(Color.Name, "Color %06X", ColorCode & 0xffffff); + sprintf(Color.SafeName, "Color_%06X", ColorCode & 0xffffff); gColorList.Add(Color); return gColorList.GetSize() - 1; diff --git a/common/lc_colors.h b/common/lc_colors.h index 4638f32f..3c1b8cf5 100644 --- a/common/lc_colors.h +++ b/common/lc_colors.h @@ -14,6 +14,7 @@ struct lcColor float Value[4]; float Edge[4]; char Name[LC_MAX_COLOR_NAME]; + char SafeName[LC_MAX_COLOR_NAME]; }; extern ObjArray gColorList; diff --git a/common/lc_mesh.cpp b/common/lc_mesh.cpp index baabd970..59891edc 100644 --- a/common/lc_mesh.cpp +++ b/common/lc_mesh.cpp @@ -375,9 +375,9 @@ void lcMesh::ExportWavefrontIndices(lcFile& File, int DefaultColorIndex, int Ver IndexType* Indices = (IndexType*)mIndexBuffer.mData + Section->IndexOffset / sizeof(IndexType); if (Section->ColorIndex == gDefaultColor) - sprintf(Line, "usemtl %s\n", altcolornames[DefaultColorIndex]); + sprintf(Line, "usemtl %s\n", gColorList[DefaultColorIndex].SafeName); else - sprintf(Line, "usemtl %s\n", altcolornames[Section->ColorIndex]); + sprintf(Line, "usemtl %s\n", gColorList[Section->ColorIndex].SafeName); File.WriteLine(Line); for (int Idx = 0; Idx < Section->NumIndices; Idx += 3) diff --git a/common/project.cpp b/common/project.cpp index 2d447453..f4cc62fa 100644 --- a/common/project.cpp +++ b/common/project.cpp @@ -3190,7 +3190,7 @@ void Project::CreateHTMLPieceList(FILE* f, int nStep, bool bImages, const char* { col[c] = ID; ID++; - fprintf(f, "
%s
\n", colornames[c]); + fprintf(f, "
%s
\n", gColorList[c].Name); } ID++; fputs("\n",f); @@ -3953,23 +3953,25 @@ void Project::HandleCommand(LC_COMMANDS id, unsigned long nParam) POVFile.WriteLine("#include \"colors.inc\"\n\n"); // Add color definitions. - for (int ColorIdx = 0; ColorIdx < LC_MAXCOLORS; ColorIdx++) + for (int ColorIdx = 0; ColorIdx < gColorList.GetSize(); ColorIdx++) { - if (ColorIdx > 13 && ColorIdx < 22) + lcColor* Color = &gColorList[ColorIdx]; + + if (lcIsColorTranslucent(ColorIdx)) { sprintf(Line, "#declare lc_%s = texture { pigment { rgb <%d/255, %d/255, %d/255> filter 0.9 } finish { ambient 0.3 diffuse 0.2 reflection 0.25 phong 0.3 phong_size 60 } }\n", - altcolornames[ColorIdx], ColorArray[ColorIdx][0], ColorArray[ColorIdx][1], ColorArray[ColorIdx][2]); + Color->SafeName, Color->Value[0], Color->Value[1], Color->Value[2]); } else { sprintf(Line, "#declare lc_%s = texture { pigment { rgb <%d/255, %d/255, %d/255> } finish { ambient 0.1 phong 0.2 phong_size 20 } }\n", - altcolornames[ColorIdx], ColorArray[ColorIdx][0], ColorArray[ColorIdx][1], ColorArray[ColorIdx][2]); + Color->SafeName, Color->Value[0], Color->Value[1], Color->Value[2]); } POVFile.WriteLine(Line); if (!ColorTable[ColorIdx][0]) - sprintf(ColorTable[ColorIdx], "lc_%s", altcolornames[ColorIdx]); + sprintf(ColorTable[ColorIdx], "lc_%s", Color->SafeName); } POVFile.WriteLine("\n"); @@ -4157,8 +4159,11 @@ void Project::HandleCommand(LC_COMMANDS id, unsigned long nParam) FILE* mat = fopen(buf, "wt"); fputs("# Colors used by LeoCAD\n# You need to add transparency values\n#\n\n", mat); - for (int i = 0; i < LC_MAXCOLORS; i++) - fprintf(mat, "newmtl %s\nKd %.2f %.2f %.2f\n\n", altcolornames[i], (float)FlatColorArray[i][0]/255, (float)FlatColorArray[i][1]/255, (float)FlatColorArray[i][2]/255); + for (int ColorIdx = 0; ColorIdx < gColorList.GetSize(); ColorIdx++) + { + lcColor* Color = &gColorList[ColorIdx]; + fprintf(mat, "newmtl %s\nKd %.2f %.2f %.2f\n\n", Color->SafeName, Color->Value[0], Color->Value[1], Color->Value[2]); + } fclose(mat); for (pPiece = m_pPieces; pPiece; pPiece = pPiece->m_pNext) diff --git a/win/propertiesgridctrl.cpp b/win/propertiesgridctrl.cpp index 2d6d09a9..1a1a83ca 100644 --- a/win/propertiesgridctrl.cpp +++ b/win/propertiesgridctrl.cpp @@ -1,4 +1,5 @@ #include "lc_global.h" +#include "lc_colors.h" #include "propertiesgridctrl.h" #include "globals.h" @@ -172,7 +173,7 @@ CString CLeoCADMFCPropertyGridColorProperty::FormatProperty() { ASSERT_VALID(this); - return colornames[m_Color]; + return gColorList[m_Color].Name; } void CLeoCADMFCPropertyGridColorProperty::SetColor(int color, bool original)