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

Merge branch 'tmj-dev' into milek-dev

Browse Source
This commit is contained in:
milek7
2018-07-22 12:21:44 +02:00
parent 16d0f6ab65 460bf6d382
commit 9c5e80ceeb
10 changed files with 145 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
utilities.h
View File

@@ -255,14 +255,14 @@ template <typename Type_>
Type_
interpolate( Type_ const &First, Type_ const &Second, float const Factor ) {
return ( First * ( 1.0f - Factor ) ) + ( Second * Factor );
return static_cast<Type_>( ( First * ( 1.0f - Factor ) ) + ( Second * Factor ) );
}
template <typename Type_>
Type_
interpolate( Type_ const &First, Type_ const &Second, double const Factor ) {
return ( First * ( 1.0 - Factor ) ) + ( Second * Factor );
return static_cast<Type_>( ( First * ( 1.0 - Factor ) ) + ( Second * Factor ) );
}
// tests whether provided points form a degenerate triangle