浏览代码

Imported fixes

Panagiotis Christopoulos Charitos 2 年之前
父节点
当前提交
97946cf77d
共有 4 个文件被更改,包括 9 次插入11 次删除
  1. 5 5
      AnKi/Renderer/Renderer.cpp
  2. 1 1
      AnKi/Util/DynamicArray.h
  3. 2 4
      AnKi/Util/String.h
  4. 1 1
      Tools/GltfImporter/Main.cpp

+ 5 - 5
AnKi/Renderer/Renderer.cpp

@@ -61,14 +61,14 @@ BoolCVar g_vrsLimitTo2x2CVar(CVarSubsystem::kRenderer, "VrsLimitTo2x2", false, "
 BoolCVar g_vrsCVar(CVarSubsystem::kRenderer, "Vrs", true, "Enable VRS in multiple passes");
 BoolCVar g_rayTracedShadowsCVar(CVarSubsystem::kRenderer, "RayTracedShadows", true,
 								"Enable or not ray traced shadows. Ignored if RT is not supported");
-NumericCVar<U8> g_shadowCascadeCountCVar(CVarSubsystem::kRenderer, "ShadowCascadeCount", (ANKI_PLATFORM_MOBILE) ? 2 : kMaxShadowCascades, 1,
+NumericCVar<U8> g_shadowCascadeCountCVar(CVarSubsystem::kRenderer, "ShadowCascadeCount", (ANKI_PLATFORM_MOBILE) ? 3 : kMaxShadowCascades, 1,
 										 kMaxShadowCascades, "Max number of shadow cascades for directional lights");
 NumericCVar<F32> g_shadowCascade0DistanceCVar(CVarSubsystem::kRenderer, "ShadowCascade0Distance", 18.0, 1.0, kMaxF32,
 											  "The distance of the 1st cascade");
-NumericCVar<F32> g_shadowCascade1DistanceCVar(CVarSubsystem::kRenderer, "ShadowCascade1Distance", (ANKI_PLATFORM_MOBILE) ? 100.0f : 40.0, 1.0,
-											  kMaxF32, "The distance of the 2nd cascade");
-NumericCVar<F32> g_shadowCascade2DistanceCVar(CVarSubsystem::kRenderer, "ShadowCascade2Distance", 80.0, 1.0, kMaxF32,
-											  "The distance of the 3rd cascade");
+NumericCVar<F32> g_shadowCascade1DistanceCVar(CVarSubsystem::kRenderer, "ShadowCascade1Distance", (ANKI_PLATFORM_MOBILE) ? 80.0f : 40.0, 1.0, kMaxF32,
+											  "The distance of the 2nd cascade");
+NumericCVar<F32> g_shadowCascade2DistanceCVar(CVarSubsystem::kRenderer, "ShadowCascade2Distance", (ANKI_PLATFORM_MOBILE) ? 150.0f : 80.0, 1.0,
+											  kMaxF32, "The distance of the 3rd cascade");
 NumericCVar<F32> g_shadowCascade3DistanceCVar(CVarSubsystem::kRenderer, "ShadowCascade3Distance", 200.0, 1.0, kMaxF32,
 											  "The distance of the 4th cascade");
 NumericCVar<F32> g_lod0MaxDistanceCVar(CVarSubsystem::kRenderer, "Lod0MaxDistance", 20.0f, 1.0f, kMaxF32,

+ 1 - 1
AnKi/Util/DynamicArray.h

@@ -76,7 +76,7 @@ public:
 		m_pool = b.m_pool;
 		m_size = b.m_size;
 		m_capacity = b.m_size;
-		m_data = static_cast<T*>(m_pool.allocate(sizeof(T) * m_size, alignof(T)));
+		m_data = (m_size) ? static_cast<T*>(m_pool.allocate(sizeof(T) * m_size, alignof(T))) : nullptr;
 		for(TSize i = 0; i < m_size; ++i)
 		{
 			::new(&m_data[i]) T(b.m_data[i]);

+ 2 - 4
AnKi/Util/String.h

@@ -166,8 +166,7 @@ public:
 	/// Get C-string.
 	const Char* cstr() const
 	{
-		checkInit();
-		return m_ptr;
+		return (m_ptr) ? m_ptr : "";
 	}
 
 	const Char* getBegin() const
@@ -457,8 +456,7 @@ public:
 	/// Get a C string.
 	const Char* cstr() const
 	{
-		ANKI_ASSERT(!isEmpty());
-		return &m_data[0];
+		return toCString().cstr();
 	}
 
 	/// Append using a range. Copies the range of [first, oneAfterLast)

+ 1 - 1
Tools/GltfImporter/Main.cpp

@@ -7,7 +7,7 @@
 
 using namespace anki;
 
-static constexpr char* kUsage = R"(Usage: %s in_file out_dir [options]
+static const char* kUsage = R"(Usage: %s in_file out_dir [options]
 Options:
 -rpath <string>            : Replace all absolute paths of assets with that path
 -texrpath <string>         : Same as rpath but for textures