mirror of
https://github.com/Almamu/linux-wallpaperengine.git
synced 2025-09-14 13:56:48 +08:00
Compare commits
No commits in common. "b66610cc26c1584041059f6b5ae75b99280f1d65" and "fd0f142517c91a69aa3039af4f34c6a5c5795567" have entirely different histories.
b66610cc26
...
fd0f142517
@ -12,6 +12,7 @@ namespace WallpaperEngine::Data::Builders {
|
|||||||
using namespace WallpaperEngine::Data::Utils::SFINAE;
|
using namespace WallpaperEngine::Data::Utils::SFINAE;
|
||||||
|
|
||||||
class VectorBuilder {
|
class VectorBuilder {
|
||||||
|
private:
|
||||||
/**
|
/**
|
||||||
* Convert template that calls the proper std::strto* function
|
* Convert template that calls the proper std::strto* function
|
||||||
* based on the incoming type
|
* based on the incoming type
|
||||||
@ -129,6 +130,7 @@ class VectorBuilder {
|
|||||||
// call the specialized version of the function
|
// call the specialized version of the function
|
||||||
return parse<length, typename GlmVecTraits<T>::type, qualifier> (str);
|
return parse<length, typename GlmVecTraits<T>::type, qualifier> (str);
|
||||||
}
|
}
|
||||||
|
private:
|
||||||
};
|
};
|
||||||
|
|
||||||
template <>
|
template <>
|
||||||
|
@ -136,7 +136,6 @@ class JsonExtensions {
|
|||||||
// call the specialized version of the function
|
// call the specialized version of the function
|
||||||
return operator glm::vec <length, typename GlmVecTraits<T>::type, qualifier> ();
|
return operator glm::vec <length, typename GlmVecTraits<T>::type, qualifier> ();
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
/**
|
/**
|
||||||
* @return The base json object to be used by the extension methods
|
* @return The base json object to be used by the extension methods
|
||||||
|
@ -34,6 +34,7 @@ CImage::CImage (Wallpapers::CScene& scene, const Image& image) :
|
|||||||
m_pos (),
|
m_pos (),
|
||||||
m_animationTime (0.0),
|
m_animationTime (0.0),
|
||||||
m_initialized (false) {
|
m_initialized (false) {
|
||||||
|
|
||||||
// get scene width and height to calculate positions
|
// get scene width and height to calculate positions
|
||||||
auto scene_width = static_cast<float> (scene.getWidth ());
|
auto scene_width = static_cast<float> (scene.getWidth ());
|
||||||
auto scene_height = static_cast<float> (scene.getHeight ());
|
auto scene_height = static_cast<float> (scene.getHeight ());
|
||||||
|
Loading…
Reference in New Issue
Block a user