1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
|
*** src/kernel/base/SFVec3f.cpp.orig Thu Sep 28 13:02:11 2006
--- src/kernel/base/SFVec3f.cpp Thu Sep 28 13:02:37 2006
***************
*** 69,85 ****
// operations on vectors
//overloading of the operators +, -, *
! bool X3DTK::operator== (const SFVec3f &v1, const SFVec3f &v2)
{
return ((v1.x == v2.x) && (v1.y == v2.y) && (v1.z == v2.z));
}
! bool X3DTK::operator!= (const SFVec3f &v1, const SFVec3f &v2)
{
return ((v1.x != v2.x) || (v1.y != v2.y) || (v1.z != v2.z));
}
! SFVec3f X3DTK::operator+ (const SFVec3f &v1, const SFVec3f &v2)
{
SFVec3f res;
res.x = v1.x + v2.x;
--- 69,85 ----
// operations on vectors
//overloading of the operators +, -, *
! bool operator== (const SFVec3f &v1, const SFVec3f &v2)
{
return ((v1.x == v2.x) && (v1.y == v2.y) && (v1.z == v2.z));
}
! bool operator!= (const SFVec3f &v1, const SFVec3f &v2)
{
return ((v1.x != v2.x) || (v1.y != v2.y) || (v1.z != v2.z));
}
! SFVec3f operator+ (const SFVec3f &v1, const SFVec3f &v2)
{
SFVec3f res;
res.x = v1.x + v2.x;
***************
*** 88,94 ****
return res;
}
! SFVec3f X3DTK::operator- (const SFVec3f &v1, const SFVec3f &v2)
{
SFVec3f res;
res.x = v1.x - v2.x;
--- 88,94 ----
return res;
}
! SFVec3f operator- (const SFVec3f &v1, const SFVec3f &v2)
{
SFVec3f res;
res.x = v1.x - v2.x;
***************
*** 97,103 ****
return res;
}
! SFVec3f X3DTK::operator- (const SFVec3f &v)
{
SFVec3f res;
res.x = -v.x;
--- 97,103 ----
return res;
}
! SFVec3f operator- (const SFVec3f &v)
{
SFVec3f res;
res.x = -v.x;
***************
*** 107,118 ****
}
//scalar product
! float X3DTK::operator* (const SFVec3f &v1, const SFVec3f &v2)
{
return v1.x * v2.x + v1.y * v2.y + v1.z * v2.z;
}
! SFVec3f X3DTK::operator* (const float a, const SFVec3f &v)
{
SFVec3f res;
res.x = a * v.x;
--- 107,118 ----
}
//scalar product
! float operator* (const SFVec3f &v1, const SFVec3f &v2)
{
return v1.x * v2.x + v1.y * v2.y + v1.z * v2.z;
}
! SFVec3f operator* (const float a, const SFVec3f &v)
{
SFVec3f res;
res.x = a * v.x;
***************
*** 122,128 ****
}
//crossproduct
! SFVec3f X3DTK::crossprod(const SFVec3f &v1, const SFVec3f &v2)
{
SFVec3f res;
res.x = v1.y * v2.z - v1.z * v2.y;
--- 122,128 ----
}
//crossproduct
! SFVec3f crossprod(const SFVec3f &v1, const SFVec3f &v2)
{
SFVec3f res;
res.x = v1.y * v2.z - v1.z * v2.y;
|
