Merge lp:~azonenberg/kicad/advanced-feature-bugfixes into lp:kicad/product

[Andrew Zonenberg]

Parallelized 3D model vertex normal calculations to use all available CPU cores for significant speedup

[Maciej Suminski (orsonmmz)]

Hi Andrew,

You are pretty fast, thank you for the patches once again! Would you please add one more thing? We already had issues on systems that do not support OpenMP out of the box, therefore could you wrap the appropriate parts with #ifdef USE_OPENMP..#endif? You may have a look at pcbnew/ratsnest_data.cpp if you want a reference.

Thank you in advance,
Orson

[Wayne Stambaugh (stambaughw)]

Please follow the KiCad Coding Policy when committing patches. Line 10 of your patch:

+ m_PerFaceVertexNormals.resize(m_CoordIndex.size());

should look like:

+ m_PerFaceVertexNormals.resize( m_CoordIndex.size() );

There is also trailing white space on line 8.

Thanks,

Wayne

[Andrew Zonenberg (azonenberg)]

r5047 should fix both of your concerns.

[lp:~azonenberg/kicad/advanced-feature-bugfixes]

5045. By Cirilo Bernardo on 2014-08-03

export IDF without empty PLACEMENT section

5046. By Maciej Suminski on 2014-08-04

bugfix: modules are not selectable in the high contrast mode (GAL).

5047. By Maciej Suminski on 2014-08-04

Fixed module anchor drawing (GAL).

5048. By Maciej Suminski on 2014-08-04

Selected items do not disappear after rendering backend switch.

5049. By jean-pierre charras on 2014-08-04

3D viewer: move helper functions from 3d_draw.cpp to 3d_draw_helper_functions.cpp. Add comments in .h sources. Better management of background color. coding style fixes.

5050. By jean-pierre charras on 2014-08-04

Fix some case sensitive filename issues.

5051. By Martin Errenst on 2014-08-04

Anti-aliasing patch for the 3D-Viewer from Martin Janitschke

5052. By jean-pierre charras on 2014-08-04

Fix wx28 compatibility.

5053. By Maciej Suminski on 2014-08-04

Changed 'line width change' & 'change arc posture' to TOOL_ACTIONs.

5054. By Mario Luzeiro on 2014-08-05

3d-viewer: fix compil warning, by Mario Luzeiro, with some coding style fixes.
common.cpp: remove useless warning on wxWidgets < 3.0 about --with-gtkprint build option: on wxWidgets < 3.0 on Linux the print function does not work even with this build option.

5055. By Dick Hollenbeck on 2014-08-06

KIWAY support in 5054 is stable enough to use in view of all other new features.

5056. By Maciej Suminski on 2014-08-06

Disable highlight mode in the module editor (GAL).

5057. By Maciej Suminski on 2014-08-06

Items are either dragged by their origin or moved by a vector (depending on the number of selected items) (GAL).

5058. By Maciej Suminski on 2014-08-06

Fixed filled arcs drawing (GAL).

5059. By Maciej Suminski on 2014-08-06

Buried/blind vias indicate the layers they go through (GAL).

5060. By Maciej Suminski on 2014-08-08

Initalize fields in TOOL_EVENT constructors.

5061. By jean-pierre charras on 2014-08-09

Cosmetic enhancement: change plot icon in menus.
3dviewer: back to double (from float) in class S3D_MASTER for 3 members (m_MatScale, m_MatRotation, m_MatPosition) which are used in dialogs and r/w file functions, which expect double.
Using float create minor but unwanted issues in r/w file functions.
S3D_MATERIAL: enable all color options: if a 3d shape has bad color parameters, the shape must be modified, not the 3d rendering.
The rendering now matches what we see in other vrml viewer like FreeCAD.
Some minor coding style fixes.

5062. By Thiadmer Riemersma on 2014-08-10

Pcbnew: Commit patch (with very minor changes) about SVG file export with the layers ordered from bottom to top. ( bug 1286646 ), from Thiadmer Riemersma.

5063. By Maciej Suminski on 2014-08-12

FIxed invisible layers problem after changing the number of layers (GAL).

5064. By Andrew Zonenberg on 2014-08-12

3D viewer: Parallelized 3D model vertex normal calculations to use all available CPU cores for significant speedup.

=== modified file '3d-viewer/3d_mesh_model.cpp'
--- 3d-viewer/3d_mesh_model.cpp	2014-08-02 07:46:47 +0000
+++ 3d-viewer/3d_mesh_model.cpp	2014-08-12 08:17:58 +0000
@@ -24,13 +24,17 @@
 
 /**
  * @file 3d_mesh_model.cpp
- * @brief 
+ * @brief
  */
 
 
 #include <3d_mesh_model.h>
 #include <boost/geometry/algorithms/area.hpp>
 
+#ifdef USE_OPENMP
+#include <omp.h>
+#endif /* USE_OPENMP */
+
 S3D_MESH::S3D_MESH()
 {
     isPerFaceNormalsComputed = false;
@@ -118,21 +122,21 @@
     for( unsigned int idx = 0; idx < m_CoordIndex.size(); idx++ )
     {
         if( m_MaterialIndex.size() > 1 )
-        {       
+        {
             if( m_Materials )
             {
                 m_Materials->SetOpenGLMaterial( m_MaterialIndex[idx] );
             }
-        }          
-        
-        
+        }
+
+
         switch( m_CoordIndex[idx].size() )
         {
-            case 3:     glBegin( GL_TRIANGLES );break;
-            case 4:     glBegin( GL_QUADS );    break;
-            default:    glBegin( GL_POLYGON );  break;
+        case 3:     glBegin( GL_TRIANGLES );break;
+        case 4:     glBegin( GL_QUADS );    break;
+        default:    glBegin( GL_POLYGON );  break;
         }
-        
+
 
         if( m_PerVertexNormalsNormalized.size() > 0 )
         {
@@ -167,7 +171,7 @@
                 glNormal3fv( &normal.x );
 
                 glm::vec3 point = m_Point[m_CoordIndex[idx][ii]];
-                glVertex3fv( &point.x );                        
+                glVertex3fv( &point.x );
             }
         }
 
@@ -258,7 +262,7 @@
 
     //DBG( printf("m_CoordIndex.size %u\n", m_CoordIndex.size()) );
     //DBG( printf("m_PointNormalized.size %u\n", m_PointNormalized.size()) );
-    
+
     for( unsigned int idx = 0; idx < m_CoordIndex.size(); idx++ )
     {
 
@@ -307,7 +311,7 @@
         if( haveAlreadyNormals_from_model_file == false )
         {
 
-            // normalize vertex normal           
+            // normalize vertex normal
             float l = glm::length( cross_prod );
 
             if( l > FLT_EPSILON ) // avoid division by zero
@@ -331,7 +335,7 @@
 
             m_PerFaceNormalsNormalized.push_back( cross_prod );
         }
-        
+
     }
 
 }
@@ -355,13 +359,18 @@
 
     m_PerFaceVertexNormals.clear();
 
+    // Pre-allocate space for the entire vector of vertex normals so we can do parallel writes
+    m_PerFaceVertexNormals.resize( m_CoordIndex.size() );
+
     // for each face A in mesh
+    #ifdef USE_OPENMP
+    #pragma omp parallel for
+    #endif /* USE_OPENMP */
     for( unsigned int each_face_A_idx = 0; each_face_A_idx < m_CoordIndex.size(); each_face_A_idx++ )
     {
         // n = face A facet normal
-        std::vector< glm::vec3 > face_A_normals;
-        face_A_normals.clear();
-        face_A_normals.resize(m_CoordIndex[each_face_A_idx].size());
+        std::vector< glm::vec3 >& face_A_normals = m_PerFaceVertexNormals[each_face_A_idx];
+        face_A_normals.resize( m_CoordIndex[each_face_A_idx].size() );
 
         // loop through all 3 vertices
         // for each vert in face A
@@ -393,16 +402,14 @@
                 }
             }
 
-            // normalize vertex normal           
+            // normalize vertex normal
             float l = glm::length( face_A_normals[each_vert_A_idx] );
 
             if( l > FLT_EPSILON ) // avoid division by zero
             {
                 face_A_normals[each_vert_A_idx] /= l;
             }
-            
+
         }
-
-        m_PerFaceVertexNormals.push_back( face_A_normals );
     }
 }