eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-21 13:39:18 +02:00
Code Issues 123 Wiki Activity

Merge branch 'tmj-dev' into milek-dev

Browse Source
This commit is contained in:
milek7
2018-09-16 22:48:53 +02:00
parent e938466c90 e881092ca0
commit d9687a4e1f
126 changed files with 40430 additions and 6134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
dumb3d.h
View File

@@ -68,12 +68,13 @@ class vector3
vector3( scalar_t X, scalar_t Y, scalar_t Z ) :
x( X ), y( Y ), z( Z )
{}
vector3( glm::dvec3 const &Vector ) :
template <typename Type_, glm::precision Precision_>
vector3( glm::tvec3<Type_, Precision_> const &Vector ) :
x( Vector.x ), y( Vector.y ), z( Vector.z )
{}
template <glm::precision Precision_>
operator glm::tvec3<double, Precision_>() const {
return glm::tvec3<double, Precision_>{ x, y, z }; }
template <typename Type_, glm::precision Precision_>
operator glm::tvec3<Type_, Precision_>() const {
return glm::tvec3<Type_, Precision_>{ x, y, z }; }
// The int parameter is the number of elements to copy from initArray (3 or 4)
// explicit vector3(scalar_t* initArray, int arraySize = 3)
// { for (int i = 0;i<arraySize;++i) e[i] = initArray[i]; }