Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
CAMP
campvis-public
Commits
f5ecff91
Commit
f5ecff91
authored
Dec 10, 2014
by
Declara Denis
Committed by
Christian Schulte zu Berge
Feb 18, 2015
Browse files
Substituted shared_ptr with unique_ptr for geometry data
parent
d505a70f
Changes
5
Show whitespace changes
Inline
Side-by-side
application/gui/datacontainerinspectorcanvas.h
View file @
f5ecff91
...
...
@@ -215,7 +215,7 @@ namespace campvis {
tbb
::
mutex
_localMutex
;
///< Mutex protecting the local members
cgt
::
Shader
*
_paintShader
;
///< GLSL shader for rendering the textures
std
::
shared
_ptr
<
FaceGeometry
>
_quad
;
///< Quad used for rendering
std
::
unique
_ptr
<
FaceGeometry
>
_quad
;
///< Quad used for rendering
cgt
::
ivec2
_numTiles
;
///< number of tiles on texture overview
cgt
::
ivec2
_quadSize
;
///< size in pixels for each tile in overview
...
...
modules/tensor/processors/tensorglyphrenderer.h
View file @
f5ecff91
...
...
@@ -123,8 +123,8 @@ namespace campvis {
void
renderTensorGlyph
(
const
GenericImageRepresentationLocal
<
float
,
3
>*
evals
,
const
GenericImageRepresentationLocal
<
float
,
9
>*
evecs
,
const
cgt
::
vec3
&
position
);
cgt
::
Shader
*
_shader
;
///< Shader for glyph rendering
std
::
shared
_ptr
<
GeometryData
>
_ellipsoidGeometry
;
///< Geometry for ellipsoid rendering
std
::
shared
_ptr
<
GeometryData
>
_cubeGeometry
;
///< Geometry for cuboid rendering
std
::
unique
_ptr
<
GeometryData
>
_ellipsoidGeometry
;
///< Geometry for ellipsoid rendering
std
::
unique
_ptr
<
GeometryData
>
_cubeGeometry
;
///< Geometry for cuboid rendering
static
const
std
::
string
loggerCat_
;
};
...
...
modules/vectorfield/processors/vectorfieldrenderer.h
View file @
f5ecff91
...
...
@@ -126,7 +126,7 @@ namespace campvis {
*/
void
renderVectorArrow
(
const
GenericImageRepresentationLocal
<
float
,
3
>*
vectors
,
const
cgt
::
vec3
&
position
,
float
scale
);
std
::
shared
_ptr
<
GeometryData
>
_arrowGeometry
;
///< Geometry for arrow rendering
std
::
unique
_ptr
<
GeometryData
>
_arrowGeometry
;
///< Geometry for arrow rendering
cgt
::
Shader
*
_shader
;
///< Shader for arrow rendering
static
const
std
::
string
loggerCat_
;
...
...
modules/vis/processors/slicerenderer3d.cpp
View file @
f5ecff91
...
...
@@ -89,7 +89,7 @@ namespace campvis {
// The closing face is the slice proxy geometry.
// This is probably not the fastest, but an elegant solution, which also supports arbitrary slice orientations. :)
cgt
::
Bounds
volumeExtent
=
img
->
getParent
()
->
getWorldBounds
();
std
::
shared
_ptr
<
MeshGeometry
>
cube
=
GeometryDataFactory
::
createCube
(
volumeExtent
,
cgt
::
Bounds
(
cgt
::
vec3
(
0.
f
),
cgt
::
vec3
(
1.
f
)));
std
::
unique
_ptr
<
MeshGeometry
>
cube
=
GeometryDataFactory
::
createCube
(
volumeExtent
,
cgt
::
Bounds
(
cgt
::
vec3
(
0.
f
),
cgt
::
vec3
(
1.
f
)));
cgt
::
vec3
normal
(
0.
f
,
0.
f
,
1.
f
);
float
p
=
img
->
getParent
()
->
getMappingInformation
().
getOffset
().
z
+
(
p_sliceNumber
.
getValue
()
*
img
->
getParent
()
->
getMappingInformation
().
getVoxelSize
().
z
);
...
...
modules/vis/tools/voxelhierarchymapper.h
View file @
f5ecff91
...
...
@@ -106,7 +106,7 @@ namespace campvis {
cgt
::
Texture
*
_xorBitmaskTexture
;
///< Texture holding the 128x128 possible combinations of uvec4 bitmasks
cgt
::
Texture
*
_hierarchyTexture
;
///< The OpenGL texture storing the voxel hierarchy
std
::
shared
_ptr
<
FaceGeometry
>
_quad
;
std
::
unique
_ptr
<
FaceGeometry
>
_quad
;
static
std
::
string
loggerCat_
;
...
...
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