3D view: now displays polygons used in footprint shapes, like logos.

Removed useless messages in debug mode.
Fixed very minor issues (minor warnings in debug mode)
3D export: Added patch from Lorenzo Marcantonio.
Fixed issue in VRML export dialog.

3d-viewer/3d_viewer.h

@@ -171,6 +171,13 @@ public:
      * @param aZone_c = the zone to draw
     */
 	void   Draw3D_SolidPolygonsInZones( ZONE_CONTAINER* aZone_c );
+
+    /** Function Draw3D_Polygon
+     * draw one solid polygon
+     * @param aCornersList = a std::vector<wxPoint> liste of corners, in physical coordinates
+     * @param aZpos = the z position in 3D units
+    */
+    void   Draw3D_Polygon( std::vector<wxPoint>& aCornersList, double aZpos );
     void   Draw3D_Via( SEGVIA* via );
     void   Draw3D_DrawSegment( DRAWSEGMENT* segment );
     void   Draw3D_DrawText( TEXTE_PCB* text );

pcbnew/block.cpp

@@ -115,7 +115,7 @@ WinEDA_ExecBlockCmdFrame::WinEDA_ExecBlockCmdFrame( WinEDA_BasePcbFrame* parent,
 
     /* Sizer 1 creation */
     wxFlexGridSizer* fgSizer1;
-    fgSizer1 = new wxFlexGridSizer( 1, 1, 0, 0 );
+    fgSizer1 = new wxFlexGridSizer( 7, 1, 0, 0 );
     fgSizer1->SetFlexibleDirection( wxBOTH );
     fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 

pcbnew/dialog_edit_module_for_BoardEditor_base.h

-///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Apr 16 2008)
-// http://www.wxformbuilder.org/
-//
-// PLEASE DO "NOT" EDIT THIS FILE!
-///////////////////////////////////////////////////////////////////////////
-
-#ifndef __dialog_edit_module_for_BoardEditor_base__
-#define __dialog_edit_module_for_BoardEditor_base__
-
-#include <wx/intl.h>
-
-#include <wx/string.h>
-#include <wx/textctrl.h>
-#include <wx/gdicmn.h>
-#include <wx/font.h>
-#include <wx/colour.h>
-#include <wx/settings.h>
-#include <wx/button.h>
-#include <wx/sizer.h>
-#include <wx/statbox.h>
-#include <wx/radiobox.h>
-#include <wx/stattext.h>
-#include <wx/slider.h>
-#include <wx/statline.h>
-#include <wx/panel.h>
-#include <wx/bitmap.h>
-#include <wx/image.h>
-#include <wx/icon.h>
-#include <wx/listbox.h>
-#include <wx/notebook.h>
-#include <wx/dialog.h>
-
-///////////////////////////////////////////////////////////////////////////
-
-#define ID_NOTEBOOK 1000
-#define ID_LISTBOX_ORIENT_SELECT 1001
-#define ID_MODULE_PROPERTIES_EXCHANGE 1002
-#define ID_GOTO_MODULE_EDITOR 1003
-#define ID_BROWSE_3D_LIB 1004
-#define ID_ADD_3D_SHAPE 1005
-#define ID_REMOVE_3D_SHAPE 1006
-
-///////////////////////////////////////////////////////////////////////////////
-/// Class DIALOG_MODULE_BOARD_EDITOR_BASE
-///////////////////////////////////////////////////////////////////////////////
-class DIALOG_MODULE_BOARD_EDITOR_BASE : public wxDialog 
-{
-	private:
-		wxBoxSizer* m_GeneralBoxSizer;
-		wxBoxSizer* m_PropRightSizer;
-	
-	protected:
-		wxNotebook* m_NoteBook;
-		wxPanel* m_PanelProperties;
-		wxTextCtrl* m_ReferenceCtrl;
-		wxButton* m_button4;
-		wxTextCtrl* m_ValueCtrl;
-		wxButton* m_button5;
-		wxRadioBox* m_LayerCtrl;
-		wxRadioBox* m_OrientCtrl;
-		wxStaticText* m_staticText4;
-		wxTextCtrl* m_OrientValue;
-		wxStaticText* XPositionStatic;
-		wxTextCtrl* m_ModPositionX;
-		wxStaticText* YPositionStatic;
-		wxTextCtrl* m_ModPositionY;
-		wxButton* m_buttonExchange;
-		wxButton* m_buttonModuleEditor;
-		wxRadioBox* m_AttributsCtrl;
-		wxRadioBox* m_AutoPlaceCtrl;
-		wxStaticText* m_staticText11;
-		wxSlider* m_CostRot90Ctrl;
-		wxStaticText* m_staticText12;
-		wxSlider* m_CostRot180Ctrl;
-		wxStaticText* m_staticTextInfo;
-		wxStaticText* m_staticTextNetClearance;
-		wxTextCtrl* m_NetClearanceValueCtrl;
-		wxStaticText* m_NetClearanceUnits;
-		wxStaticLine* m_staticline1;
-		wxStaticLine* m_staticline2;
-		wxStaticLine* m_staticline3;
-		wxStaticText* m_MaskClearanceTitle;
-		wxTextCtrl* m_SolderMaskMarginCtrl;
-		wxStaticText* m_SolderMaskMarginUnits;
-		wxStaticText* m_staticTextSolderPaste;
-		wxTextCtrl* m_SolderPasteMarginCtrl;
-		wxStaticText* m_SolderPasteMarginUnits;
-		wxStaticText* m_staticTextRatio;
-		wxTextCtrl* m_SolderPasteMarginRatioCtrl;
-		wxStaticText* m_SolderPasteRatioMarginUnits;
-		wxPanel* m_Panel3D;
-		wxStaticText* m_staticText3Dname;
-		wxListBox* m_3D_ShapeNameListBox;
-		wxButton* m_buttonBrowse;
-		wxButton* m_buttonAdd;
-		wxButton* m_buttonRemove;
-		wxStdDialogButtonSizer* m_sdbSizerStdButtons;
-		wxButton* m_sdbSizerStdButtonsOK;
-		wxButton* m_sdbSizerStdButtonsCancel;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnEditReference( wxCommandEvent& event ){ event.Skip(); }
-		virtual void OnEditValue( wxCommandEvent& event ){ event.Skip(); }
-		virtual void ModuleOrientEvent( wxCommandEvent& event ){ event.Skip(); }
-		virtual void ExchangeModule( wxCommandEvent& event ){ event.Skip(); }
-		virtual void GotoModuleEditor( wxCommandEvent& event ){ event.Skip(); }
-		virtual void On3DShapeNameSelected( wxCommandEvent& event ){ event.Skip(); }
-		virtual void Browse3DLib( wxCommandEvent& event ){ event.Skip(); }
-		virtual void Add3DShape( wxCommandEvent& event ){ event.Skip(); }
-		virtual void Remove3DShape( wxCommandEvent& event ){ event.Skip(); }
-		virtual void OnCancelClick( wxCommandEvent& event ){ event.Skip(); }
-		virtual void OnOkClick( wxCommandEvent& event ){ event.Skip(); }
-		
-	
-	public:
-		wxStaticBoxSizer* m_Sizer3DValues;
-		DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Module properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 474,607 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
-		~DIALOG_MODULE_BOARD_EDITOR_BASE();
-	
-};
-
-#endif //__dialog_edit_module_for_BoardEditor_base__
+///////////////////////////////////////////////////////////////////////////
+// C++ code generated with wxFormBuilder (version Apr 16 2008)
+// http://www.wxformbuilder.org/
+//
+// PLEASE DO "NOT" EDIT THIS FILE!
+///////////////////////////////////////////////////////////////////////////
+
+#ifndef __dialog_edit_module_for_BoardEditor_base__
+#define __dialog_edit_module_for_BoardEditor_base__
+
+#include <wx/intl.h>
+
+#include <wx/string.h>
+#include <wx/textctrl.h>
+#include <wx/gdicmn.h>
+#include <wx/font.h>
+#include <wx/colour.h>
+#include <wx/settings.h>
+#include <wx/button.h>
+#include <wx/sizer.h>
+#include <wx/statbox.h>
+#include <wx/radiobox.h>
+#include <wx/stattext.h>
+#include <wx/slider.h>
+#include <wx/statline.h>
+#include <wx/panel.h>
+#include <wx/bitmap.h>
+#include <wx/image.h>
+#include <wx/icon.h>
+#include <wx/listbox.h>
+#include <wx/notebook.h>
+#include <wx/dialog.h>
+
+///////////////////////////////////////////////////////////////////////////
+
+#define ID_NOTEBOOK 1000
+#define ID_LISTBOX_ORIENT_SELECT 1001
+#define ID_MODULE_PROPERTIES_EXCHANGE 1002
+#define ID_GOTO_MODULE_EDITOR 1003
+#define ID_BROWSE_3D_LIB 1004
+#define ID_ADD_3D_SHAPE 1005
+#define ID_REMOVE_3D_SHAPE 1006
+
+///////////////////////////////////////////////////////////////////////////////
+/// Class DIALOG_MODULE_BOARD_EDITOR_BASE
+///////////////////////////////////////////////////////////////////////////////
+class DIALOG_MODULE_BOARD_EDITOR_BASE : public wxDialog 
+{
+	private:
+		wxBoxSizer* m_GeneralBoxSizer;
+		wxBoxSizer* m_PropRightSizer;
+	
+	protected:
+		wxNotebook* m_NoteBook;
+		wxPanel* m_PanelProperties;
+		wxTextCtrl* m_ReferenceCtrl;
+		wxButton* m_button4;
+		wxTextCtrl* m_ValueCtrl;
+		wxButton* m_button5;
+		wxRadioBox* m_LayerCtrl;
+		wxRadioBox* m_OrientCtrl;
+		wxStaticText* m_staticText4;
+		wxTextCtrl* m_OrientValue;
+		wxStaticText* XPositionStatic;
+		wxTextCtrl* m_ModPositionX;
+		wxStaticText* YPositionStatic;
+		wxTextCtrl* m_ModPositionY;
+		wxButton* m_buttonExchange;
+		wxButton* m_buttonModuleEditor;
+		wxRadioBox* m_AttributsCtrl;
+		wxRadioBox* m_AutoPlaceCtrl;
+		wxStaticText* m_staticText11;
+		wxSlider* m_CostRot90Ctrl;
+		wxStaticText* m_staticText12;
+		wxSlider* m_CostRot180Ctrl;
+		wxStaticText* m_staticTextInfo;
+		wxStaticText* m_staticTextNetClearance;
+		wxTextCtrl* m_NetClearanceValueCtrl;
+		wxStaticText* m_NetClearanceUnits;
+		wxStaticLine* m_staticline1;
+		wxStaticLine* m_staticline2;
+		wxStaticLine* m_staticline3;
+		wxStaticText* m_MaskClearanceTitle;
+		wxTextCtrl* m_SolderMaskMarginCtrl;
+		wxStaticText* m_SolderMaskMarginUnits;
+		wxStaticText* m_staticTextSolderPaste;
+		wxTextCtrl* m_SolderPasteMarginCtrl;
+		wxStaticText* m_SolderPasteMarginUnits;
+		wxStaticText* m_staticTextRatio;
+		wxTextCtrl* m_SolderPasteMarginRatioCtrl;
+		wxStaticText* m_SolderPasteRatioMarginUnits;
+		wxPanel* m_Panel3D;
+		wxStaticText* m_staticText3Dname;
+		wxListBox* m_3D_ShapeNameListBox;
+		wxButton* m_buttonBrowse;
+		wxButton* m_buttonAdd;
+		wxButton* m_buttonRemove;
+		wxStdDialogButtonSizer* m_sdbSizerStdButtons;
+		wxButton* m_sdbSizerStdButtonsOK;
+		wxButton* m_sdbSizerStdButtonsCancel;
+		
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnEditReference( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnEditValue( wxCommandEvent& event ){ event.Skip(); }
+		virtual void ModuleOrientEvent( wxCommandEvent& event ){ event.Skip(); }
+		virtual void ExchangeModule( wxCommandEvent& event ){ event.Skip(); }
+		virtual void GotoModuleEditor( wxCommandEvent& event ){ event.Skip(); }
+		virtual void On3DShapeNameSelected( wxCommandEvent& event ){ event.Skip(); }
+		virtual void Browse3DLib( wxCommandEvent& event ){ event.Skip(); }
+		virtual void Add3DShape( wxCommandEvent& event ){ event.Skip(); }
+		virtual void Remove3DShape( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnCancelClick( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnOkClick( wxCommandEvent& event ){ event.Skip(); }
+		
+	
+	public:
+		wxStaticBoxSizer* m_Sizer3DValues;
+		DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Module properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 474,607 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
+		~DIALOG_MODULE_BOARD_EDITOR_BASE();
+	
+};
+
+#endif //__dialog_edit_module_for_BoardEditor_base__

pcbnew/dialog_export_3Dfiles_base.cpp

@@ -24,7 +24,7 @@ DIALOG_EXPORT_3DFILE_BASE::DIALOG_EXPORT_3DFILE_BASE( wxWindow* parent, wxWindow
 	m_staticText1->Wrap( -1 );
 	bUpperSizer->Add( m_staticText1, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
 	
-	m_filePicker = new wxFilePickerCtrl( this, wxID_ANY, wxEmptyString, _("Save VRML Board File"), wxT("*.wrl"), wxDefaultPosition, wxDefaultSize, wxFLP_DEFAULT_STYLE|wxFLP_SAVE );
+	m_filePicker = new wxFilePickerCtrl( this, wxID_ANY, wxEmptyString, _("Save VRML Board File"), wxT("*.wrl"), wxDefaultPosition, wxDefaultSize, wxFLP_SAVE|wxFLP_USE_TEXTCTRL );
 	bUpperSizer->Add( m_filePicker, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
 	
 	m_staticText3 = new wxStaticText( this, wxID_ANY, _("Vrml 3D footprints shapes subdir:"), wxDefaultPosition, wxDefaultSize, 0 );

pcbnew/dialog_export_3Dfiles_base.fbp

@@ -154,7 +154,7 @@
                                 <property name="permission">protected</property>
                                 <property name="pos"></property>
                                 <property name="size"></property>
-                                <property name="style">wxFLP_DEFAULT_STYLE|wxFLP_SAVE</property>
+                                <property name="style">wxFLP_SAVE|wxFLP_USE_TEXTCTRL</property>
                                 <property name="subclass"></property>
                                 <property name="tooltip"></property>
                                 <property name="value"></property>

pcbnew/export_vrml.cpp

@@ -1085,7 +1085,7 @@ static void export_vrml_module( BOARD* aPcb, MODULE* aModule,
                  -vrmlm->m_MatPosition.y - aModule->m_Pos.y,
                  vrmlm->m_MatPosition.z + layer_z[aModule->GetLayer()] );
         fprintf( aOutputFile,
-                "  children [\n    Inline {\n      url [ \"%s\" ]\n    } ]\n",
+                "  children [\n    Inline {\n      url \"%s\"\n    } ]\n",
                 CONV_TO_UTF8( fname ) );
         fprintf( aOutputFile, "  }\n" );