Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
OpenFlipper-Free
OpenFlipper-Free
Commits
2c37d5c3
Commit
2c37d5c3
authored
Dec 01, 2015
by
Christopher Tenter
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix build warnings
parent
17c8ff4c
Pipeline
#216
passed with stage
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
3 additions
and
8 deletions
+3
-8
ACG/GL/MeshCompiler.cc
ACG/GL/MeshCompiler.cc
+1
-2
ACG/Math/DualQuaternionT.cc
ACG/Math/DualQuaternionT.cc
+0
-2
ACG/Scenegraph/CartesianClippingNode.hh
ACG/Scenegraph/CartesianClippingNode.hh
+0
-2
ObjectTypes/PolyLine/PolyLineT.cc
ObjectTypes/PolyLine/PolyLineT.cc
+2
-2
No files found.
ACG/GL/MeshCompiler.cc
View file @
2c37d5c3
...
...
@@ -1528,8 +1528,7 @@ void MeshCompiler::resolveTriangulation()
{
int
negCornerID
=
triIndexBuffer_
[
drawTriID
*
3
+
k
];
int
cornerID
=
-
1
-
negCornerID
;
int
vertexID
=
triIndexBuffer_
[
drawTriID
*
3
+
k
]
=
getInputIndexSplit
(
faceID
,
cornerID
);
assert
(
vertexID
>=
0
);
triIndexBuffer_
[
drawTriID
*
3
+
k
]
=
getInputIndexSplit
(
faceID
,
cornerID
);
}
}
}
...
...
ACG/Math/DualQuaternionT.cc
View file @
2c37d5c3
...
...
@@ -411,8 +411,6 @@ namespace ACG {
double
r
=
real_
[
0
];
Vec3
rv
=
Vec3
(
real_
[
1
],
real_
[
2
],
real_
[
3
]);
Vec3
dv
=
Vec3
(
dual_
[
1
],
dual_
[
2
],
dual_
[
3
]);
Vec3
tempVec
=
(
rv
%
p
)
+
r
*
p
;
p
+=
2.0
*
(
rv
%
tempVec
);
...
...
ACG/Scenegraph/CartesianClippingNode.hh
View file @
2c37d5c3
...
...
@@ -112,8 +112,6 @@ private:
Vec3f
cursor_
;
Plane
enabled_
;
GLdouble
xy_plane_
[
4
],
yz_plane_
[
4
],
xz_plane_
[
4
];
};
...
...
ObjectTypes/PolyLine/PolyLineT.cc
View file @
2c37d5c3
...
...
@@ -2132,12 +2132,12 @@ typename PolyLineT<PointT>::CustomPropertyHandle PolyLineT<PointT>::custom_prop_
template
<
class
PointT
>
typename
PolyLineT
<
PointT
>::
CustomProperty
*
PolyLineT
<
PointT
>::
custom_prop
(
CustomPropertyHandle
_handle
)
{
return
(
_handle
>=
0
&&
_handle
<
get_num_custom_properties
()
?
cprop_enum
[
_handle
]
:
NULL
);
return
(
_handle
>=
0
&&
_handle
<
int
(
get_num_custom_properties
()
)
?
cprop_enum
[
_handle
]
:
NULL
);
}
template
<
class
PointT
>
const
typename
PolyLineT
<
PointT
>::
CustomProperty
*
PolyLineT
<
PointT
>::
custom_prop
(
CustomPropertyHandle
_handle
)
const
{
return
(
_handle
>=
0
&&
_handle
<
get_num_custom_properties
()
?
cprop_enum
[
_handle
]
:
NULL
);
return
(
_handle
>=
0
&&
_handle
<
int
(
get_num_custom_properties
()
)
?
cprop_enum
[
_handle
]
:
NULL
);
}
template
<
class
PointT
>
...
...
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