Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
CAMP
campvis-public
Commits
f03b6e88
Commit
f03b6e88
authored
Feb 18, 2015
by
Christian Schulte zu Berge
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Some changes related to rebase (updated API).
parent
19ef9d29
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
12 additions
and
8 deletions
+12
-8
core/pipeline/viewportsplitter.cpp
core/pipeline/viewportsplitter.cpp
+0
-1
core/pipeline/viewportsplitter.h
core/pipeline/viewportsplitter.h
+3
-1
modules/cudaconfidencemaps/pipelines/cudaconfidencemapsdemo.h
...les/cudaconfidencemaps/pipelines/cudaconfidencemapsdemo.h
+6
-3
modules/cudaconfidencemaps/pipelines/cudaconfidencemapsworkflow.h
...cudaconfidencemaps/pipelines/cudaconfidencemapsworkflow.h
+2
-1
modules/preprocessing/processors/glimageresampler.cpp
modules/preprocessing/processors/glimageresampler.cpp
+1
-1
modules/vis/tools/voxelhierarchymapper.cpp
modules/vis/tools/voxelhierarchymapper.cpp
+0
-1
No files found.
core/pipeline/viewportsplitter.cpp
View file @
f03b6e88
...
...
@@ -67,7 +67,6 @@ namespace campvis {
void
ViewportSplitter
::
deinit
()
{
delete
_fbo
;
delete
_quad
;
ShdrMgr
.
dispose
(
_copyShader
);
}
...
...
core/pipeline/viewportsplitter.h
View file @
f03b6e88
...
...
@@ -31,6 +31,8 @@
#include "core/properties/datanameproperty.h"
#include "core/properties/numericproperty.h"
#include <memory>
namespace
cgt
{
class
FramebufferObject
;
class
Shader
;
...
...
@@ -126,7 +128,7 @@ namespace campvis {
bool
_mousePressed
;
///< Flag whether the mous was pressed in this view (to correctly compute the view of the event)
size_t
_viewIndexOfEvent
;
///< Index of the sub view for the forwarded event.
FaceGeometry
*
_quad
;
///< Geometry used for rendering
std
::
unique_ptr
<
FaceGeometry
>
_quad
;
///< Geometry used for rendering
cgt
::
FramebufferObject
*
_fbo
;
///< The FBO used for rendering
IVec2Property
*
p_viewportSizeProperty
;
///< Pointer to the property defining the viewport (canvas) size.
cgt
::
Shader
*
_copyShader
;
///< Shader used for rendering
...
...
modules/cudaconfidencemaps/pipelines/cudaconfidencemapsdemo.h
View file @
f03b6e88
...
...
@@ -27,8 +27,12 @@
#include <tbb/tick_count.h>
#include "modules/base/processors/matrixprocessor.h"
#include "core/pipeline/autoevaluationpipeline.h"
#include "core/properties/buttonproperty.h"
#include "modules/modulesapi.h"
#include "modules/base/processors/matrixprocessor.h"
#include "modules/preprocessing/processors/glgaussianfilter.h"
#include "modules/preprocessing/processors/glimagecrop.h"
#include "modules/preprocessing/processors/glimageresampler.h"
...
...
@@ -37,12 +41,11 @@
#include "modules/openigtlink/processors/openigtlinkclient.h"
#include "modules/advancedusvis/processors/advancedusfusion.h"
#include "core/properties/buttonproperty.h"
namespace
campvis
{
class
CudaConfidenceMapsDemo
:
public
AutoEvaluationPipeline
{
class
CAMPVIS_MODULES_API
CudaConfidenceMapsDemo
:
public
AutoEvaluationPipeline
{
public:
/**
* Creates a AutoEvaluationPipeline.
...
...
modules/cudaconfidencemaps/pipelines/cudaconfidencemapsworkflow.h
View file @
f03b6e88
...
...
@@ -27,12 +27,13 @@
#include "core/pipeline/abstractworkflow.h"
#include "modules/modulesapi.h"
#include "modules/cudaconfidencemaps/pipelines/cudaconfidencemapsdemo.h"
#include "modules/pipelinefactory.h"
namespace
campvis
{
class
CudaConfidenceMapsWorkflow
:
public
AbstractWorkflow
{
class
CAMPVIS_MODULES_API
CudaConfidenceMapsWorkflow
:
public
AbstractWorkflow
{
public:
enum
Stages
{
MAIN_STAGE
...
...
modules/preprocessing/processors/glimageresampler.cpp
View file @
f03b6e88
...
...
@@ -81,7 +81,7 @@ namespace campvis {
if
(
img
!=
0
)
{
cgt
::
vec3
originalSize
(
img
->
getSize
());
const
cgt
::
ivec3
&
resampledSize
=
p_targetSize
.
getValue
();
cgt
::
ivec3
resampledSize
=
p_targetSize
.
getValue
();
bool
isTexture2D
=
img
->
getParent
()
->
getDimensionality
()
==
2
;
// 2D textures should not be scaled along the z axis
...
...
modules/vis/tools/voxelhierarchymapper.cpp
View file @
f03b6e88
...
...
@@ -68,7 +68,6 @@ namespace campvis {
delete
_xorBitmaskTexture
;
delete
_hierarchyTexture
;
delete
_quad
;
}
void
VoxelHierarchyMapper
::
createHierarchy
(
const
ImageRepresentationGL
*
image
,
AbstractTransferFunction
*
transferFunction
)
{
...
...
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