Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
acgl
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ACGL
acgl
Commits
343315f4
Commit
343315f4
authored
Apr 14, 2014
by
Philip Trettner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed msvc warnings
parent
00f5d2f8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
include/glm/gtc/packing.inl
include/glm/gtc/packing.inl
+6
-6
src/ACGL/OpenGL/Data/GeometryDataLoadStoreVAP.cc
src/ACGL/OpenGL/Data/GeometryDataLoadStoreVAP.cc
+1
-1
No files found.
include/glm/gtc/packing.inl
View file @
343315f4
...
...
@@ -141,7 +141,7 @@ namespace detail
if(x == 0.0f)
return 0;
else if(glm::isnan(x))
return ~0;
return ~0
u
;
else if(glm::isinf(x))
return 0x1f << 6;
...
...
@@ -153,9 +153,9 @@ namespace detail
if(x == 0)
return 0.0f;
else if(x == ((1 << 11) - 1))
return ~0;//NaN
return ~0
u
;//NaN
else if(x == (0x1f << 6))
return ~0;//Inf
return ~0
u
;//Inf
uint result = packed11ToFloat(x);
return reinterpret_cast<float&>(result);
...
...
@@ -164,11 +164,11 @@ namespace detail
GLM_FUNC_QUALIFIER glm::uint floatTo10bit(float x)
{
if(x == 0.0f)
return 0;
return 0
u
;
else if(glm::isnan(x))
return ~0;
return ~0
u
;
else if(glm::isinf(x))
return 0x1f << 5;
return 0x1f
u
<< 5;
return float2packed10(reinterpret_cast<uint&>(x));
}
...
...
src/ACGL/OpenGL/Data/GeometryDataLoadStoreVAP.cc
View file @
343315f4
...
...
@@ -113,7 +113,7 @@ SharedGeometryData loadGeometryDataFromVAP(const std::string& _filename, bool _c
int
texCoordDimension
=
-
1
;
int
normalDimension
=
3
;
int
metaDataDimension
=
4
;
(
void
)
sizeof
(
metaDataDimension
);
(
void
)(
metaDataDimension
);
std
::
vector
<
glm
::
vec4
>
positionData
;
std
::
vector
<
glm
::
vec3
>
texCoordData
;
...
...
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