Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
N
nt1100 analyser
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Pascal Engeler
nt1100 analyser
Commits
cc416b37
Commit
cc416b37
authored
2 years ago
by
Pascal Engeler
Browse files
Options
Downloads
Patches
Plain Diff
Fixed double define bug
parent
119291e2
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/utility.cpp
+1
-1
1 addition, 1 deletion
src/utility.cpp
with
1 addition
and
1 deletion
src/utility.cpp
+
1
−
1
View file @
cc416b37
...
@@ -64,6 +64,6 @@ std::array<float, 3> operator/=(std::array<float, 3>& v, const float d){
...
@@ -64,6 +64,6 @@ std::array<float, 3> operator/=(std::array<float, 3>& v, const float d){
glm
::
mat4
scale_z
(
float
z0
,
float
factor
){
glm
::
mat4
scale_z
(
float
z0
,
float
factor
){
glm
::
mat4
transf
(
1.
f
);
glm
::
mat4
transf
(
1.
f
);
glm
::
mat4
transf
=
glm
::
translate
(
glm
::
scale
(
glm
::
translate
(
transf
,
glm
::
vec3
(
0.
f
,
0.
f
,
-
z0
)),
glm
::
vec3
(
1.
,
1.
,
factor
)),
glm
::
vec3
(
0.
,
0.
,
z0
));
transf
=
glm
::
translate
(
glm
::
scale
(
glm
::
translate
(
transf
,
glm
::
vec3
(
0.
f
,
0.
f
,
-
z0
)),
glm
::
vec3
(
1.
,
1.
,
factor
)),
glm
::
vec3
(
0.
,
0.
,
z0
));
return
transf
;
return
transf
;
}
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment