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

Removed some trailing white space. Fixed FindGLM.

This commit is contained in:
Cirilo Bernardo 2015-12-10 11:31:44 +11:00
parent 41025154a6
commit 4e12999fa8
10 changed files with 45 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
3d-viewer/3d_model_viewer/c3d_model_viewer.cpp
View File

@ -274,14 +274,14 @@ void C3D_MODEL_VIEWER::OnPaint( wxPaintEvent &event )
double modelunit_to_3d_units_factor = m_BiuTo3Dunits * UNITS3D_TO_UNITSPCB; double modelunit_to_3d_units_factor = m_BiuTo3Dunits * UNITS3D_TO_UNITSPCB;
const SFVEC3F model_center = m_ogl_3dmodel->GetBBox().GetCenter();
glTranslatef( model_center.x, model_center.y, model_center.z );
glScaled( modelunit_to_3d_units_factor, modelunit_to_3d_units_factor, modelunit_to_3d_units_factor); glScaled( modelunit_to_3d_units_factor, modelunit_to_3d_units_factor, modelunit_to_3d_units_factor);
//const SFVEC3F model_center = m_ogl_3dmodel->GetBBox().GetCenter();
//glTranslatef( -model_center.x, -model_center.y, -model_center.z );
m_ogl_3dmodel->Draw_opaque(); m_ogl_3dmodel->Draw_opaque();
//m_ogl_3dmodel->Draw_transparent(); //m_ogl_3dmodel->Draw_transparent();
//m_ogl_3dmodel->Draw_bboxes(); m_ogl_3dmodel->Draw_bboxes();
glPopMatrix(); glPopMatrix();
} }

17
CMakeModules/FindGLM.cmake
View File

@ -8,15 +8,16 @@ if( ${CMAKE_MAJOR_VERSION} STREQUAL "2" AND ${CMAKE_MINOR_VERSION} STREQUAL "8"
endif() endif()
find_path( GLM_INCLUDE_DIR glm.hpp PATH_SUFFIXES glm ) find_path( GLM_INCLUDE_DIR glm/glm.hpp )
if( NOT ${GLM_INCLUDE_DIR} STREQUAL "" ) if( NOT ${GLM_INCLUDE_DIR} STREQUAL "GLM_INCLUDE_DIR-NOTFOUND" )
# attempt to extract the GLM Version information from setup.hpp # attempt to extract the GLM Version information from setup.hpp
find_file( GLM_SETUP setup.hpp PATHS ${GLM_INCLUDE_DIR} PATH_SUFFIXES core detail NO_DEFAULT_PATH ) find_file( GLM_SETUP setup.hpp PATHS ${GLM_INCLUDE_DIR} PATH_SUFFIXES glm/core glm/detail NO_DEFAULT_PATH )
if( NOT ${GLM_SETUP} STREQUAL "GLM_SETUP-NOTFOUND" )
if( GLM_SETUP )
# extract the "#define GLM_VERSION*" lines # extract the "#define GLM_VERSION*" lines
file( STRINGS ${GLM_SETUP} _version REGEX "^#define.*GLM_VERSION.*" ) file( STRINGS ${GLM_SETUP} _version REGEX "^#define.*GLM_VERSION.*" )
@ -50,14 +51,16 @@ if( NOT ${GLM_INCLUDE_DIR} STREQUAL "" )
set( GLM_VERSION ${_GLM_VERSION_MAJOR}.${_GLM_VERSION_MINOR}.${_GLM_VERSION_PATCH}.${_GLM_VERSION_REVISION} ) set( GLM_VERSION ${_GLM_VERSION_MAJOR}.${_GLM_VERSION_MINOR}.${_GLM_VERSION_PATCH}.${_GLM_VERSION_REVISION} )
unset( GLM_SETUP CACHE ) unset( GLM_SETUP CACHE )
endif( GLM_SETUP ) endif()
endif( NOT ${GLM_INCLUDE_DIR} STREQUAL "" ) endif()
include( FindPackageHandleStandardArgs ) include( FindPackageHandleStandardArgs )
FIND_PACKAGE_HANDLE_STANDARD_ARGS( GLM FIND_PACKAGE_HANDLE_STANDARD_ARGS( GLM
REQUIRED_VARS GLM_INCLUDE_DIR REQUIRED_VARS
GLM_INCLUDE_DIR
GLM_VERSION
VERSION_VAR GLM_VERSION ) VERSION_VAR GLM_VERSION )

2
include/plugins/3dapi/ifsg_api.h
View File

@ -30,7 +30,7 @@
#define IFSG_API_H #define IFSG_API_H
#include <wx/string.h> #include <wx/string.h>
#include <glm.hpp> #include <glm/glm.hpp>
#include "plugins/3dapi/sg_types.h" #include "plugins/3dapi/sg_types.h"
#include "plugins/3dapi/sg_base.h" #include "plugins/3dapi/sg_base.h"

18
include/plugins/3dapi/xv3d_types.h
View File

@ -31,15 +31,15 @@
#define XV3D_TYPES_H #define XV3D_TYPES_H
#define GLM_FORCE_RADIANS #define GLM_FORCE_RADIANS
#include <glm.hpp> #include <glm/glm.hpp>
#include <gtc/matrix_transform.hpp> #include <glm/gtc/matrix_transform.hpp>
#include <gtc/type_ptr.hpp> #include <glm/gtc/type_ptr.hpp>
#include <gtx/matrix_major_storage.hpp> #include <glm/gtx/matrix_major_storage.hpp>
#include <gtx/matrix_decompose.hpp> #include <glm/gtx/matrix_decompose.hpp>
#include <gtx/quaternion.hpp> #include <glm/gtx/quaternion.hpp>
#include <gtx/fast_square_root.hpp> #include <glm/gtx/fast_square_root.hpp>
#include <gtx/rotate_vector.hpp> #include <glm/gtx/rotate_vector.hpp>
//#include <gtx/simd_vec4.hpp> //#include <glm/gtx/simd_vec4.hpp>
typedef glm::uvec2 SFVEC2UI; typedef glm::uvec2 SFVEC2UI;
typedef glm::ivec2 SFVEC2I; typedef glm::ivec2 SFVEC2I;