b82ccc3b4e
Reverted 6912 with minor changes (LockCtx requires to specify canvas that locks a context).
2016-06-13 16:43:33 +02:00
1c838ba92f
Slightly modify a declaration to make compil compatible with gcc 4.8.4, used in Ubuntu 14.04 LTS (the latest LTS currently available), and to avoid many bug reports.
2016-06-13 14:19:47 +02:00
688fb5caaa
Minor enhancements in dlg_3d_pathconfig (better look, but not perfect). Also fix an issue: the minimal dialog size was not always calculated.
2016-06-13 12:41:27 +02:00
b09f079ab4
3D file name resolver improvements.
...
* Add a Help button and text to the 3D alias configuration dialog
* Display KISYS3DMOD and internally defined KiCad path env vars
* Add a button to bring up the "Configure Paths" (env vars) dialog
* Remove the file name mapping feature from the resolver; this results in
the resolver always using the current definition rather than a possibly
outdated cache value.
2016-06-12 18:46:00 -04:00
f25d12f571
Footprint 3D properties dialog panel: fixes a bug on the offset of 3D Settings (Footprint) (the value range of the offset parameters were not set so it was not able to enter values <-10)
...
Also make some small layout changes on the orientation parameters in order to make it vertical smaller.
2016-06-09 14:27:58 +02:00
e0a7f0041a
Better 3D filename resolution
2016-06-09 07:48:49 +02:00
71aade6b51
Fixed a few warnings (mostly gcc6 -Wmisleading-indent).
2016-06-07 14:42:42 +02:00
b83c148e10
Delete OpenGL context on GLCanvas subclasses destruction.
2016-06-03 15:46:13 +02:00
94a460080e
Added missing code for C3D_MODEL_VIEWER to use GL_CONTEXT_MANAGER.
2016-06-03 15:46:12 +02:00
01f32dd52c
GL_CONTEXT_MANAGER class to avoid unexpected GL context switches.
2016-06-03 15:46:12 +02:00
42b659efe1
Fix build error on non-debug builds.
2016-06-01 16:58:27 -04:00
0a6245e5cc
Remove not working bom_cvs.xsl file. Fix minor compil warnings in x3dmodelparser.cpp.
2016-06-01 18:42:01 +02:00
a4658ab6be
Fix a few compil warnings (not used vars, shadowed local vars)
2016-06-01 14:22:05 +02:00
34f223a707
Fix FP Editor : Invalid Filename Err.msg message wheb trying to edit a 3D filename
2016-05-30 10:22:19 +02:00
48ad75719c
Remove redundant old copy of cimage class (3d-viewer/CImage.cpp and 3d-viewer/CImage.h)
2016-05-30 08:31:32 +02:00
f1c9f284fd
Dialog 3D path config: fix incorrect grid cells sizes when opening the dialog, and incorrect min size dialog.
2016-05-28 11:33:20 +02:00
3c0859686b
Gerbview: fix a stupid mistake I made in rev 6829 (crash when reading a gbr file). 3d path config dialog: make it resizable.
2016-05-26 18:58:32 +02:00
dbb78db7ef
Gerbview: Shows now in the Layer manager the filename of gerber or drill files loaded.
...
A fex minor compil warnng fixes
2016-05-23 17:47:16 +02:00
5904e4c942
Correct handling of unused parameter
...
Coverity: CID 143742
2016-05-10 23:25:53 -04:00
05255cbae8
Clean up dodgy array dimension
...
Array is in pairs but has a single sentinel, trips up Coverity (CID 147346) and
does allow an out-of-bounds write if WX_GL_SAMPLES were ever removed from the
array.
2016-05-10 23:15:33 -04:00
ec67218b5a
Remove unneeded 'new' and NULL check
...
Coverity CID: 143743
2016-05-10 22:36:44 -04:00
d8ca03b362
3D viewer: set right OpenGL context before freeing memory.
2016-05-09 17:59:59 +02:00
da312db7a4
Fixed a wxWidgets assertion. Newer wxWidgets (3.1) display a message saying that horizontal alignment flags are ignored with wxEXPAND.
2016-05-02 15:56:12 +02:00
db54f3e7a7
Correct multiple UI spelling errors
2016-05-02 10:01:43 -04:00
ce331b03e8
3D_cache/cmakelists.txt: Don't clear CMAKE_CXX_FLAGS compiler flags
2016-05-02 11:45:23 +02:00
d7f1400e44
Make strings only used in debug mode not translatable.
2016-04-21 09:19:08 +02:00
6120472d60
3D file name resolver improvements.
...
* Paths defined via pcbnew->Preferences->Configure Paths are now included in
the 3D file browser's drop-down list except for KICAD_PTEMPLATES, KIGITHUB,
KISYSMOD, any paths resembling a URL, and any non-existent paths. When an
absolute path is shortened using one of these path aliases, let's say
'KISYS3DMOD' then the name appears in the pcb file as "${KISYS3DMOD}/blah.wrl".
If a user defines and actual environment variable with the same name, then
that user defined variable will have precedence over the internally defined
variable.
* Paths relative to the current project directory are no longer represented
as "some/path/to/file.wrl". For compatibility with previous KiCad versions
it shall always be stored as ${KIPRJMOD}/some/path/to/file.wrl.
* Various restrictions on alias path values have been removed since the
imposed restrictions could result in corrupted user data as aliases are
silently dropped.
* Overall the patch should improve back-compatibility by providing a ${ENV_VAR}
mechanism for supporting different model root directories and ensuring that
paths relative to KIPRJMOD are expressed in a way that is compatible with
earlier KiCad versions. This allows users more flexibility and the ability
to work in a way that ensures 3D model files can be correctly resolved in
earlier versions of KiCad. Users who do not care about back-compatibility
may prefer to use the newer alias system.
2016-04-17 18:35:32 -04:00
28d49b6589
fix race condition related to 3D cache and resolver
...
The attached patch fixes a segfault due to a race condition.
If a user starts eeschema with an empty sheet and clicks
the 'cvpcb' button, memory is corrupted and the program
segfaults. The issue appears to arise from multiple threads
accessing the 3D cache and resolver. This patch makes
relevant code thread-safe by using a wxCriticalSection.
2016-04-10 23:03:39 -04:00
c146cc09eb
Kicad: fix a crash when changing a project, if pcbnew was run and "Update PCB from Schematic" was run and Schematic editor never opened.
...
(In this case the schematic frame exists, but some members are not initialized as expected, and a crash happens when calling the schematic editor dtor)
Minor other fix: avoid multiple very similar strings to translate in 3d_filename_resolver.cpp
2016-04-08 14:11:05 +02:00
973786d75d
Fix 3D Coverity issue, other minor fixes
...
* CID 143740: Null pointer dereferences (NULL_RETURNS)
A few minor cut/paste and style issues in the 3D code are also fixed.
2016-04-07 18:54:14 -04:00
6a65341599
3D: Make file test more portable
2016-04-06 22:41:24 -04:00
ffc7740cc2
3D: fix bounding box assert and include order
2016-04-06 21:48:51 -04:00
c2a60d14d7
3D: fix issues reported by Coverity scan
...
*** CID 143752: Incorrect expression (USELESS_CALL)
*** CID 143751: Incorrect expression (UNUSED_VALUE)
*** CID 143749: Uninitialized members (UNINIT_CTOR)
*** CID 143748: Uninitialized members (UNINIT_CTOR)
*** CID 143747: Uninitialized members (UNINIT_CTOR)
*** CID 143746: Uninitialized members (UNINIT_CTOR)
*** CID 143745: Uninitialized members (UNINIT_CTOR)
*** CID 143744: Uninitialized members (UNINIT_CTOR)
*** CID 143740: Null pointer dereferences (NULL_RETURNS)
*** CID 143739: Memory - corruptions (MISMATCHED_ITERATOR)
*** CID 143735: Integer handling issues (CONSTANT_EXPRESSION_RESULT)
*** CID 143734: Error handling issues (CHECKED_RETURN)
2016-04-06 21:41:52 -04:00
e1b308b3b1
fix segfault in python scripting caused by new 3D code
...
The attached patch ensures the S3D_MASTER class does not cause
a segfault in pcbnew when used from Python scripting.
The issue is due to an "extern KIWAY* TheKiway" which was exposed
to allow S3D_MASTER to use the new resolver to handle 3D filenames.
Unfortunately TheKiway cannot be assigned a value until a window is
created which implements Kiway. The change introduced by this
patch should not alter the behavior of S3D_MASTER compared to
the behavior before the 3D merge.
The extern variable is only there to support S3D_MASTER which in
turn is there to support the current 3DViewer. In the planned software
structure the rather complex S3D_MASTER class is replaced with
a simple struct which only holds the model name and position/
orientation/scale data as stored in the PCB file; since the replacement
does not perform filename resolution there is no need to expose the
Kiway. For example in Mario's branch we removed the extern and
S3D_MASTER class many months ago.
2016-04-05 20:32:50 -04:00
d18cdf1c53
merge 3d_initial_merge branch
2016-04-05 19:56:01 +02:00
20b40aba1c
Fixed bad delete/delete [] invocations and other warnings and errors as suggested by cppcheck
2016-04-05 20:32:22 +10:00
80f8e74797
Make changes to GLM header includes as per suggestions by Mario Luzeiro
2016-03-21 18:39:25 +11:00
10c8a57c59
Fixed timestamp checking code to use canonical filename
2016-03-21 07:21:54 +11:00
aa16666d72
Added file modification check to model cache code
2016-03-20 11:45:55 +11:00
491e0250c0
Suppress dialog pop-up when 3D file resolver does not find a file
2016-03-15 11:39:28 +11:00
a30151231f
Fix invocation of glm::cross and glm::normalize
2016-03-15 11:38:55 +11:00
30f9aba7c9
Work on SG consistency checks: fixed a number of bugs and improved integrity checking when writing cache files
2016-03-14 12:30:59 +11:00
0085d1aea7
Fixed unsigned vs signed int comparisons
2016-03-11 09:37:39 +11:00
862cd7e5a4
Fix event processing on C3D_MODEL_VIEWER to allow click-to-focus
2016-03-02 12:29:20 +11:00
d4655020f9
Fix zoom issue on MSWin (wxCanvas requires focus)
2016-03-02 07:50:32 +11:00
d0a2080823
Merge with main branch r6601
2016-03-01 11:44:15 +11:00
5b0a250609
Fix compilation and install for OSX plus general code cleanup
2016-03-01 10:08:19 +11:00
04000883f3
Fix 3d-viewer regressions introduced by touchpad-panning for non-touchpad-panning.
...
* Fix broken horizontal scrolling with ctrl-wheel
* Restore previous step size
2016-02-26 17:19:22 -05:00
0b18af3fdb
Changed resolver failure message to use wxLogMessage instead of wxMessageBox
2016-02-26 15:18:59 +11:00
37c85113ee
Changed resolver failure message to use wxLogMessage instead of wxMessageBox
2016-02-26 15:16:55 +11:00
097ac3a6b7
Changed resolver failure message to use wxLogMessage instead of wxMessageBox
2016-02-26 15:14:20 +11:00
e7c32873ea
Remove bad default behavior of adding current working dir to default search path
2016-02-25 14:31:59 +11:00
b2bdca4b7b
Remove wxASSERT in new cbbox code which was a nuisance to the legacy 3DViewer
2016-02-25 09:52:00 +11:00
f8abe9c191
Add support for optional touchpad panning.
2016-02-24 14:53:02 -05:00
5306db0c98
Added missing include to 3d_plugin_manager
2016-02-24 07:26:58 +11:00
9195451e12
Switched SG* classes and plugin loader logging code from stderr to wxLogTrace
2016-02-23 17:46:22 +11:00
d051a8f47e
Changed IFSG* log reports from stderr/stdout to wxLogTrace
2016-02-23 16:28:41 +11:00
c98ebdb8f0
Changed 3d_cache log reporting from stderr/stdout to wxLogTrace
2016-02-23 14:33:24 +11:00
2f8c55cd99
Fixed segfault on getSHA1 (fopen result was not checked)
2016-02-23 11:38:58 +11:00
5776037a70
Flush model data upon exit of Footprint Properties dialogs
2016-02-21 11:54:34 +11:00
f247b05b3e
Merged Mario's fix to Material + per-vertex colors and transparency
2016-02-16 08:07:17 +11:00
a4861a0d64
Sync with main r6555
2016-02-14 09:16:40 +11:00
450c2e4371
fix Tickness typo
2016-02-11 16:02:37 +01:00
050bdbc772
Pcbnew: minor changes:
...
* Dialog copper zones: Always enable thermal shape settings, because even with no thermal, some pads can use thermal option in local pad settings.
* GAL mode: shows page limits in gray color, like in legacy mode, and according to comments in sources.
2016-02-09 09:23:24 +01:00
711607f152
Fix minor Bug #1542935 (No solder mask unless there is something on the layer)
2016-02-08 14:04:42 +01:00
4edce46764
Fixed bug: ambient intensity RGB not correctly written/read
2016-02-07 08:52:42 +11:00
99aba8f261
Changed handling of ambientIntensity; change of major version in SG* lib
2016-02-07 08:41:27 +11:00
68dde1f16f
Fixed inappropriate model scale limitation in 3D Footprint Properties dialogs
2016-02-04 12:31:37 +11:00
86635aeb23
Manually select changes from Mario Luzeiro's branch to fix model lighting in the preview window.
2016-02-04 12:16:19 +11:00
bf3d2b252e
Fixed VRML normals calculations
2016-02-03 11:44:48 +11:00
8dd744f635
Improved 3D cache manager's ability to replace outdated cache models
2016-01-31 13:21:12 +11:00
ece1291d93
Fixed SG* CMake control file to handle new sg_version.h file
2016-01-29 12:00:03 +11:00
dddc3d91e9
Cleaned up 3D SceneGraph API by removing references to wxString
2016-01-29 11:52:42 +11:00
cd831d9a8a
Removed include directives for wx/wx.h within 3D cache code
2016-01-28 17:12:41 +11:00
1028535561
Small improvements to 3D file selector UI
2016-01-26 11:50:01 +11:00
fc5556c811
Sync with main branch r6513
2016-01-26 10:35:16 +11:00
cb8ccb5882
Small UI improvements
2016-01-25 16:59:45 +11:00
cc906ec12e
Removed deprecated header
2016-01-25 15:58:24 +11:00
3eca3fe75d
Implemented new 3D file selector with preview
2016-01-25 15:55:36 +11:00
3e2b4244f9
OSX: add support for wxMagnifyEvent on OSX builds using wxWidgets 3.1.0 or greater.
2016-01-24 19:18:29 -05:00
ff07ad3f05
Fixed bug: 3D model selector sets scale values to zero
2016-01-24 08:37:28 +11:00
20f97f34c3
Temporarily disabled some 3D data transfer code due to cross-platform differences in wxFileDialog
2016-01-23 20:36:39 +11:00
31af6d7dbc
Fixed GUI issues related to setting scale/offset/rotation
2016-01-23 20:07:58 +11:00
c79cc21396
Fixed syntax problem in MSWin specific code
2016-01-23 16:34:29 +11:00
fa37f233ef
Added 'Change' button to 3D file selector to improve UI usability
2016-01-23 16:24:12 +11:00
81f95a8dbc
Improve message displayed when resolver encounters a non-existent alias
2016-01-23 16:09:42 +11:00
7c829c9e84
Added manual editing of 3D file name with alias tags
2016-01-23 14:52:54 +11:00
ab2fff46f1
Added version tag to cache data
2016-01-20 09:07:09 +11:00
3a80de107d
+ Improved 3D file resolution behavior with respect to duplicated paths
...
+ Added versioning to the 3D search path configuration file
2016-01-20 08:36:26 +11:00
ec9acfd410
+ Changed wxT macro from _T() to _()
...
+ Added hints to 3d_filename_resolver to help transition from
legacy 3D model resolver behavior.
2016-01-19 11:05:40 +11:00
d3f68e6482
Fix resolution of paths relative to KISYS3DMOD in legacy support
2016-01-19 10:30:20 +11:00
625ce3cb69
Fix accidental application of filters to all cells of 3D search path GUI
2016-01-19 10:11:09 +11:00
54940002f9
Implemented 3D search path configuration GUI
2016-01-18 19:53:35 +11:00
7848b2a52e
Implemented new 3D searchpath configurator
2016-01-18 16:59:06 +11:00
7434e673e1
Fixed bug in VRML coordinate conversion
2016-01-18 10:54:24 +11:00
9a0b020806
Added VRML conversion of 'translation' and 'center' to mm on read and 0.1 inch on write
2016-01-18 10:39:51 +11:00
ef62a5f153
Ensure consistent use of mm within SG models and that SG models write VRML files using 0.1 inch units
2016-01-18 08:35:29 +11:00
9aeaf4a71b
Prevent unresolved path expansions from appearing as blank entries in 3D path list
2016-01-18 08:34:21 +11:00
4d5097b41d
Work in progress: preparing new resolver scheme
2016-01-15 14:01:21 +11:00
2ed89c29d2
Work in progress: transition to new 3D name resolution with nicknames
2016-01-15 11:28:28 +11:00
d519df22ca
Change parameter type to accommodate expected integer range
2016-01-14 13:50:16 +11:00
f4414e8325
Change 3D cache manager to use boost SHA-1 digest rather than in-tree MD5
2016-01-14 13:49:40 +11:00
81977ed6b7
Finished checking debug/info messages and internationalization where appropriate
2016-01-12 18:03:17 +11:00
3a5110f74a
Work in progress: checking debug output messages, internationalizing user info messages
2016-01-12 17:09:04 +11:00
f123fab15b
Removed unnecessary platform-dependent includes
2016-01-11 16:25:38 +11:00
e0b50b4002
Ensuring consistent internal kicad file separator character on MSWin
2016-01-11 16:24:51 +11:00
c81a0d0f2f
Moved data transfer from OnOK to TransferDataFromWindow() and removed all instances of OnOK and OnExit
2016-01-11 16:14:35 +11:00
14bee875cf
Replaced platform-dependent dynamic loading code with wxPluginManager
2016-01-11 15:47:08 +11:00
2bdc4d770b
Fixed plugin->Load invocation (passed wxString instead of const char*)
2016-01-11 14:04:54 +11:00
c24c07962b
Fixed bug in display of Footprint Properties rotation (text too long)
2016-01-08 18:53:45 +11:00
87c62b443d
Improved SG* code to avoid spurious warnings when adding child/reference nodes
2016-01-08 17:04:17 +11:00
979edc4f9f
Improved VRML1 conformance to spec
2016-01-08 16:23:42 +11:00
e8593d177c
Change 'class S3D_INFO' declarations to 'struct S3D_INFO'
2016-01-07 19:54:39 +11:00
1b6480e858
Added support for VRML1 transforms (except for MatrixTransform)
2016-01-07 17:01:07 +11:00
8a9eb3bbe8
Fixed various bugs in VRML2 and VRML1 code
2016-01-07 11:24:11 +11:00
29d7829909
Fix for MSWin (plugins not found)
2016-01-06 20:05:29 +11:00
9d55ad375f
Removing redundant sg/ifsg colorindex files and references
2016-01-06 18:19:20 +11:00
403cd94edc
Fixed color indexing for VRML2 plugin
2016-01-06 16:51:29 +11:00
6f309a46c9
Implemented per-vertex colors for VRML2 and SGNODE
2016-01-06 16:15:54 +11:00
6b873ed46b
Work in progress: implementing SG translation for VRML1 models
2016-01-06 15:34:14 +11:00
98f867629b
Added debug printouts to help debug plugin search/loading on MSWin
2016-01-06 06:48:27 +11:00
c798f8b545
Added support for FreeCAD VRML files
2016-01-04 18:10:15 +11:00
97d4c33a9f
Fixed preview pane resizing
2016-01-04 09:15:53 +11:00
59cf4c5ed0
+ Fixed calculation of overall transform in SCENEGRAPH
...
+ Fixed NULL dereference bug in VRML2 nodes
2016-01-03 14:55:30 +11:00
fad73f0e85
VRML2 3D plugin is now functional
2016-01-02 12:21:02 +11:00
b426740195
Removed dead code modules
2016-01-01 16:23:21 +11:00
07bd4cbc04
+ Resync with main r6397
...
+ Work in progress: VRML parser
2015-12-22 11:08:39 +11:00
0ea1c67caf
eeschema plot dialog: cosmetic enhancement:
...
Including the inline of the Output directory and its text field/browse button.
Moving the plot format to the left of the plot options as the plot options depend on the plot format.
2015-12-21 16:08:37 +01:00
a11bbffe9b
Code reorganization, and change the way 3D viewer frame is managed (now using wxWidgets wxWindow::FindWindowByName() to know if it is existing) , to prepare others fixes.
2015-12-21 12:52:00 +01:00
70be4e8f7f
+ Reverted accidental edit of sg_node.cpp
...
+ Fixed invocation of SHAPE_POLY_SET::Simplify() to match changes in main
2015-12-19 17:53:07 +11:00
2c4b220f3c
Resync with main branch r6383
2015-12-19 15:02:52 +11:00
396825d960
Cleaning up in preparation for merge
2015-12-19 14:57:02 +11:00
86c54ce636
Modified IDF plugin to support IDF assemblies (*.emn) in addition to component outlines (*.idf)
2015-12-18 19:43:27 +11:00
008d8a540a
+ Fixed bug in SGSHAPE::Prepare() : bad assignment of color pointer
...
+ Reworked s3d_plugin_demo2.cpp to use per-vertex-per-face normals
+ Reworked s3d_plugin_idf.cpp to use per-vertex-per-face normals
2015-12-17 13:55:35 +11:00
eab70be17b
Changed cache->Prepare() to cache->GetModel()
2015-12-17 09:21:30 +11:00
c0fcb15e3a
+ Rework S3D_CACHE::Prepare() to take only a filename and return
...
non-transformed S3DMODEL for rendering.
+ S3D_CACHE now caches S3DMODEL and returns a pointer to a single
instance of the S3DMODEL for repeated calls to Prepare()
+ Beginning the VRML Plugin
2015-12-16 20:01:44 +11:00
580f7aecfc
Added model coloring to the IDF 3D model plugin
2015-12-16 15:11:54 +11:00
c251fbac75
+ Improved the normals calculations (however it's still buggy)
...
+ Reworked 3D plugins to use normals calculations
2015-12-16 14:25:46 +11:00
178cf0dc25
Polygon calculation (zones filling): use fast mode when possible (in fact most of time) and strictly simple polygon option only in critical cases (in fact in plot Gerber functions mainly).
...
In polygon calculations (combining polygons, fracture) the mode of calculation (fast or strictly simple polygon option) as no more a default value, because choosing the best mode is better to optimize the calculation time.
2015-12-15 21:21:25 +01:00
304cd81ebd
+ Bugfix: changed Plugin Loader to expect 'GetPluginVersion' instead of
...
'GetVersion'.
+ Introduced normal calculations. This is buggy due to multiple equal
face normals distorting the vertex normal; this will be fixed by
removing the redundant face normals from the calculations.
2015-12-15 18:53:03 +11:00
6f4be750b5
Fix GLM 3D viewer build configuration error.
2015-12-14 19:43:00 -05:00
1940bd71e4
Resync with main branch + fix MSWin build (accidental inclusion of dlfcn.h)
2015-12-15 10:56:11 +11:00
2128594a85
Coding policy fixes: remove trailing white space.
2015-12-14 16:20:54 -05:00
f099ae27c5
Feature implementation complete: save and load cache data
2015-12-14 20:15:44 +11:00
4924db7491
Bugfix: create 3d config path if nonexistent
2015-12-14 18:41:15 +11:00
a2fe783f53
Finished refactor and introduction of generic Plugin scheme
2015-12-14 14:51:28 +11:00
3ff8ca0caf
Refactored to use new generic plugin base
2015-12-14 08:45:22 +11:00
86042d86a6
Added partial render ability to IDF plugin
2015-12-11 17:37:42 +11:00
b46451ec81
Introducing the IDF 3D plugin and reorganizing directories
2015-12-11 08:34:52 +11:00
210416aca4
Attempting to improve the file selector path list combo box
2015-12-10 15:02:05 +11:00
Maciej Suminski
jean-pierre charras
Cirilo Bernardo
Mário Luzeiro
Wayne Stambaugh
Simon Richter
Chris Pavlina
Matthew Petroff
Cirilo Bernardo
Bernhard Stegmaier
Cirilo Bernardo
unknown
unknown
Kristian Nielsen