فهرست منبع

Merge pull request #7763 from Limb/fixwindowscompile

Fixed compilation issues with Visual Studio
Rémi Verschelde 8 سال پیش
والد
کامیت
bbc6543172
3فایلهای تغییر یافته به همراه8 افزوده شده و 1 حذف شده
  1. 5 0
      platform/windows/os_windows.cpp
  2. 2 0
      platform/windows/os_windows.h
  3. 1 1
      servers/visual/visual_server_scene.cpp

+ 5 - 0
platform/windows/os_windows.cpp

@@ -2395,6 +2395,11 @@ bool OS_Windows::is_vsync_enabled() const{
 	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) {
 

+ 2 - 0
platform/windows/os_windows.h

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

+ 1 - 1
servers/visual/visual_server_scene.cpp

@@ -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[1]/=divisor;
 	sum[2]/=divisor;