zcy
/
solvespace
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add a scale factor when exporting; the user specifies a number, and 

all coordinates are divided by that number as we export.

And add functions to store a float in the registry. I'm using those
for the scale factor, and also to replace the crazy scaled integers
that I was using for light positions etc. before.

[git-p4: depot-paths = "//depot/solvespace/": change = 1824]
solver
Jonathan Westhues 2008-07-07 23:41:29 -08:00
parent b2f2f90a27
commit 72d188619d
5 changed files with 84 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
solvespace.cpp
View File

@ -15,23 +15,25 @@ void SolveSpace::Init(char *cmdLine) {
modelColor[6] = CnfThawDWORD(RGB( 0, 0, 130), "ModelColor_6"); modelColor[6] = CnfThawDWORD(RGB( 0, 0, 130), "ModelColor_6");
modelColor[7] = CnfThawDWORD(RGB( 80, 0, 80), "ModelColor_7"); modelColor[7] = CnfThawDWORD(RGB( 80, 0, 80), "ModelColor_7");
// Light intensities // Light intensities
lightIntensity[0] = ((int)CnfThawDWORD( 700, "LightIntensity_0"))/1000.0; lightIntensity[0] = CnfThawFloat(1.0f, "LightIntensity_0");
lightIntensity[1] = ((int)CnfThawDWORD( 400, "LightIntensity_1"))/1000.0; lightIntensity[1] = CnfThawFloat(0.5f, "LightIntensity_1");
// Light positions // Light positions
lightDir[0].x = ((int)CnfThawDWORD(-500, "LightDir_0_Right" ))/1000.0; lightDir[0].x = CnfThawFloat(-1.0f, "LightDir_0_Right" );
lightDir[0].y = ((int)CnfThawDWORD( 500, "LightDir_0_Up" ))/1000.0; lightDir[0].y = CnfThawFloat( 1.0f, "LightDir_0_Up" );
lightDir[0].z = ((int)CnfThawDWORD( 0, "LightDir_0_Forward" ))/1000.0; lightDir[0].z = CnfThawFloat( 0.0f, "LightDir_0_Forward" );
lightDir[1].x = ((int)CnfThawDWORD( 500, "LightDir_1_Right" ))/1000.0; lightDir[1].x = CnfThawFloat( 1.0f, "LightDir_1_Right" );
lightDir[1].y = ((int)CnfThawDWORD( 0, "LightDir_1_Up" ))/1000.0; lightDir[1].y = CnfThawFloat( 0.0f, "LightDir_1_Up" );
lightDir[1].z = ((int)CnfThawDWORD( 0, "LightDir_1_Forward" ))/1000.0; lightDir[1].z = CnfThawFloat( 0.0f, "LightDir_1_Forward" );
// Mesh tolerance // Mesh tolerance
meshTol = ((int)CnfThawDWORD(1000, "MeshTolerance"))/1000.0; meshTol = CnfThawFloat(1.0f, "MeshTolerance");
// View units // View units
viewUnits = (Unit)CnfThawDWORD((DWORD)UNIT_MM, "ViewUnits"); viewUnits = (Unit)CnfThawDWORD((DWORD)UNIT_MM, "ViewUnits");
// Camera tangent (determines perspective) // Camera tangent (determines perspective)
cameraTangent = ((int)CnfThawDWORD(0, "CameraTangent"))/1e6; cameraTangent = CnfThawFloat(0.0f, "CameraTangent");
// Color for edges (drawn as lines for emphasis) // Color for edges (drawn as lines for emphasis)
edgeColor = CnfThawDWORD(RGB(0, 0, 0), "EdgeColor"); edgeColor = CnfThawDWORD(RGB(0, 0, 0), "EdgeColor");
// Export scale factor
exportScale = CnfThawFloat(1.0f, "ExportScale");
// Recent files menus // Recent files menus
for(i = 0; i < MAX_RECENT; i++) { for(i = 0; i < MAX_RECENT; i++) {
char name[100]; char name[100];
@ -69,23 +71,26 @@ void SolveSpace::Exit(void) {
CnfFreezeDWORD(modelColor[i], name); CnfFreezeDWORD(modelColor[i], name);
} }
// Light intensities // Light intensities
CnfFreezeDWORD((int)(lightIntensity[0]*1000), "LightIntensity_0"); CnfFreezeFloat((float)lightIntensity[0], "LightIntensity_0");
CnfFreezeDWORD((int)(lightIntensity[1]*1000), "LightIntensity_1"); CnfFreezeFloat((float)lightIntensity[1], "LightIntensity_1");
// Light directions // Light directions
CnfFreezeDWORD((int)(lightDir[0].x*1000), "LightDir_0_Right"); CnfFreezeFloat((float)lightDir[0].x, "LightDir_0_Right");
CnfFreezeDWORD((int)(lightDir[0].y*1000), "LightDir_0_Up"); CnfFreezeFloat((float)lightDir[0].y, "LightDir_0_Up");
CnfFreezeDWORD((int)(lightDir[0].z*1000), "LightDir_0_Forward"); CnfFreezeFloat((float)lightDir[0].z, "LightDir_0_Forward");
CnfFreezeDWORD((int)(lightDir[1].x*1000), "LightDir_1_Right"); CnfFreezeFloat((float)lightDir[1].x, "LightDir_1_Right");
CnfFreezeDWORD((int)(lightDir[1].y*1000), "LightDir_1_Up"); CnfFreezeFloat((float)lightDir[1].y, "LightDir_1_Up");
CnfFreezeDWORD((int)(lightDir[1].z*1000), "LightDir_1_Forward"); CnfFreezeFloat((float)lightDir[1].z, "LightDir_1_Forward");
// Mesh tolerance // Mesh tolerance
CnfFreezeDWORD((int)(meshTol*1000), "MeshTolerance"); CnfFreezeFloat((float)meshTol, "MeshTolerance");
// Display/entry units // Display/entry units
CnfFreezeDWORD((int)viewUnits, "ViewUnits"); CnfFreezeDWORD((DWORD)viewUnits, "ViewUnits");
// Camera tangent (determines perspective) // Camera tangent (determines perspective)
CnfFreezeDWORD((int)(cameraTangent*1e6), "CameraTangent"); CnfFreezeFloat((float)cameraTangent, "CameraTangent");
// Color for edges (drawn as lines for emphasis) // Color for edges (drawn as lines for emphasis)
CnfFreezeDWORD(edgeColor, "EdgeColor"); CnfFreezeDWORD(edgeColor, "EdgeColor");
// Export scale (a float, stored as a DWORD)
CnfFreezeFloat(exportScale, "ExportScale");
ExitNow(); ExitNow();
} }
@ -641,6 +646,8 @@ havepoly:
Point2d e0 = p0.Project2d(u, v), Point2d e0 = p0.Project2d(u, v),
e1 = p1.Project2d(u, v); e1 = p1.Project2d(u, v);
double s = SS.exportScale;
fprintf(f, fprintf(f,
" 0\n" " 0\n"
"LINE\n" "LINE\n"
@ -659,8 +666,8 @@ havepoly:
" 31\n" // zB " 31\n" // zB
"%.6f\n", "%.6f\n",
0, 0,
e0.x, e0.y, 0.0, e0.x/s, e0.y/s, 0.0,
e1.x, e1.y, 0.0); e1.x/s, e1.y/s, 0.0);
} }
} }
@ -700,6 +707,7 @@ void SolveSpace::ExportMeshTo(char *filename) {
DWORD n = vvm.l.n; DWORD n = vvm.l.n;
fwrite(&n, 4, 1, f); fwrite(&n, 4, 1, f);
double s = SS.exportScale;
int i; int i;
for(i = 0; i < vvm.l.n; i++) { for(i = 0; i < vvm.l.n; i++) {
STriangle *tr = &(vvm.l.elem[i]); STriangle *tr = &(vvm.l.elem[i]);
@ -708,15 +716,15 @@ void SolveSpace::ExportMeshTo(char *filename) {
w = (float)n.x; fwrite(&w, 4, 1, f); w = (float)n.x; fwrite(&w, 4, 1, f);
w = (float)n.y; fwrite(&w, 4, 1, f); w = (float)n.y; fwrite(&w, 4, 1, f);
w = (float)n.z; fwrite(&w, 4, 1, f); w = (float)n.z; fwrite(&w, 4, 1, f);
w = (float)tr->a.x; fwrite(&w, 4, 1, f); w = (float)((tr->a.x)/s); fwrite(&w, 4, 1, f);
w = (float)tr->a.y; fwrite(&w, 4, 1, f); w = (float)((tr->a.y)/s); fwrite(&w, 4, 1, f);
w = (float)tr->a.z; fwrite(&w, 4, 1, f); w = (float)((tr->a.z)/s); fwrite(&w, 4, 1, f);
w = (float)tr->b.x; fwrite(&w, 4, 1, f); w = (float)((tr->b.x)/s); fwrite(&w, 4, 1, f);
w = (float)tr->b.y; fwrite(&w, 4, 1, f); w = (float)((tr->b.y)/s); fwrite(&w, 4, 1, f);
w = (float)tr->b.z; fwrite(&w, 4, 1, f); w = (float)((tr->b.z)/s); fwrite(&w, 4, 1, f);
w = (float)tr->c.x; fwrite(&w, 4, 1, f); w = (float)((tr->c.x)/s); fwrite(&w, 4, 1, f);
w = (float)tr->c.y; fwrite(&w, 4, 1, f); w = (float)((tr->c.y)/s); fwrite(&w, 4, 1, f);
w = (float)tr->c.z; fwrite(&w, 4, 1, f); w = (float)((tr->c.z)/s); fwrite(&w, 4, 1, f);
fputc(0, f); fputc(0, f);
fputc(0, f); fputc(0, f);
} }

3
solvespace.h
View File

@ -93,8 +93,10 @@ void Error(char *str, ...);
void ExitNow(void); void ExitNow(void);
void CnfFreezeString(char *str, char *name); void CnfFreezeString(char *str, char *name);
void CnfFreezeDWORD(DWORD v, char *name); void CnfFreezeDWORD(DWORD v, char *name);
void CnfFreezeFloat(float v, char *name);
void CnfThawString(char *str, int maxLen, char *name); void CnfThawString(char *str, int maxLen, char *name);
DWORD CnfThawDWORD(DWORD v, char *name); DWORD CnfThawDWORD(DWORD v, char *name);
float CnfThawFloat(float v, char *name);
void *AllocTemporary(int n); void *AllocTemporary(int n);
void FreeAllTemporary(void); void FreeAllTemporary(void);
@ -353,6 +355,7 @@ public:
double meshTol; double meshTol;
double cameraTangent; double cameraTangent;
DWORD edgeColor; DWORD edgeColor;
float exportScale;
int CircleSides(double r); int CircleSides(double r);
typedef enum { typedef enum {

29
textscreens.cpp
View File

@ -561,6 +561,13 @@ void TextWindow::ScreenChangeEdgeColor(int link, DWORD v) {
ShowTextEditControl(49, 3, str); ShowTextEditControl(49, 3, str);
SS.TW.edit.meaning = EDIT_EDGE_COLOR; SS.TW.edit.meaning = EDIT_EDGE_COLOR;
} }
void TextWindow::ScreenChangeExportScale(int link, DWORD v) {
char str[1024];
sprintf(str, "%.3f", (double)SS.exportScale);
ShowTextEditControl(55, 3, str);
SS.TW.edit.meaning = EDIT_EXPORT_SCALE;
}
void TextWindow::ShowConfiguration(void) { void TextWindow::ShowConfiguration(void) {
int i; int i;
Printf(true, "%Ft material color-(r, g, b)"); Printf(true, "%Ft material color-(r, g, b)");
@ -594,7 +601,7 @@ void TextWindow::ShowConfiguration(void) {
SS.GetGroup(SS.GW.activeGroup)->runningMesh.l.n); SS.GetGroup(SS.GW.activeGroup)->runningMesh.l.n);
Printf(false, ""); Printf(false, "");
Printf(false, "%Ft perspective factor (0 for isometric)%E"); Printf(false, "%Ft perspective factor (0 for parallel)%E");
Printf(false, "%Ba %3 %Fl%Ll%f%D[change]%E", Printf(false, "%Ba %3 %Fl%Ll%f%D[change]%E",
SS.cameraTangent*1000, SS.cameraTangent*1000,
&ScreenChangeCameraTangent, 0); &ScreenChangeCameraTangent, 0);
@ -604,6 +611,12 @@ void TextWindow::ShowConfiguration(void) {
Printf(false, "%Ba %@, %@, %@ %Fl%Ll%f%D[change]%E", Printf(false, "%Ba %@, %@, %@ %Fl%Ll%f%D[change]%E",
REDf(SS.edgeColor), GREENf(SS.edgeColor), BLUEf(SS.edgeColor), REDf(SS.edgeColor), GREENf(SS.edgeColor), BLUEf(SS.edgeColor),
&ScreenChangeEdgeColor, 0); &ScreenChangeEdgeColor, 0);
Printf(false, "");
Printf(false, "%Ft export scale factor (1.0=mm, 25.4=inch)");
Printf(false, "%Ba %3 %Fl%Ll%f%D[change]%E",
(double)SS.exportScale,
&ScreenChangeExportScale, 0);
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -688,6 +701,20 @@ void TextWindow::EditControlDone(char *s) {
SS.GenerateAll(0, INT_MAX); SS.GenerateAll(0, INT_MAX);
break; break;
} }
case EDIT_EXPORT_SCALE: {
Expr *e = Expr::From(s);
if(e) {
double ev = e->Eval();
if(fabs(ev) < 0.001 || isnan(ev)) {
Error("Export scale must not be zero!");
} else {
SS.exportScale = (float)ev;
}
} else {
Error("Not a valid number or expression: '%s'", s);
}
break;
}
case EDIT_HELIX_TURNS: case EDIT_HELIX_TURNS:
case EDIT_HELIX_PITCH: case EDIT_HELIX_PITCH:
case EDIT_HELIX_DRADIUS: { case EDIT_HELIX_DRADIUS: {

2
ui.h
View File

@ -65,6 +65,7 @@ public:
static const int EDIT_MESH_TOLERANCE = 6; static const int EDIT_MESH_TOLERANCE = 6;
static const int EDIT_CAMERA_TANGENT = 7; static const int EDIT_CAMERA_TANGENT = 7;
static const int EDIT_EDGE_COLOR = 8; static const int EDIT_EDGE_COLOR = 8;
static const int EDIT_EXPORT_SCALE = 9;
static const int EDIT_HELIX_TURNS = 20; static const int EDIT_HELIX_TURNS = 20;
static const int EDIT_HELIX_PITCH = 21; static const int EDIT_HELIX_PITCH = 21;
static const int EDIT_HELIX_DRADIUS = 22; static const int EDIT_HELIX_DRADIUS = 22;
@ -131,6 +132,7 @@ public:
static void ScreenChangeMeshTolerance(int link, DWORD v); static void ScreenChangeMeshTolerance(int link, DWORD v);
static void ScreenChangeCameraTangent(int link, DWORD v); static void ScreenChangeCameraTangent(int link, DWORD v);
static void ScreenChangeEdgeColor(int link, DWORD v); static void ScreenChangeEdgeColor(int link, DWORD v);
static void ScreenChangeExportScale(int link, DWORD v);
void EditControlDone(char *s); void EditControlDone(char *s);
}; };

8
win32/w32main.cpp
View File

@ -88,12 +88,20 @@ void CnfFreezeString(char *str, char *name)
void CnfFreezeDWORD(DWORD v, char *name) void CnfFreezeDWORD(DWORD v, char *name)
{ FreezeDWORDF(v, FREEZE_SUBKEY, name); } { FreezeDWORDF(v, FREEZE_SUBKEY, name); }
void CnfFreezeFloat(float v, char *name)
{ FreezeDWORDF(*((DWORD *)&v), FREEZE_SUBKEY, name); }
void CnfThawString(char *str, int maxLen, char *name) void CnfThawString(char *str, int maxLen, char *name)
{ ThawStringF(str, maxLen, FREEZE_SUBKEY, name); } { ThawStringF(str, maxLen, FREEZE_SUBKEY, name); }
DWORD CnfThawDWORD(DWORD v, char *name) DWORD CnfThawDWORD(DWORD v, char *name)
{ return ThawDWORDF(v, FREEZE_SUBKEY, name); } { return ThawDWORDF(v, FREEZE_SUBKEY, name); }
float CnfThawFloat(float v, char *name) {
DWORD d = ThawDWORDF(*((DWORD *)&v), FREEZE_SUBKEY, name);
return *((float *)&d);
}
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// A separate heap, on which we allocate expressions. Maybe a bit faster, // A separate heap, on which we allocate expressions. Maybe a bit faster,