asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #7763 from Limb/fixwindowscompile

Browse source 
Fixed compilation issues with Visual Studio
This commit is contained in:
Rémi Verschelde 2017-02-12 23:22:02 +01:00 committed by GitHub
commit bbc6543172
3 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
platform/windows/os_windows.cpp
View file

@ -2395,6 +2395,11 @@ bool OS_Windows::is_vsync_enabled() const{
return true; return true;
} }
bool OS_Windows::check_feature_support(const String& p_feature) {
return VisualServer::get_singleton()->has_os_feature(p_feature);
}
OS_Windows::OS_Windows(HINSTANCE _hInstance) { OS_Windows::OS_Windows(HINSTANCE _hInstance) {

2
platform/windows/os_windows.h
View file

@ -286,6 +286,8 @@ public:
virtual void set_use_vsync(bool p_enable); virtual void set_use_vsync(bool p_enable);
virtual bool is_vsync_enabled() const; virtual bool is_vsync_enabled() const;
virtual bool check_feature_support(const String& p_feature);
OS_Windows(HINSTANCE _hInstance); OS_Windows(HINSTANCE _hInstance);
~OS_Windows(); ~OS_Windows();

2
servers/visual/visual_server_scene.cpp
View file

@ -2967,7 +2967,7 @@ void VisualServerScene::_bake_gi_downscale_light(int p_idx, int p_level, const G
} }
divisor=Math::lerp(8.0,divisor,p_propagate); divisor=Math::lerp((float)8.0,divisor,p_propagate);
sum[0]/=divisor; sum[0]/=divisor;
sum[1]/=divisor; sum[1]/=divisor;
sum[2]/=divisor; sum[2]/=divisor;