haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added model coloring to the IDF 3D model plugin

This commit is contained in:
Cirilo Bernardo 2015-12-16 15:11:54 +11:00
parent c251fbac75
commit 580f7aecfc
2 changed files with 92 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
3d-viewer/3d_cache/sg/sg_helpers.cpp
View File

@ -33,7 +33,7 @@
#include "3d_cache/sg/sg_helpers.h" #include "3d_cache/sg/sg_helpers.h"
#include "3d_cache/sg/sg_node.h" #include "3d_cache/sg/sg_node.h"
#include <glm/glm.hpp> #include <glm/glm.hpp>
#include <glm/gtc/matrix_transform.hpp>
// formats a floating point number for text output to a VRML file // formats a floating point number for text output to a VRML file
void S3D::FormatFloat( std::string& result, double value ) void S3D::FormatFloat( std::string& result, double value )
@ -344,6 +344,7 @@ static void calcTriad( glm::dvec3* pts, glm::dvec3& tri )
{ {
if( degenerate( pts ) ) if( degenerate( pts ) )
{ {
// degenerate points should contribute nothing to the result
tri = glm::dvec3( 0.0, 0.0, 0.0 ); tri = glm::dvec3( 0.0, 0.0, 0.0 );
return; return;
} }

102
plugins/3d/idf/s3d_plugin_idf.cpp
View File

@ -37,6 +37,89 @@
#define PLUGIN_3D_IDF_REVNO 0 #define PLUGIN_3D_IDF_REVNO 0
static SGNODE* getColor( IFSG_SHAPE& shape )
{
IFSG_APPEARANCE material( shape );
static int idx = 0;
switch( idx )
{
case 0:
// magenta
material.SetSpecular( 0.8, 0.0, 0.8 );
material.SetDiffuse( 0.6, 0.0, 0.6 );
material.SetAmbient( 0.9 );
material.SetShininess( 0.3 );
++idx;
break;
case 1:
// red
material.SetSpecular( 0.69, 0.14, 0.14 );
material.SetDiffuse( 0.69, 0.14, 0.14 );
material.SetAmbient( 0.9 );
material.SetShininess( 0.3 );
++idx;
break;
case 2:
// orange
material.SetSpecular( 1.0, 0.44, 0.0 );
material.SetDiffuse( 1.0, 0.44, 0.0 );
material.SetAmbient( 0.9 );
material.SetShininess( 0.3 );
++idx;
break;
case 3:
// yellow
material.SetSpecular( 0.93, 0.94, 0.16 );
material.SetDiffuse( 0.93, 0.94, 0.16 );
material.SetAmbient( 0.9 );
material.SetShininess( 0.3 );
++idx;
break;
case 4:
// green
material.SetSpecular( 0.13, 0.81, 0.22 );
material.SetDiffuse( 0.13, 0.81, 0.22 );
material.SetAmbient( 0.9 );
material.SetShininess( 0.3 );
++idx;
break;
case 5:
// blue
material.SetSpecular( 0.1, 0.11, 0.88 );
material.SetDiffuse( 0.1, 0.11, 0.88 );
material.SetAmbient( 0.9 );
material.SetShininess( 0.3 );
++idx;
break;
default:
// violet
material.SetSpecular( 0.32, 0.07, 0.64 );
material.SetDiffuse( 0.32, 0.07, 0.64 );
material.SetAmbient( 0.9 );
material.SetShininess( 0.3 );
idx = 0;
break;
}
return material.GetRawPtr();
};
const char* GetKicadPluginName( void ) const char* GetKicadPluginName( void )
{ {
return "PLUGIN_3D_IDF"; return "PLUGIN_3D_IDF";
@ -213,27 +296,22 @@ SCENEGRAPH* Load( char const* aFileName )
} }
// magenta // magenta
IFSG_APPEARANCE* material = new IFSG_APPEARANCE( *shape); getColor( *shape );
material->SetSpecular( 1.0, 0.0, 1.0 );
material->SetDiffuse( 0.9, 0.0, 0.9 );
material->SetAmbient( 0.9 );
material->SetShininess( 0.3 );
SCENEGRAPH* data = (SCENEGRAPH*)tx0->GetRawPtr(); SCENEGRAPH* data = (SCENEGRAPH*)tx0->GetRawPtr();
// XXX - DEBUG - WRITE OUT IDF FILE TO CONFIRM NORMALS // DEBUG: WRITE OUT IDF FILE TO CONFIRM NORMALS
#ifdef DEBUG
wxFileName fn( aFileName ); wxFileName fn( aFileName );
wxString fnam = fn.GetName(); wxString output = fn.GetName();
fnam.append( wxT(".wrl") ); output.append( wxT(".wrl") );
std::cerr << "XXX: FILE NAME: " << fnam.ToUTF8() << "\n"; S3D::WriteVRML( output, true, (SGNODE*)(data), true, true );
S3D::WriteVRML( fnam, true, (SGNODE*)(data), true, true ); #endif
// delete the API wrappers // delete the API wrappers
delete shape; delete shape;
delete face; delete face;
delete coordIdx; delete coordIdx;
delete material;
delete cp; delete cp;
delete tx0; delete tx0;