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
CGoGN
CGoGN
Commits
038eb8d7
Commit
038eb8d7
authored
Feb 08, 2013
by
Sylvain Thery
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
resolve pb of x*V with vector_gen
parent
aff22ee0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
6 deletions
+14
-6
include/Geometry/vector_gen.h
include/Geometry/vector_gen.h
+10
-3
include/Geometry/vector_gen.hpp
include/Geometry/vector_gen.hpp
+4
-3
No files found.
include/Geometry/vector_gen.h
View file @
038eb8d7
...
...
@@ -117,7 +117,11 @@ public:
Vector
<
DIM
,
T
>
operator
-
()
const
;
Vector
<
DIM
,
T
>
operator
*
(
T
a
)
const
;
Vector
<
DIM
,
T
>
operator
*
(
T
a
)
const
;
// template <typename T2>
// Vector<DIM, T> operator*(T2 a) const ;
Vector
<
DIM
,
T
>
operator
/
(
T
a
)
const
;
...
...
@@ -208,8 +212,8 @@ bool isNull(T x, int precision = 0) ;
template
<
typename
T
>
bool
isNull2
(
T
x
,
int
precision
=
0
)
;
template
<
unsigned
int
DIM
,
typename
T
>
Vector
<
DIM
,
T
>
operator
*
(
T
a
,
const
Vector
<
DIM
,
T
>&
v
)
;
//
template <unsigned int DIM, typename T>
//
Vector<DIM, T> operator*(T a, const Vector<DIM, T>& v) ;
template
<
unsigned
int
DIM
,
typename
T
>
Vector
<
DIM
,
T
>
operator
/
(
T
a
,
const
Vector
<
DIM
,
T
>&
v
)
;
...
...
@@ -222,6 +226,9 @@ T tripleProduct(const Vector<DIM, T>& v1, const Vector<DIM, T>& v2, const Vector
template
<
unsigned
int
DIM
,
typename
T
>
Vector
<
DIM
,
T
>
slerp
(
const
Vector
<
DIM
,
T
>
&
v1
,
const
Vector
<
DIM
,
T
>
&
v2
,
const
T
&
t
)
;
template
<
unsigned
int
DIM
,
typename
T
,
typename
T2
>
Vector
<
DIM
,
T
>
operator
*
(
T2
b
,
const
Vector
<
DIM
,
T
>&
v
);
/**********************************************/
/* SOME USEFUL TYPEDEFS */
...
...
include/Geometry/vector_gen.hpp
View file @
038eb8d7
...
...
@@ -405,12 +405,13 @@ inline bool isNull2(T x, int precision)
return
(
isNull
(
x
,
-
(
precision
*
precision
)))
;
}
template
<
unsigned
int
DIM
,
typename
T
>
inline
Vector
<
DIM
,
T
>
operator
*
(
T
a
,
const
Vector
<
DIM
,
T
>&
v
)
template
<
unsigned
int
DIM
,
typename
T
,
typename
T2
>
inline
Vector
<
DIM
,
T
>
operator
*
(
T
2
b
,
const
Vector
<
DIM
,
T
>&
v
)
{
return
v
*
a
;
return
v
*
T
(
b
)
;
}
template
<
unsigned
int
DIM
,
typename
T
>
inline
Vector
<
DIM
,
T
>
operator
/
(
T
a
,
const
Vector
<
DIM
,
T
>&
v
)
{
...
...
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