Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
OpenGL
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Insights
Issue
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
C-Fu
OpenGL
Commits
b8f8a5c2
Commit
b8f8a5c2
authored
Jan 15, 2017
by
Anakin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed the problem
parent
6ead5d7b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
QtMeshViewer/Header/MshFile.h
QtMeshViewer/Header/MshFile.h
+1
-1
QtMeshViewer/Source/MshFile.cpp
QtMeshViewer/Source/MshFile.cpp
+1
-1
No files found.
QtMeshViewer/Header/MshFile.h
View file @
b8f8a5c2
...
...
@@ -43,7 +43,7 @@ private:
void
readVertex
(
Segment
*
dataDestination
,
std
::
streampos
position
);
void
readUV
(
Segment
*
dataDestination
,
std
::
streampos
position
);
void
loadTexture
(
QOpenGLTexture
*
destination
,
QString
filepath
);
void
loadTexture
(
QOpenGLTexture
*
&
destination
,
QString
filepath
);
QMatrix4x4
getParentMatrix
(
std
::
string
parent
)
const
;
QQuaternion
getParentRotation
(
std
::
string
parent
)
const
;
...
...
QtMeshViewer/Source/MshFile.cpp
View file @
b8f8a5c2
...
...
@@ -622,7 +622,7 @@ void MshFile::readUV(Segment * dataDestination, std::streampos position)
m_file
.
read
(
F2V
(
dataDestination
->
vertices
[
i
].
texCoord
[
j
]),
sizeof
(
float
));
}
void
MshFile
::
loadTexture
(
QOpenGLTexture
*
destination
,
QString
filepath
)
void
MshFile
::
loadTexture
(
QOpenGLTexture
*
&
destination
,
QString
filepath
)
{
bool
loadSuccess
(
false
);
QImage
img
;
...
...
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