Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
ACGL
acgl
Commits
b451f394
Commit
b451f394
authored
Apr 28, 2014
by
Robert Menzel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
now supports C++ pre C++11
parent
f3c037c1
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
7 deletions
+7
-7
include/ACGL/HardwareSupport/SimpleRiftController.hh
include/ACGL/HardwareSupport/SimpleRiftController.hh
+1
-1
include/ACGL/OpenGL/Objects/VertexArrayObject.hh
include/ACGL/OpenGL/Objects/VertexArrayObject.hh
+1
-1
src/ACGL/HardwareSupport/SimpleRiftController.cc
src/ACGL/HardwareSupport/SimpleRiftController.cc
+3
-3
src/ACGL/OpenGL/Data/TextureDataLoadStore.cc
src/ACGL/OpenGL/Data/TextureDataLoadStore.cc
+2
-2
No files found.
include/ACGL/HardwareSupport/SimpleRiftController.hh
View file @
b451f394
...
...
@@ -144,7 +144,7 @@ public:
void
renderDistorted
(
ACGL
::
OpenGL
::
ConstSharedTexture2D
_sideBySideTexture
);
void
renderDistorted
(
ACGL
::
OpenGL
::
ConstSharedTexture2D
_leftTexture
,
ACGL
::
OpenGL
::
ConstSharedTexture2D
_rightTexture
);
void
renderDistorted
(
ACGL
::
OpenGL
::
ConstSharedShaderProgram
_program
);
void
renderDistorted
P
(
ACGL
::
OpenGL
::
ConstSharedShaderProgram
_program
);
bool
getSuccessfulConnected
()
{
return
mSuccessfulConnected
;
}
...
...
include/ACGL/OpenGL/Objects/VertexArrayObject.hh
View file @
b451f394
...
...
@@ -315,7 +315,7 @@ public:
inline
void
drawRangeElements
(
GLuint
start
,
GLsizei
count
)
{
glDrawRangeElements
(
mMode
,
start
,
getIndexCount
(),
count
,
getIndexType
(),
nullptr
);
glDrawRangeElements
(
mMode
,
start
,
getIndexCount
(),
count
,
getIndexType
(),
NULL
);
}
#if (ACGL_OPENGL_VERSION >= 32)
...
...
src/ACGL/HardwareSupport/SimpleRiftController.cc
View file @
b451f394
...
...
@@ -643,7 +643,7 @@ void SimpleRiftController::renderDistorted( OpenGL::ConstSharedTexture2D _sideBy
mDistortShaderSideBySide
->
use
();
mDistortShaderSideBySide
->
setTexture
(
"uSamplerColor"
,
_sideBySideTexture
,
0
);
renderDistorted
(
mDistortShaderSideBySide
);
renderDistorted
P
(
mDistortShaderSideBySide
);
}
void
SimpleRiftController
::
renderDistorted
(
OpenGL
::
ConstSharedTexture2D
_leftTexture
,
OpenGL
::
ConstSharedTexture2D
_rightTexture
)
...
...
@@ -693,10 +693,10 @@ void SimpleRiftController::renderDistorted( OpenGL::ConstSharedTexture2D _leftTe
mDistortShaderTwoTextures
->
setTexture
(
"uSamplerColorLeft"
,
_leftTexture
,
0
);
mDistortShaderTwoTextures
->
setTexture
(
"uSamplerColorRight"
,
_rightTexture
,
1
);
renderDistorted
(
mDistortShaderTwoTextures
);
renderDistorted
P
(
mDistortShaderTwoTextures
);
}
void
SimpleRiftController
::
renderDistorted
(
ACGL
::
OpenGL
::
ConstSharedShaderProgram
_program
)
void
SimpleRiftController
::
renderDistorted
P
(
ACGL
::
OpenGL
::
ConstSharedShaderProgram
_program
)
{
// if the user defined an output size, use that, otherwise default to the Rifts size:
glm
::
uvec2
windowSize
=
mOutputViewport
;
...
...
src/ACGL/OpenGL/Data/TextureDataLoadStore.cc
View file @
b451f394
...
...
@@ -64,7 +64,7 @@ std::map<std::string,TextureLoadFuncPtr> textureLoadFunctions = std::map<std::st
void
registerTextureLoadFunction
(
std
::
vector
<
std
::
string
>
_endings
,
TextureLoadFuncPtr
_function
)
{
if
(
_function
!=
nullptr
)
if
(
_function
!=
NULL
)
{
std
::
vector
<
std
::
string
>::
iterator
n
=
_endings
.
end
();
for
(
std
::
vector
<
std
::
string
>::
iterator
i
=
_endings
.
begin
()
;
i
!=
n
;
i
++
)
...
...
@@ -183,7 +183,7 @@ public:
{
std
::
stringstream
errorMsg
;
errorMsg
<<
"LodePNG error while loading file "
<<
_filename
<<
" - "
<<
errorCode
<<
": "
<<
lodepng_error_text
(
errorCode
);
mData
=
nullptr
;
mData
=
NULL
;
throw
std
::
runtime_error
(
errorMsg
.
str
());
}
}
...
...
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