Miroirs/leocad
1
0
Fork 0
mirror of https://github.com/leozide/leocad synced 2025-01-17 18:11:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Linux fixes.

Browse source
This commit is contained in:
leo 2012-07-21 00:31:21 +00:00
parent 56762b08d3
commit a026b323bf
3 changed files with 33 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
common/minifig.cpp
View file

@ -589,6 +589,7 @@ MinifigWizard::MinifigWizard (GLWindow *share)
m_MinifigCount = 0; m_MinifigCount = 0;
m_MinifigNames = NULL; m_MinifigNames = NULL;
m_MinifigTemplates = NULL; m_MinifigTemplates = NULL;
memset(m_Info, 0, sizeof(m_Info));
int Version = Sys_ProfileLoadInt("MinifigWizard", "Version", 1); int Version = Sys_ProfileLoadInt("MinifigWizard", "Version", 1);
if (Version == 1) if (Version == 1)
@ -743,7 +744,17 @@ void MinifigWizard::ParseSettings(lcFile& Settings)
} }
if (!FoundSection) if (!FoundSection)
{
lcMinifigPieceInfo MinifigInfo;
strncpy(MinifigInfo.Description, "None", sizeof(MinifigInfo.Description));
MinifigInfo.Description[sizeof(MinifigInfo.Description)-1] = 0;
MinifigInfo.Offset = lcMatrix44Identity();
MinifigInfo.Info = NULL;
InfoArray.Add(MinifigInfo);
continue; continue;
}
// Parse section. // Parse section.
while (Settings.ReadLine(Line, sizeof(Line))) while (Settings.ReadLine(Line, sizeof(Line)))

2
common/module.mk
View file

@ -1,4 +1,4 @@
SRC += common/algebra.cpp common/camera.cpp common/console.cpp common/curve.cpp common/lc_colors.cpp common/lc_file.cpp \ SRC += common/camera.cpp common/console.cpp common/curve.cpp common/lc_colors.cpp common/lc_file.cpp \
common/lc_mesh.cpp common/globals.cpp common/group.cpp common/image.cpp common/im_bmp.cpp common/im_gif.cpp \ common/lc_mesh.cpp common/globals.cpp common/group.cpp common/image.cpp common/im_bmp.cpp common/im_gif.cpp \
common/lc_application.cpp common/library.cpp common/light.cpp common/mainwnd.cpp \ common/lc_application.cpp common/library.cpp common/light.cpp common/mainwnd.cpp \
common/matrix.cpp common/message.cpp common/minifig.cpp common/object.cpp common/opengl.cpp \ common/matrix.cpp common/message.cpp common/minifig.cpp common/object.cpp common/opengl.cpp \

40
linux/dlgpiece.cpp
View file

@ -228,7 +228,7 @@ static void minifigdlg_createpair(LC_MINIFIGDLG_STRUCT* info, int idx, int num,
gtk_signal_connect(GTK_OBJECT(color), "clicked", GTK_SIGNAL_FUNC(minifigdlg_color_clicked), info); gtk_signal_connect(GTK_OBJECT(color), "clicked", GTK_SIGNAL_FUNC(minifigdlg_color_clicked), info);
gtk_table_attach(GTK_TABLE(table), color, 1, 2, idx, idx+1, (GtkAttachOptions) GTK_FILL, (GtkAttachOptions) GTK_EXPAND, 0, 0); gtk_table_attach(GTK_TABLE(table), color, 1, 2, idx, idx+1, (GtkAttachOptions) GTK_FILL, (GtkAttachOptions) GTK_EXPAND, 0, 0);
if ((num == LC_MFW_TORSO) || (num == LC_MFW_HIPS)) if ((num == LC_MFW_BODY) || (num == LC_MFW_BODY2) || (num == LC_MFW_BODY3))
{ {
info->angles[num] = NULL; info->angles[num] = NULL;
return; return;
@ -271,20 +271,21 @@ int minifigdlg_execute(void* param)
gtk_widget_show(hbox); gtk_widget_show(hbox);
gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0);
table = gtk_table_new(8, 3, FALSE); table = gtk_table_new(9, 3, FALSE);
gtk_widget_show(table); gtk_widget_show(table);
gtk_box_pack_start(GTK_BOX(hbox), table, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(hbox), table, TRUE, TRUE, 0);
gtk_table_set_col_spacings(GTK_TABLE(table), 5); gtk_table_set_col_spacings(GTK_TABLE(table), 5);
gtk_table_set_row_spacings(GTK_TABLE(table), 5); gtk_table_set_row_spacings(GTK_TABLE(table), 5);
minifigdlg_createpair(&s, 0, LC_MFW_HAT, table); minifigdlg_createpair(&s, 0, LC_MFW_HATS, table);
minifigdlg_createpair(&s, 1, LC_MFW_NECK, table); minifigdlg_createpair(&s, 1, LC_MFW_HATS2, table);
minifigdlg_createpair(&s, 2, LC_MFW_RIGHT_ARM, table); minifigdlg_createpair(&s, 2, LC_MFW_NECK, table);
minifigdlg_createpair(&s, 3, LC_MFW_RIGHT_HAND, table); minifigdlg_createpair(&s, 3, LC_MFW_LARM, table);
minifigdlg_createpair(&s, 4, LC_MFW_RIGHT_TOOL, table); minifigdlg_createpair(&s, 4, LC_MFW_LHAND, table);
minifigdlg_createpair(&s, 5, LC_MFW_HIPS, table); minifigdlg_createpair(&s, 5, LC_MFW_LHANDA, table);
minifigdlg_createpair(&s, 6, LC_MFW_RIGHT_LEG, table); minifigdlg_createpair(&s, 6, LC_MFW_BODY2, table);
minifigdlg_createpair(&s, 7, LC_MFW_RIGHT_SHOE, table); minifigdlg_createpair(&s, 7, LC_MFW_LLEG, table);
minifigdlg_createpair(&s, 8, LC_MFW_LLEGA, table);
s.wizard->CreateFromWindow(&s.preview); s.wizard->CreateFromWindow(&s.preview);
@ -298,19 +299,20 @@ int minifigdlg_execute(void* param)
gtk_widget_show(GTK_WIDGET(s.preview)); gtk_widget_show(GTK_WIDGET(s.preview));
gtk_object_set_data(GTK_OBJECT(s.preview), "minifig", &s); gtk_object_set_data(GTK_OBJECT(s.preview), "minifig", &s);
table = gtk_table_new(7, 3, FALSE); table = gtk_table_new(8, 3, FALSE);
gtk_widget_show(table); gtk_widget_show(table);
gtk_box_pack_start(GTK_BOX(hbox), table, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(hbox), table, TRUE, TRUE, 0);
gtk_table_set_col_spacings(GTK_TABLE(table), 5); gtk_table_set_col_spacings(GTK_TABLE(table), 5);
gtk_table_set_row_spacings(GTK_TABLE(table), 5); gtk_table_set_row_spacings(GTK_TABLE(table), 5);
minifigdlg_createpair(&s, 0, LC_MFW_HEAD, table); minifigdlg_createpair(&s, 0, LC_MFW_HEAD, table);
minifigdlg_createpair(&s, 1, LC_MFW_TORSO, table); minifigdlg_createpair(&s, 1, LC_MFW_BODY, table);
minifigdlg_createpair(&s, 2, LC_MFW_LEFT_ARM, table); minifigdlg_createpair(&s, 2, LC_MFW_RARM, table);
minifigdlg_createpair(&s, 3, LC_MFW_LEFT_HAND, table); minifigdlg_createpair(&s, 3, LC_MFW_RHAND, table);
minifigdlg_createpair(&s, 4, LC_MFW_LEFT_TOOL, table); minifigdlg_createpair(&s, 4, LC_MFW_RHANDA, table);
minifigdlg_createpair(&s, 5, LC_MFW_LEFT_LEG, table); minifigdlg_createpair(&s, 5, LC_MFW_BODY3, table);
minifigdlg_createpair(&s, 6, LC_MFW_LEFT_SHOE, table); minifigdlg_createpair(&s, 6, LC_MFW_RLEG, table);
minifigdlg_createpair(&s, 7, LC_MFW_RLEGA, table);
hbox = gtk_hbox_new(FALSE, 10); hbox = gtk_hbox_new(FALSE, 10);
gtk_widget_show(hbox); gtk_widget_show(hbox);
@ -350,11 +352,11 @@ int minifigdlg_execute(void* param)
} }
} }
gtk_widget_show(dlg);
minifigdlg_updatecombo(&s); minifigdlg_updatecombo(&s);
minifigdlg_updateselection(&s); minifigdlg_updateselection(&s);
gtk_widget_show(dlg);
for (i = 0; i < LC_MFW_NUMITEMS; i++) for (i = 0; i < LC_MFW_NUMITEMS; i++)
set_button_pixmap2(s.colors[i], gColorList[s.wizard->m_Colors[i]].Value); set_button_pixmap2(s.colors[i], gColorList[s.wizard->m_Colors[i]].Value);