Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
CGoGN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
CGoGN
CGoGN
Commits
601d62f3
Commit
601d62f3
authored
Feb 06, 2013
by
Pierre Kraemer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update FindSuiteSparse.cmake
parent
ad2ac4e6
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
39 additions
and
47 deletions
+39
-47
SCHNApps/Plugins/surfaceDeformation/include/surfaceDeformation.h
...s/Plugins/surfaceDeformation/include/surfaceDeformation.h
+2
-2
SCHNApps/Plugins/surfaceDeformation/src/surfaceDeformation.cpp
...pps/Plugins/surfaceDeformation/src/surfaceDeformation.cpp
+8
-11
SCHNApps/bin/init.py
SCHNApps/bin/init.py
+6
-6
cmake_modules/FindSuiteSparse.cmake
cmake_modules/FindSuiteSparse.cmake
+23
-28
No files found.
SCHNApps/Plugins/surfaceDeformation/include/surfaceDeformation.h
View file @
601d62f3
...
...
@@ -15,7 +15,7 @@
using
namespace
CGoGN
;
using
namespace
SCHNApps
;
namespace
CGoGN
{
namespace
Utils
{
class
Drawer
;
}
}
//
namespace CGoGN { namespace Utils { class Drawer; } }
enum
SelectionMode
...
...
@@ -143,7 +143,7 @@ private:
SurfaceDeformationDockTab
*
m_dockTab
;
QHash
<
View
*
,
ParameterSet
*>
h_viewParams
;
Utils
::
Drawer
*
m_drawer
;
//
Utils::Drawer* m_drawer;
bool
b_refreshingUI
;
...
...
SCHNApps/Plugins/surfaceDeformation/src/surfaceDeformation.cpp
View file @
601d62f3
...
...
@@ -6,7 +6,7 @@
#include "Algo/Geometry/normal.h"
#include "Algo/Geometry/laplacian.h"
#include "Utils/drawer.h"
//
#include "Utils/drawer.h"
#include <QKeyEvent>
#include <QMouseEvent>
...
...
@@ -95,25 +95,22 @@ bool SurfaceDeformationPlugin::enable()
connect
(
m_window
,
SIGNAL
(
viewAndPluginUnlinked
(
View
*
,
Plugin
*
)),
this
,
SLOT
(
viewUnlinked
(
View
*
,
Plugin
*
)));
connect
(
m_window
,
SIGNAL
(
currentViewChanged
(
View
*
)),
this
,
SLOT
(
currentViewChanged
(
View
*
)));
Utils
::
ShaderColorPerVertex
*
s
=
new
Utils
::
ShaderColorPerVertex
();
registerShader
(
s
);
m_drawer
=
new
Utils
::
Drawer
();
registerShader
(
m_drawer
->
getShader
());
// m_drawer = new Utils::Drawer();
// registerShader(m_drawer->getShader());
return
true
;
}
void
SurfaceDeformationPlugin
::
disable
()
{
delete
m_drawer
;
//
delete m_drawer;
}
void
SurfaceDeformationPlugin
::
redraw
(
View
*
view
)
{
if
(
selecting
)
{
glDisable
(
GL_LIGHTING
)
;
/*
glDisable(GL_LIGHTING) ;
m_drawer->newList(GL_COMPILE_AND_EXECUTE) ;
m_drawer->lineWidth(2.0f) ;
m_drawer->begin(GL_LINES) ;
...
...
@@ -132,7 +129,7 @@ void SurfaceDeformationPlugin::redraw(View* view)
m_drawer->vertex(selectionCenter + selectionRadius * PFP2::VEC3(0,0,-1)) ;
m_drawer->end() ;
m_drawer->endList() ;
}
*/
}
ParameterSet
*
params
=
h_viewParams
[
view
];
MapHandlerGen
*
mh
=
params
->
selectedMap
;
...
...
@@ -142,7 +139,7 @@ void SurfaceDeformationPlugin::redraw(View* view)
if
(
!
perMap
->
locked_vertices
.
empty
()
||
!
perMap
->
handle_vertices
.
empty
())
{
glDisable
(
GL_LIGHTING
)
;
/*
glDisable(GL_LIGHTING) ;
m_drawer->newList(GL_COMPILE_AND_EXECUTE) ;
m_drawer->pointSize(4.0f) ;
m_drawer->begin(GL_POINTS) ;
...
...
@@ -157,7 +154,7 @@ void SurfaceDeformationPlugin::redraw(View* view)
m_drawer->vertex(perMap->positionAttribute[perMap->handle_vertices[i]]) ;
m_drawer->end() ;
m_drawer->endList() ;
}
*/
}
}
}
...
...
SCHNApps/bin/init.py
View file @
601d62f3
...
...
@@ -5,15 +5,15 @@ differentialPropertiesPlugin = schnapps.loadPlugin("DifferentialProperties");
subdivisionPlugin
=
schnapps
.
loadPlugin
(
"SubdivideSurface"
);
surfaceDeformationPlugin
=
schnapps
.
loadPlugin
(
"SurfaceDeformation"
);
obj
=
importPlugin
.
importFromFile
(
"/home/kraemer/Media/Data/surface/lowRes/iphi_good_9k.off"
);
#
obj = importPlugin.importFromFile("/home/kraemer/Media/Data/surface/lowRes/iphi_good_9k.off");
v
=
schnapps
.
getView
(
"view_0"
);
#
v = schnapps.getView("view_0");
schnapps
.
linkViewAndPlugin
(
v
.
getName
(),
renderPlugin
.
getName
());
schnapps
.
linkViewAndPlugin
(
v
.
getName
(),
renderVectorPlugin
.
getName
());
schnapps
.
linkViewAndPlugin
(
v
.
getName
(),
surfaceDeformationPlugin
.
getName
());
#
schnapps.linkViewAndPlugin(v.getName(), renderPlugin.getName());
#
schnapps.linkViewAndPlugin(v.getName(), renderVectorPlugin.getName());
#
schnapps.linkViewAndPlugin(v.getName(), surfaceDeformationPlugin.getName());
schnapps
.
linkViewAndMap
(
v
.
getName
(),
obj
.
getName
());
#
schnapps.linkViewAndMap(v.getName(), obj.getName());
#differentialPropertiesPlugin.computeNormal(obj.getName());
#differentialPropertiesPlugin.computeCurvature(obj.getName());
cmake_modules/FindSuiteSparse.cmake
View file @
601d62f3
...
...
@@ -38,18 +38,15 @@ if( WIN32 )
ENDIF
(
SUITESPARSE_LIBRARY_DIRS
)
else
(
WIN32
)
IF
(
APPLE
)
IF
(
APPLE
)
FIND_PATH
(
CHOLMOD_INCLUDE_DIR cholmod.h
PATHS /opt/local/include/ufsparse
)
PATHS /opt/local/include/ufsparse
/usr/local/include
)
FIND_PATH
(
SUITESPARSE_LIBRARY_DIR
NAMES libSuiteSparse.dylib
PATHS /opt/local/lib
)
list
(
APPEND SUITESPARSE_LIBRARY_DIRS
${
SUITESPARSE_LIBRARY_DIR
}
)
list
(
APPEND SUITESPARSE_LIBRARIES SuiteSparse
)
NAMES libcholmod.a
PATHS /opt/local/lib
/usr/local/lib
)
ELSE
(
APPLE
)
FIND_PATH
(
CHOLMOD_INCLUDE_DIR cholmod.h
PATHS /usr/local/include
...
...
@@ -57,15 +54,12 @@ else( WIN32 )
/usr/include/suitesparse/
${
CMAKE_SOURCE_DIR
}
/MacOS/Libs/cholmod
PATH_SUFFIXES cholmod/ CHOLMOD/
)
FIND_PATH
(
SUITESPARSE_LIBRARY_DIR
NAMES libcholmod.so
PATHS /usr/lib
/usr/lib64
/usr/local/lib
)
ENDIF
(
APPLE
)
# Add cholmod include directory to collection include directories
...
...
@@ -73,25 +67,25 @@ else( WIN32 )
list
(
APPEND SUITESPARSE_INCLUDE_DIRS
${
CHOLMOD_INCLUDE_DIR
}
)
ENDIF
(
CHOLMOD_INCLUDE_DIR
)
# if we found the library, add it to the defined libraries
IF
(
SUITESPARSE_LIBRARY_DIR
)
# Skipped, as this is set for apple in the block above
if
(
NOT APPLE
)
list
(
APPEND SUITESPARSE_LIBRARIES amd
)
list
(
APPEND SUITESPARSE_LIBRARIES btf
)
list
(
APPEND SUITESPARSE_LIBRARIES camd
)
list
(
APPEND SUITESPARSE_LIBRARIES ccolamd
)
list
(
APPEND SUITESPARSE_LIBRARIES cholmod
)
list
(
APPEND SUITESPARSE_LIBRARIES colamd
)
# list ( APPEND SUITESPARSE_LIBRARIES csparse)
list
(
APPEND SUITESPARSE_LIBRARIES cxsparse
)
list
(
APPEND SUITESPARSE_LIBRARIES klu
)
# list ( APPEND SUITESPARSE_LIBRARIES spqr)
list
(
APPEND SUITESPARSE_LIBRARIES umfpack
)
endif
()
list
(
APPEND SUITESPARSE_LIBRARIES amd
)
list
(
APPEND SUITESPARSE_LIBRARIES btf
)
list
(
APPEND SUITESPARSE_LIBRARIES camd
)
list
(
APPEND SUITESPARSE_LIBRARIES ccolamd
)
list
(
APPEND SUITESPARSE_LIBRARIES cholmod
)
list
(
APPEND SUITESPARSE_LIBRARIES colamd
)
# list ( APPEND SUITESPARSE_LIBRARIES csparse)
list
(
APPEND SUITESPARSE_LIBRARIES cxsparse
)
list
(
APPEND SUITESPARSE_LIBRARIES klu
)
# list ( APPEND SUITESPARSE_LIBRARIES spqr)
list
(
APPEND SUITESPARSE_LIBRARIES umfpack
)
IF
(
APPLE
)
list
(
APPEND SUITESPARSE_LIBRARIES suitesparseconfig
)
ENDIF
(
APPLE
)
# Metis and spqr are optional
FIND_LIBRARY
(
SUITESPARSE_METIS_LIBRARY
NAMES metis
...
...
@@ -125,6 +119,7 @@ IF (SUITESPARSE_INCLUDE_DIRS AND SUITESPARSE_LIBRARIES)
list
(
APPEND SUITESPARSE_INCLUDE_DIRS
${
CHOLMOD_INCLUDE_DIR
}
/../../UFconfig
)
ENDIF
(
WIN32
)
SET
(
SUITESPARSE_FOUND TRUE
)
MESSAGE
(
STATUS
"Found SuiteSparse"
)
ELSE
(
SUITESPARSE_INCLUDE_DIRS AND SUITESPARSE_LIBRARIES
)
SET
(
SUITESPARSE_FOUND FALSE
)
ENDIF
(
SUITESPARSE_INCLUDE_DIRS AND SUITESPARSE_LIBRARIES
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment