Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
KennethVanhoey
CGoGN
Commits
353f07b8
Commit
353f07b8
authored
Sep 02, 2013
by
Pierre Kraemer
Browse files
new plugin -> renderVector
parent
4266a0c6
Changes
15
Hide whitespace changes
Inline
Side-by-side
SCHNApps/Plugins/CMakeLists.txt
View file @
353f07b8
...
...
@@ -2,4 +2,5 @@ cmake_minimum_required(VERSION 2.8)
ADD_SUBDIRECTORY
(
surface_import
)
ADD_SUBDIRECTORY
(
surface_render
)
ADD_SUBDIRECTORY
(
surface_renderVector
)
ADD_SUBDIRECTORY
(
surface_differentialProperties
)
SCHNApps/Plugins/surface_differentialProperties/CMakeLists.txt
View file @
353f07b8
cmake_minimum_required
(
VERSION 2.8
)
SET
(
PLUGIN_NAME DifferentialProperties
)
SET
(
PLUGIN_NAME
Surface_
DifferentialProperties
)
SET
(
PLUGIN_ROOT_DIR
${
SCHNApps_ROOT_DIR
}
/Plugins/surface_differentialProperties
)
...
...
SCHNApps/Plugins/surface_render/forms/surface_render.ui
View file @
353f07b8
<?xml version="1.0" encoding="UTF-8"?>
<ui
version=
"4.0"
>
<class>
SurfaceRender_TabWidget
</class>
<widget
class=
"QWidget"
name=
"SurfaceRender_TabWidget"
>
<class>
Surface
_
Render_TabWidget
</class>
<widget
class=
"QWidget"
name=
"Surface
_
Render_TabWidget"
>
<property
name=
"geometry"
>
<rect>
<x>
0
</x>
...
...
SCHNApps/Plugins/surface_render/include/surface_render.h
View file @
353f07b8
...
...
@@ -44,18 +44,18 @@ struct MapParameters
FaceShadingStyle
faceStyle
;
};
class
SurfaceRenderPlugin
:
public
PluginInteraction
class
Surface
_
Render
_
Plugin
:
public
PluginInteraction
{
Q_OBJECT
Q_INTERFACES
(
CGoGN
::
SCHNApps
::
Plugin
)
friend
class
SurfaceRender_DockTab
;
friend
class
Surface
_
Render_DockTab
;
public:
SurfaceRenderPlugin
()
Surface
_
Render
_
Plugin
()
{}
~
SurfaceRenderPlugin
()
~
Surface
_
Render
_
Plugin
()
{}
private:
...
...
@@ -97,7 +97,7 @@ public slots:
void
changeFacesStyle
(
const
QString
&
view
,
const
QString
&
map
,
MapParameters
::
FaceShadingStyle
style
);
protected:
SurfaceRender_DockTab
*
m_dockTab
;
Surface
_
Render_DockTab
*
m_dockTab
;
QHash
<
View
*
,
QHash
<
MapHandlerGen
*
,
MapParameters
>
>
h_viewParameterSet
;
CGoGN
::
Utils
::
ShaderFlat
*
m_flatShader
;
...
...
SCHNApps/Plugins/surface_render/include/surface_render_dockTab.h
View file @
353f07b8
...
...
@@ -11,21 +11,21 @@ namespace SCHNApps
{
class
SCHNApps
;
class
SurfaceRenderPlugin
;
class
Surface
_
Render
_
Plugin
;
struct
MapParameters
;
class
SurfaceRender_DockTab
:
public
QWidget
,
public
Ui
::
SurfaceRender_TabWidget
class
Surface
_
Render_DockTab
:
public
QWidget
,
public
Ui
::
Surface
_
Render_TabWidget
{
Q_OBJECT
friend
class
SurfaceRenderPlugin
;
friend
class
Surface
_
Render
_
Plugin
;
public:
SurfaceRender_DockTab
(
SCHNApps
*
s
,
SurfaceRenderPlugin
*
p
);
Surface
_
Render_DockTab
(
SCHNApps
*
s
,
Surface
_
Render
_
Plugin
*
p
);
private:
SCHNApps
*
m_schnapps
;
SurfaceRenderPlugin
*
m_plugin
;
Surface
_
Render
_
Plugin
*
m_plugin
;
bool
b_updatingUI
;
private
slots
:
...
...
SCHNApps/Plugins/surface_render/src/surface_render.cpp
View file @
353f07b8
...
...
@@ -8,10 +8,10 @@ namespace CGoGN
namespace
SCHNApps
{
bool
SurfaceRenderPlugin
::
enable
()
bool
Surface
_
Render
_
Plugin
::
enable
()
{
m_dockTab
=
new
SurfaceRender_DockTab
(
m_schnapps
,
this
);
m_schnapps
->
addPluginDockTab
(
this
,
m_dockTab
,
"SurfaceRender"
);
m_dockTab
=
new
Surface
_
Render_DockTab
(
m_schnapps
,
this
);
m_schnapps
->
addPluginDockTab
(
this
,
m_dockTab
,
"Surface
_
Render"
);
m_flatShader
=
new
CGoGN
::
Utils
::
ShaderFlat
();
m_flatShader
->
setAmbiant
(
CGoGN
::
Geom
::
Vec4f
(
0.2
f
,
0.2
f
,
0.2
f
,
0.1
f
));
...
...
@@ -48,7 +48,7 @@ bool SurfaceRenderPlugin::enable()
return
true
;
}
void
SurfaceRenderPlugin
::
disable
()
void
Surface
_
Render
_
Plugin
::
disable
()
{
delete
m_flatShader
;
delete
m_phongShader
;
...
...
@@ -59,7 +59,7 @@ void SurfaceRenderPlugin::disable()
mapRemoved
(
map
);
}
void
SurfaceRenderPlugin
::
drawMap
(
View
*
view
,
MapHandlerGen
*
map
)
void
Surface
_
Render
_
Plugin
::
drawMap
(
View
*
view
,
MapHandlerGen
*
map
)
{
const
MapParameters
&
p
=
h_viewParameterSet
[
view
][
map
];
if
(
p
.
positionVBO
)
...
...
@@ -88,15 +88,15 @@ void SurfaceRenderPlugin::drawMap(View* view, MapHandlerGen* map)
case
MapParameters
::
FLAT
:
m_flatShader
->
setAttributePosition
(
p
.
positionVBO
);
map
->
draw
(
m_flatShader
,
CGoGN
::
Algo
::
Render
::
GL2
::
TRIANGLES
);
break
;
break
;
case
MapParameters
::
PHONG
:
if
(
p
.
normalVBO
!=
NULL
)
{
m_phongShader
->
setAttributePosition
(
p
.
positionVBO
)
;
m_phongShader
->
setAttributeNormal
(
p
.
normalVBO
)
;
m_phongShader
->
setAttributePosition
(
p
.
positionVBO
);
m_phongShader
->
setAttributeNormal
(
p
.
normalVBO
);
map
->
draw
(
m_phongShader
,
CGoGN
::
Algo
::
Render
::
GL2
::
TRIANGLES
);
}
break
;
break
;
}
glDisable
(
GL_POLYGON_OFFSET_FILL
);
}
...
...
@@ -107,23 +107,23 @@ void SurfaceRenderPlugin::drawMap(View* view, MapHandlerGen* map)
void
SurfaceRenderPlugin
::
selectedViewChanged
(
View
*
prev
,
View
*
cur
)
void
Surface
_
Render
_
Plugin
::
selectedViewChanged
(
View
*
prev
,
View
*
cur
)
{
m_dockTab
->
updateMapParameters
();
}
void
SurfaceRenderPlugin
::
selectedMapChanged
(
MapHandlerGen
*
prev
,
MapHandlerGen
*
cur
)
void
Surface
_
Render
_
Plugin
::
selectedMapChanged
(
MapHandlerGen
*
prev
,
MapHandlerGen
*
cur
)
{
m_dockTab
->
updateMapParameters
();
}
void
SurfaceRenderPlugin
::
mapAdded
(
MapHandlerGen
*
map
)
void
Surface
_
Render
_
Plugin
::
mapAdded
(
MapHandlerGen
*
map
)
{
connect
(
map
,
SIGNAL
(
vboAdded
(
Utils
::
VBO
*
)),
this
,
SLOT
(
vboAdded
(
Utils
::
VBO
*
)));
connect
(
map
,
SIGNAL
(
vboRemoved
(
Utils
::
VBO
*
)),
this
,
SLOT
(
vboRemoved
(
Utils
::
VBO
*
)));
}
void
SurfaceRenderPlugin
::
mapRemoved
(
MapHandlerGen
*
map
)
void
Surface
_
Render
_
Plugin
::
mapRemoved
(
MapHandlerGen
*
map
)
{
disconnect
(
map
,
SIGNAL
(
vboAdded
(
Utils
::
VBO
*
)),
this
,
SLOT
(
vboAdded
(
Utils
::
VBO
*
)));
disconnect
(
map
,
SIGNAL
(
vboRemoved
(
Utils
::
VBO
*
)),
this
,
SLOT
(
vboRemoved
(
Utils
::
VBO
*
)));
...
...
@@ -133,7 +133,7 @@ void SurfaceRenderPlugin::mapRemoved(MapHandlerGen *map)
void
SurfaceRenderPlugin
::
vboAdded
(
Utils
::
VBO
*
vbo
)
void
Surface
_
Render
_
Plugin
::
vboAdded
(
Utils
::
VBO
*
vbo
)
{
MapHandlerGen
*
map
=
static_cast
<
MapHandlerGen
*>
(
QObject
::
sender
());
...
...
@@ -147,7 +147,7 @@ void SurfaceRenderPlugin::vboAdded(Utils::VBO *vbo)
}
}
void
SurfaceRenderPlugin
::
vboRemoved
(
Utils
::
VBO
*
vbo
)
void
Surface
_
Render
_
Plugin
::
vboRemoved
(
Utils
::
VBO
*
vbo
)
{
MapHandlerGen
*
map
=
static_cast
<
MapHandlerGen
*>
(
QObject
::
sender
());
...
...
@@ -188,7 +188,7 @@ void SurfaceRenderPlugin::vboRemoved(Utils::VBO *vbo)
void
SurfaceRenderPlugin
::
changePositionVBO
(
const
QString
&
view
,
const
QString
&
map
,
const
QString
&
vbo
)
void
Surface
_
Render
_
Plugin
::
changePositionVBO
(
const
QString
&
view
,
const
QString
&
map
,
const
QString
&
vbo
)
{
View
*
v
=
m_schnapps
->
getView
(
view
);
MapHandlerGen
*
m
=
m_schnapps
->
getMap
(
map
);
...
...
@@ -204,7 +204,7 @@ void SurfaceRenderPlugin::changePositionVBO(const QString& view, const QString&
}
}
void
SurfaceRenderPlugin
::
changeNormalVBO
(
const
QString
&
view
,
const
QString
&
map
,
const
QString
&
vbo
)
void
Surface
_
Render
_
Plugin
::
changeNormalVBO
(
const
QString
&
view
,
const
QString
&
map
,
const
QString
&
vbo
)
{
View
*
v
=
m_schnapps
->
getView
(
view
);
MapHandlerGen
*
m
=
m_schnapps
->
getMap
(
map
);
...
...
@@ -220,7 +220,7 @@ void SurfaceRenderPlugin::changeNormalVBO(const QString& view, const QString& ma
}
}
void
SurfaceRenderPlugin
::
changeRenderVertices
(
const
QString
&
view
,
const
QString
&
map
,
bool
b
)
void
Surface
_
Render
_
Plugin
::
changeRenderVertices
(
const
QString
&
view
,
const
QString
&
map
,
bool
b
)
{
View
*
v
=
m_schnapps
->
getView
(
view
);
MapHandlerGen
*
m
=
m_schnapps
->
getMap
(
map
);
...
...
@@ -235,7 +235,7 @@ void SurfaceRenderPlugin::changeRenderVertices(const QString& view, const QStrin
}
}
void
SurfaceRenderPlugin
::
changeVerticesScaleFactor
(
const
QString
&
view
,
const
QString
&
map
,
float
f
)
void
Surface
_
Render
_
Plugin
::
changeVerticesScaleFactor
(
const
QString
&
view
,
const
QString
&
map
,
float
f
)
{
View
*
v
=
m_schnapps
->
getView
(
view
);
MapHandlerGen
*
m
=
m_schnapps
->
getMap
(
map
);
...
...
@@ -250,7 +250,7 @@ void SurfaceRenderPlugin::changeVerticesScaleFactor(const QString& view, const Q
}
}
void
SurfaceRenderPlugin
::
changeRenderEdges
(
const
QString
&
view
,
const
QString
&
map
,
bool
b
)
void
Surface
_
Render
_
Plugin
::
changeRenderEdges
(
const
QString
&
view
,
const
QString
&
map
,
bool
b
)
{
View
*
v
=
m_schnapps
->
getView
(
view
);
MapHandlerGen
*
m
=
m_schnapps
->
getMap
(
map
);
...
...
@@ -265,7 +265,7 @@ void SurfaceRenderPlugin::changeRenderEdges(const QString& view, const QString&
}
}
void
SurfaceRenderPlugin
::
changeRenderFaces
(
const
QString
&
view
,
const
QString
&
map
,
bool
b
)
void
Surface
_
Render
_
Plugin
::
changeRenderFaces
(
const
QString
&
view
,
const
QString
&
map
,
bool
b
)
{
View
*
v
=
m_schnapps
->
getView
(
view
);
MapHandlerGen
*
m
=
m_schnapps
->
getMap
(
map
);
...
...
@@ -280,7 +280,7 @@ void SurfaceRenderPlugin::changeRenderFaces(const QString& view, const QString&
}
}
void
SurfaceRenderPlugin
::
changeFacesStyle
(
const
QString
&
view
,
const
QString
&
map
,
MapParameters
::
FaceShadingStyle
style
)
void
Surface
_
Render
_
Plugin
::
changeFacesStyle
(
const
QString
&
view
,
const
QString
&
map
,
MapParameters
::
FaceShadingStyle
style
)
{
View
*
v
=
m_schnapps
->
getView
(
view
);
MapHandlerGen
*
m
=
m_schnapps
->
getMap
(
map
);
...
...
@@ -296,9 +296,9 @@ void SurfaceRenderPlugin::changeFacesStyle(const QString& view, const QString& m
}
#ifndef DEBUG
Q_EXPORT_PLUGIN2
(
SurfaceRenderPlugin
,
SurfaceRenderPlugin
)
Q_EXPORT_PLUGIN2
(
Surface
_
Render
_
Plugin
,
Surface
_
Render
_
Plugin
)
#else
Q_EXPORT_PLUGIN2
(
SurfaceRenderPluginD
,
SurfaceRenderPlugin
)
Q_EXPORT_PLUGIN2
(
Surface
_
Render
_
PluginD
,
Surface
_
Render
_
Plugin
)
#endif
}
// namespace SCHNApps
...
...
SCHNApps/Plugins/surface_render/src/surface_render_dockTab.cpp
View file @
353f07b8
...
...
@@ -10,7 +10,7 @@ namespace CGoGN
namespace
SCHNApps
{
SurfaceRender_DockTab
::
SurfaceRender_DockTab
(
SCHNApps
*
s
,
SurfaceRenderPlugin
*
p
)
:
Surface
_
Render_DockTab
::
Surface
_
Render_DockTab
(
SCHNApps
*
s
,
Surface
_
Render
_
Plugin
*
p
)
:
m_schnapps
(
s
),
m_plugin
(
p
),
b_updatingUI
(
false
)
...
...
@@ -26,7 +26,11 @@ SurfaceRender_DockTab::SurfaceRender_DockTab(SCHNApps* s, SurfaceRenderPlugin* p
connect
(
group_faceShading
,
SIGNAL
(
buttonClicked
(
QAbstractButton
*
)),
this
,
SLOT
(
faceStyleChanged
(
QAbstractButton
*
)));
}
void
SurfaceRender_DockTab
::
positionVBOChanged
(
int
index
)
void
Surface_Render_DockTab
::
positionVBOChanged
(
int
index
)
{
if
(
!
b_updatingUI
)
{
...
...
@@ -40,7 +44,7 @@ void SurfaceRender_DockTab::positionVBOChanged(int index)
}
}
void
SurfaceRender_DockTab
::
normalVBOChanged
(
int
index
)
void
Surface
_
Render_DockTab
::
normalVBOChanged
(
int
index
)
{
if
(
!
b_updatingUI
)
{
...
...
@@ -54,7 +58,7 @@ void SurfaceRender_DockTab::normalVBOChanged(int index)
}
}
void
SurfaceRender_DockTab
::
renderVerticesChanged
(
bool
b
)
void
Surface
_
Render_DockTab
::
renderVerticesChanged
(
bool
b
)
{
if
(
!
b_updatingUI
)
{
...
...
@@ -68,7 +72,7 @@ void SurfaceRender_DockTab::renderVerticesChanged(bool b)
}
}
void
SurfaceRender_DockTab
::
verticesScaleFactorChanged
(
int
i
)
void
Surface
_
Render_DockTab
::
verticesScaleFactorChanged
(
int
i
)
{
if
(
!
b_updatingUI
)
{
...
...
@@ -82,7 +86,7 @@ void SurfaceRender_DockTab::verticesScaleFactorChanged(int i)
}
}
void
SurfaceRender_DockTab
::
renderEdgesChanged
(
bool
b
)
void
Surface
_
Render_DockTab
::
renderEdgesChanged
(
bool
b
)
{
if
(
!
b_updatingUI
)
{
...
...
@@ -96,7 +100,7 @@ void SurfaceRender_DockTab::renderEdgesChanged(bool b)
}
}
void
SurfaceRender_DockTab
::
renderFacesChanged
(
bool
b
)
void
Surface
_
Render_DockTab
::
renderFacesChanged
(
bool
b
)
{
if
(
!
b_updatingUI
)
{
...
...
@@ -110,7 +114,7 @@ void SurfaceRender_DockTab::renderFacesChanged(bool b)
}
}
void
SurfaceRender_DockTab
::
faceStyleChanged
(
QAbstractButton
*
b
)
void
Surface
_
Render_DockTab
::
faceStyleChanged
(
QAbstractButton
*
b
)
{
if
(
!
b_updatingUI
)
{
...
...
@@ -131,14 +135,14 @@ void SurfaceRender_DockTab::faceStyleChanged(QAbstractButton* b)
void
SurfaceRender_DockTab
::
addPositionVBO
(
QString
name
)
void
Surface
_
Render_DockTab
::
addPositionVBO
(
QString
name
)
{
b_updatingUI
=
true
;
combo_positionVBO
->
addItem
(
name
);
b_updatingUI
=
false
;
}
void
SurfaceRender_DockTab
::
removePositionVBO
(
QString
name
)
void
Surface
_
Render_DockTab
::
removePositionVBO
(
QString
name
)
{
b_updatingUI
=
true
;
int
curIndex
=
combo_positionVBO
->
currentIndex
();
...
...
@@ -149,14 +153,14 @@ void SurfaceRender_DockTab::removePositionVBO(QString name)
b_updatingUI
=
false
;
}
void
SurfaceRender_DockTab
::
addNormalVBO
(
QString
name
)
void
Surface
_
Render_DockTab
::
addNormalVBO
(
QString
name
)
{
b_updatingUI
=
true
;
combo_normalVBO
->
addItem
(
name
);
b_updatingUI
=
false
;
}
void
SurfaceRender_DockTab
::
removeNormalVBO
(
QString
name
)
void
Surface
_
Render_DockTab
::
removeNormalVBO
(
QString
name
)
{
b_updatingUI
=
true
;
int
curIndex
=
combo_normalVBO
->
currentIndex
();
...
...
@@ -167,14 +171,14 @@ void SurfaceRender_DockTab::removeNormalVBO(QString name)
b_updatingUI
=
false
;
}
void
SurfaceRender_DockTab
::
updateMapParameters
()
void
Surface
_
Render_DockTab
::
updateMapParameters
()
{
b_updatingUI
=
true
;
combo_positionVBO
->
clear
();
combo_normalVBO
->
clear
();
combo_positionVBO
->
addItem
(
"- select VBO -"
);
combo_normalVBO
->
clear
();
combo_normalVBO
->
addItem
(
"- select VBO -"
);
View
*
view
=
m_schnapps
->
getSelectedView
();
...
...
SCHNApps/Plugins/surface_renderVector/CMakeLists.txt
View file @
353f07b8
cmake_minimum_required
(
VERSION 2.8
)
SET
(
PLUGIN_NAME RenderVector
)
SET
(
PLUGIN_NAME
Surface_
RenderVector
)
SET
(
PLUGIN_ROOT_DIR
${
SCHNApps_ROOT_DIR
}
/Plugins/renderVector
)
SET
(
PLUGIN_ROOT_DIR
${
SCHNApps_ROOT_DIR
}
/Plugins/
surface_
renderVector
)
INCLUDE_DIRECTORIES
(
${
PLUGIN_ROOT_DIR
}
/include
...
...
@@ -25,8 +25,8 @@ file(
SET
(
PLUGIN_QOBJECT_FILES
${
PLUGIN_ROOT_DIR
}
/include/renderVector.h
${
PLUGIN_ROOT_DIR
}
/include/renderVector
D
ockTab.h
${
PLUGIN_ROOT_DIR
}
/include/
surface_
renderVector.h
${
PLUGIN_ROOT_DIR
}
/include/
surface_
renderVector
_d
ockTab.h
)
include
(
${
SCHNApps_ROOT_DIR
}
/Plugins/plugins_cmake.txt
)
SCHNApps/Plugins/surface_renderVector/forms/renderVector.ui
→
SCHNApps/Plugins/surface_renderVector/forms/
surface_
renderVector.ui
View file @
353f07b8
<?xml version="1.0" encoding="UTF-8"?>
<ui
version=
"4.0"
>
<class>
RenderVector
Dock
Widget
</class>
<widget
class=
"QWidget"
name=
"RenderVector
Dock
Widget"
>
<class>
Surface_
RenderVector
_Tab
Widget
</class>
<widget
class=
"QWidget"
name=
"
Surface_
RenderVector
_Tab
Widget"
>
<property
name=
"geometry"
>
<rect>
<x>
0
</x>
<y>
0
</y>
<width>
174
</width>
<height>
545
</height>
<width>
200
</width>
<height>
600
</height>
</rect>
</property>
<property
name=
"windowTitle"
>
<string>
Form
</string>
</property>
<layout
class=
"QVBoxLayout"
name=
"verticalLayout"
>
<item>
<widget
class=
"QListWidget"
name=
"mapList"
/>
<layout
class=
"QGridLayout"
name=
"gridLayout"
>
<item
row=
"0"
column=
"0"
>
<widget
class=
"QLabel"
name=
"label_2"
>
<property
name=
"text"
>
<string>
Position :
</string>
</property>
</widget>
</item>
<item>
<layout
class=
"QHBoxLayout"
name=
"horizontalLayout"
>
<item>
<widget
class=
"QLabel"
name=
"label_2"
>
<property
name=
"text"
>
<string>
Position :
</string>
</property>
</widget>
</item>
<item
row=
"0"
column=
"1"
>
<widget
class=
"QComboBox"
name=
"combo_positionVBO"
>
<property
name=
"sizePolicy"
>
<sizepolicy
hsizetype=
"Expanding"
vsizetype=
"Fixed"
>
<horstretch>
0
</horstretch>
<verstretch>
0
</verstretch>
</sizepolicy>
</property>
<item>
<widget
class=
"QComboBox"
name=
"combo_positionVBO"
>
<property
name=
"sizePolicy"
>
<sizepolicy
hsizetype=
"Expanding"
vsizetype=
"Fixed"
>
<horstretch>
0
</horstretch>
<verstretch>
0
</verstretch>
</sizepolicy>
</property>
</widget>
<property
name=
"text"
>
<string>
- select VBO -
</string>
</property>
</item>
</
layou
t>
</
widge
t>
</item>
<item>
<item
row=
"1"
column=
"0"
>
<widget
class=
"QLabel"
name=
"label_3"
>
<property
name=
"text"
>
<string>
Vectors :
</string>
</property>
</widget>
</item>
<item>
<item
row=
"2"
column=
"0"
colspan=
"2"
>
<widget
class=
"QListWidget"
name=
"list_vectorVBO"
>
<property
name=
"selectionMode"
>
<enum>
QAbstractItemView::MultiSelection
</enum>
</property>
</widget>
</item>
<item>
<item
row=
"3"
column=
"0"
colspan=
"2"
>
<widget
class=
"QLabel"
name=
"label"
>
<property
name=
"text"
>
<string>
Vectors Size :
</string>
</property>
</widget>
</item>
<item>
<item
row=
"4"
column=
"0"
colspan=
"2"
>
<widget
class=
"QSlider"
name=
"slider_vectorsScaleFactor"
>
<property
name=
"value"
>
<number>
50
</number>
...
...
@@ -69,7 +67,7 @@
</property>
</widget>
</item>
<item>
<item
row=
"5"
column=
"0"
colspan=
"2"
>
<spacer
name=
"verticalSpacer"
>
<property
name=
"orientation"
>
<enum>
Qt::Vertical
</enum>
...
...
SCHNApps/Plugins/surface_renderVector/include/renderVector.h
→
SCHNApps/Plugins/surface_renderVector/include/
surface_
renderVector.h
View file @
353f07b8
#ifndef _RENDERVECTOR_PLUGIN_H_
#define _RENDERVECTOR_PLUGIN_H_
#ifndef
_SURFACE
_RENDERVECTOR_PLUGIN_H_
#define
_SURFACE
_RENDERVECTOR_PLUGIN_H_
#include
"plugin.h"
#include
"renderVector
D
ockTab.h"
#include
"plugin
_interaction
.h"
#include
"
surface_
renderVector
_d
ockTab.h"
#include
"Utils/Shaders/shaderVectorPerVertex.h"
...
...
@@ -12,48 +12,37 @@ namespace CGoGN
namespace
SCHNApps
{
struct
Per
MapParameter
Set
struct
MapParameter
s
{
Per
MapParameter
Set
()
:
MapParameter
s
()
:
positionVBO
(
NULL
),
vectorsScaleFactor
(
1.0
f
)
{}
PerMapParameterSet
(
MapHandlerGen
*
map
);
Utils
::
VBO
*
positionVBO
;
std
::
vector
<
Utils
::
VBO
*>
vectorVBO
;
QList
<
Utils
::
VBO
*>
vectorVBO
s
;
float
vectorsScaleFactor
;
};
struct
ParameterSet
{
ParameterSet
()
:
selectedMap
(
NULL
)
{}
QHash
<
QString
,
PerMapParameterSet
*>
perMap
;
MapHandlerGen
*
selectedMap
;
};
class
RenderVectorPlugin
:
public
Plugin
class
Surface_RenderVector_Plugin
:
public
PluginInteraction
{
Q_OBJECT
Q_INTERFACES
(
CGoGN
::
SCHNApps
::
Plugin
)
friend
class
Surface_RenderVector_DockTab
;
public:
RenderVectorPlugin
()
{
setProvidesRendering
(
true
);
}
Surface_RenderVector_Plugin
()
{}
~
RenderVectorPlugin
()
~
Surface_
RenderVector
_
Plugin
()
{}
virtual
bool
enable
();
virtual
void
disable
();
virtual
void
redraw
(
View
*
view
);
virtual
void
draw
(
View
*
view
)
{}
virtual
void
drawMap
(
View
*
view
,
MapHandlerGen
*
map
);
virtual
void
keyPress
(
View
*
view
,
QKeyEvent
*
event
)
{}
virtual
void
keyRelease
(
View
*
view
,
QKeyEvent
*
event
)
{}
...
...
@@ -62,30 +51,32 @@ public:
virtual
void
mouseMove
(
View
*
view
,
QMouseEvent
*
event
)
{}
virtual
void
wheelEvent
(
View
*
view
,
QWheelEvent
*
event
)
{}
protected:
RenderVectorDockTab
*
m_dockTab
;
QHash
<
View
*
,
ParameterSet
*>
h_viewParams
;
virtual
void
viewLinked
(
View
*
view
)
{}
virtual
void
viewUnlinked
(
View
*
view
)
{}
CGoGN
::
Utils
::
ShaderVectorPerVertex
*
m_vectorShader
;
private
slots
:
// slots called from SCHNApps signals
void
selectedViewChanged
(
View
*
prev
,
View
*
cur
);
void
selectedMapChanged
(
MapHandlerGen
*
prev
,
MapHandlerGen
*
cur
);
void
mapAdded
(
MapHandlerGen
*
map
);
void
mapRemoved
(
MapHandlerGen
*
map
);
public
slots
:
void
viewLinked
(
View
*
view
,
Plugin
*
plugin
);
void
viewUnlinked
(
View
*
view
,
Plugin
*
plugin
);
void
currentViewChanged
(
View
*
view
);
// slots called from MapHandler signals
void
vboAdded
(
Utils
::
VBO
*
vbo
);
void
vboRemoved
(
Utils
::
VBO
*
vbo
);
void
mapLinked
(
MapHandlerGen
*
m
);
void
mapUnlinke