Miroirs/leocad
1
0
Fork 0
mirror of https://github.com/leozide/leocad synced 2025-02-07 08:45:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixed POV-Ray export bugs.

Browse source
This commit is contained in:
leo 2012-03-08 00:16:29 +00:00
parent a50e10c9ef
commit ec1023dcfa
1 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
common/project.cpp
View file

@ -3944,16 +3944,19 @@ void Project::HandleCommand(LC_COMMANDS id, unsigned long nParam)
int Index = Library->GetPieceIndex(Info); int Index = Library->GetPieceIndex(Info);
if (strchr(Flags, 'L')) if (strchr(Flags, 'L'))
{
PieceFlags[Index] |= LGEO_PIECE_LGEO; PieceFlags[Index] |= LGEO_PIECE_LGEO;
sprintf(PieceTable + Index * LC_PIECE_NAME_LEN, "lg_%s", Dst);
}
if (strchr(Flags, 'A')) if (strchr(Flags, 'A'))
{
PieceFlags[Index] |= LGEO_PIECE_AR; PieceFlags[Index] |= LGEO_PIECE_AR;
sprintf(PieceTable + Index * LC_PIECE_NAME_LEN, "ar_%s", Dst);
}
if (strchr(Flags, 'S')) if (strchr(Flags, 'S'))
PieceFlags[Index] |= LGEO_PIECE_SLOPE; PieceFlags[Index] |= LGEO_PIECE_SLOPE;
if (PieceFlags[Index] & (LGEO_PIECE_LGEO | LGEO_PIECE_AR))
strcpy(PieceTable + Index * LC_PIECE_NAME_LEN, Dst);
} }
strcpy(Filename, opts.libpath); strcpy(Filename, opts.libpath);
@ -4009,11 +4012,7 @@ void Project::HandleCommand(LC_COMMANDS id, unsigned long nParam)
if (PieceTable[Index * LC_PIECE_NAME_LEN]) if (PieceTable[Index * LC_PIECE_NAME_LEN])
{ {
if (PieceFlags[Index] & LGEO_PIECE_LGEO) sprintf(Line, "#include \"%s.inc\"\n", PieceTable + Index * LC_PIECE_NAME_LEN);
sprintf(Line, "#include \"lg_%s.inc\"\n", PieceTable + Index * LC_PIECE_NAME_LEN);
else if (PieceFlags[Index] & LGEO_PIECE_AR)
sprintf(Line, "#include \"ar_%s.inc\"\n", PieceTable + Index * LC_PIECE_NAME_LEN);
POVFile.WriteLine(Line); POVFile.WriteLine(Line);
} }
@ -4221,7 +4220,7 @@ void Project::HandleCommand(LC_COMMANDS id, unsigned long nParam)
sprintf(Line, "merge {\n object {\n %s%s\n texture { %s }\n }\n" sprintf(Line, "merge {\n object {\n %s%s\n texture { %s }\n }\n"
" object {\n %s_slope\n texture { %s normal { bumps 0.3 scale 0.02 } }\n }\n" " object {\n %s_slope\n texture { %s normal { bumps 0.3 scale 0.02 } }\n }\n"
" matrix <%.4f, %.4f, %.4f, %.4f, %.4f, %.4f, %.4f, %.4f, %.4f, %.4f, %.4f, %.4f>\n}\n", " matrix <%.4f, %.4f, %.4f, %.4f, %.4f, %.4f, %.4f, %.4f, %.4f, %.4f, %.4f, %.4f>\n}\n",
PieceTable + Index * LC_PIECE_NAME_LEN, Suffix, ColorTable[Color], ColorTable[Color], PieceTable + Index * LC_PIECE_NAME_LEN, PieceTable + Index * LC_PIECE_NAME_LEN, Suffix, ColorTable[Color], PieceTable + Index * LC_PIECE_NAME_LEN, ColorTable[Color],
-fl[11], -fl[5], fl[8], -fl[9], -fl[3], fl[6], -fl[10], -fl[4], fl[7], pos[1], pos[0], pos[2]); -fl[11], -fl[5], fl[8], -fl[9], -fl[3], fl[6], -fl[10], -fl[4], fl[7], pos[1], pos[0], pos[2]);
} }
else else
@ -4241,8 +4240,13 @@ void Project::HandleCommand(LC_COMMANDS id, unsigned long nParam)
{ {
#ifdef LC_WINDOWS #ifdef LC_WINDOWS
// TODO: Linux support // TODO: Linux support
char CmdLine[LC_MAXPATH * 2 + 100]; char CmdLine[LC_MAXPATH * 3 + 100];
sprintf(CmdLine, "+L\"%s\" +I\"%s\"", opts.libpath, opts.outpath);
if (opts.libpath[0])
sprintf(CmdLine, "+L\"%s\\lg\\\" +L\"%s\\ar\\\" +I\"%s\"", opts.libpath, opts.libpath, opts.outpath);
else
sprintf(CmdLine, "+I\"%s\"", opts.libpath, opts.outpath);
ShellExecute(::GetDesktopWindow(), "open", opts.povpath, CmdLine, NULL, SW_SHOWNORMAL); ShellExecute(::GetDesktopWindow(), "open", opts.povpath, CmdLine, NULL, SW_SHOWNORMAL);
#endif #endif
} }