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
af7bf029
Commit
af7bf029
authored
Oct 23, 2014
by
Christian Schulte zu Berge
Browse files
Fixed devil module CMake file.
refs #386
parent
38db04f8
Changes
2
Hide whitespace changes
Inline
Side-by-side
modules/devil/devil.cmake
View file @
af7bf029
...
...
@@ -2,7 +2,7 @@
IF
(
${
ModuleEnabled
}
)
# Tell TGT that we have the DevIL module
LIST
(
APPEND ThisModDefinitions -D
T
GT_HAS_DEVIL
)
LIST
(
APPEND ThisModDefinitions -D
C
GT_HAS_DEVIL
)
IF
(
UNIX
)
# Unix-like systems have their DevIL lib via their package manager
...
...
modules/devil/processors/devilimagereader.cpp
View file @
af7bf029
...
...
@@ -118,8 +118,8 @@ namespace campvis {
}
}
if
(
files
.
empty
())
return
;
if
(
files
.
empty
())
return
;
cgt
::
ivec3
imageSize
(
0
,
0
,
static_cast
<
int
>
(
files
.
size
()));
uint8_t
*
buffer
=
nullptr
;
...
...
@@ -133,7 +133,7 @@ namespace campvis {
devilFormat
=
IL_RGBA
;
ILint
devilDataType
=
0
;
WeaklyTypedPointer
::
BaseType
campvisDataType
=
WeaklyTypedPointer
::
UINT8
;
WeaklyTypedPointer
::
BaseType
campvisDataType
=
WeaklyTypedPointer
::
UINT8
;
size_t
numChannels
=
1
;
// start reading
...
...
@@ -253,10 +253,10 @@ namespace campvis {
rd
->
addColorTexture
(
id
);
// create fake depth image
// TODO: think of a better solution to this...
// TODO: think of a better solution to this...
ImageData
*
idDepth
=
new
ImageData
(
dimensionality
,
imageSize
,
1
);
float
*
ptr
=
new
float
[
cgt
::
hmul
(
imageSize
)];
memset
(
ptr
,
0
,
cgt
::
hmul
(
imageSize
)
*
sizeof
(
float
));
memset
(
ptr
,
0
,
cgt
::
hmul
(
imageSize
)
*
sizeof
(
float
));
WeaklyTypedPointer
wtpDepth
(
campvisDataType
,
1
,
ptr
);
ImageRepresentationLocal
::
create
(
idDepth
,
wtpDepth
);
rd
->
setDepthTexture
(
idDepth
);
...
...
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