Merge pull request #118 from Silverlan/develop

assets/scripts/localization/jp/language.udm

@@ -1,11 +1,9 @@
 "jp"
 {
-	// $string displayName "日本語"
-	$string displayName "Japanese"
+	$string displayName "日本語"
 	"font"
 	{
 		$array characterSetRequirements [string]["jp"]
-		$string requiredChars " !\"'()*+-./0123456789:=>ABCDEFGHIKLMNOPQRSTUVWXYZ[]^_abcdefghijklmnopqrstuvwxyz{}ē、。々「」あいうえおかがきぎくぐけげこごさざしじすずせぜそぞただちっつづてでとどなにねのはばびへべほぼまみむめもゃやょよらりるれろわをんァアィイゥウェエォオカガキギクグケゲコゴサザシジスズセゼソゾタダチッツテデトドナニネノハバパヒビピフブプヘベペホボポマミムメモャヤュユョヨラリルレロワンヴ・ー一三上下不与世両中主乗乱乳了予事二互五人今介他付代以仮件任伝伸似位低体何作使例供価便係保信俳個候倣値停側備傾働像優元先光入全共具内円再写凍処凸凹出分切列初別利制刻則削前割力功加助効動化半単印原参反取受口可右号各合同名向否含告周味呼命品員問善器四回因囲図固圧在地均垂型域基報場塩境増声変外多大天太央失奥奨好始子字存学完定実害容密対寿専射小少尺屈屋展属履岐岩工左巻布常幅平広序底度座延式引張強当形彩影役径待後従得御復心必応快性情想意感態慎成戻所手承投抗折択抵押抽拒拡持指挙振挿捨捻排探接推描提換援携撃播撮操支改攻放敗散数整文料斜断新方旅既日早明易星映時景晶暴曜曲更書替最有期木本材条枚果枠査根格案棄椅植検業極楽概構様標模横機次止正武歩歪歳歴残段殺比毛気水氷決沢況法泡波泥注浮浸消液深混添済減渡渦測湿源準滑漬漸炎点無焦焼煙照燃爆版牙牛物牲特犠状独率玉珀珠現球理琥環生用由画界番異発白的皮目直相真眼矢知矩短石砂破確礎示禅私移種稼空突立端第等筒算管箱節範築簡粋粒粗精糖系約純級素索細紹終結絞絡統絶継続緑緒線編縫縮繁繰置義羽翠者聴肉肢胃背胸能脈脚腕膏膚自致舞般良色英草落著蔽薄行衝表衰被装補複要見規視覚覧親観角解言計設許証評試詳認語説読誰調諾識警象費貼質赤起超足距跡身車軌転軸輝輪込近返追退送逆透通速造連進遅遇運過道達違遠適遭遮遷選部郭配重野量金鈍鉄鉛銀銅錐録長閉開間関閾防限除陽隔際集離難雪震霧露青静非面音響頂順領頭頻題顔類風飛駆験骨高髪鶏麦黄黒！＆（）：？"
 	}
 	$bool enabled true
 }

assets/scripts/localization/zh-cn/language.udm

@@ -1,10 +1,9 @@
 "zh-cn"
 {
-	$string displayName "Chinese (Simplified)"
+	$string displayName "中文 (简体)"
 	"font"
 	{
 		$array characterSetRequirements [string]["zh"]
-		$string requiredChars " \"'()*+-./0123456789:=>ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_abcdefghijklmnopqrstuvwxyz{}àáèéìíòóùúāēěīōūǎǐǒǔǜα“”。一三上下不与专且世业丝丢两个中为主丽么义之乎乐乘也习书了事二于互五亚些交产享亮人什仁仅介仍从他代以们仰件任仿众优会传伪伯估伸似伽但位低住体何作你佳使例供侧保信俯倍倒值倾假偏做停健储像允元先光克免入全八公六兰关其具内再冒写军冠冰冲决况准减凝几凸凹出击函分切划列则创初删利别到制刷刺刻前剔剪副割力功加务劣动助势包化匙区十午半华单占卡印即卷历压厚原去参叉及双反发取受变叠口古另只可台史右叶号各合同名后向吗否含听启告员周味命和品响唱啤喜喷器噪四回因围固图圆圈土在地场址均坎坏坐块坛坦坪垂型域基堆塑塞境增声壳处备复外多夜大天太失头夹奇套奶好如妈始姿子孔字存学孩它安完定宝实客家容密察寸对寻导寿射将小少尔尘尚就尺尼局屏展属岁岩工左巧巨差己已布师希帐帧帮常幕平并幻幽广序库应底度康延建开异弃式引弦弯弹强归当录形彩影径待很得循德心志快忽态思性恢息悉您情想意感慎戏成我戒或战截户所手打执扩扭找把投抖抗折报拉拍拒拖拙拟拥择括持指按挡振捉捕损换据排探接控掩描提插摄摸撞撤播操擎支收改攻放效敏教散数整文斗料斜断斯新方旅旋无旦早时明易星映春是显晕景晶智暂暗曜曝曲更替最有服望期木未末本机杀权李杏材束条来松板极构林果架柄某染柔柠查柱柿栅标栈栏树校样核根格桃框档梁检棕森植楚概榄模横橄橙檬次欢止正此步武段每比毛毯气水求汽沙没沥油法泡波注泽洋活流浅浏浮海消涡润液淆淡深混添清渐渡渲游湿源滑滚滤漂演漫潜激火灯灰灵炸点烁烘烟热烷焙焦然照熟燃燧爆爱父片版牌牙牛物特状独率玉玛玩玫环现玻珀珊珍珠球理琥瑙瑚瑰璃瓜瓦瓷生用由甲电画界留略番白百的皇皮皱盐监盒盔盖盘盛目直相看真眨眼着睛矢知矩石码研砖砾础硬确碧碰磁示社禁禅离种科秒秘积称移程稍究空窗立竖站竞端笔符第等筒签简算管箭箱米类粉粒粗粘精糊糖糙系素索紧紫红约级纯纳纹纺线组细终绍经绑结绕绘络绝统继绪续维绿缓编缘缟缩缺网罗置羽翠翡翻考者而聊联聚肉肤肩胃背胸能脂脚脱腿膀膏臂自至致航良色节芬花苍若苯英苹范茄草荡荷获菊菜萄著葡董蒸蓝蓟蔚蔽薄薰藏虑虚虽蛮行衡衣表衰被裁装褐西要覆见观规视览觉角解触言警计订认议记许设证评识译试话该详语误请读调谢谨豆象豪贝败账质购贴费贾资赭走起超越趾跃距跟路跳踪身车轨转轮软轴轻载较辆辐辑输辨边达过迎运近返还这进远连迟述迹追退适逃逆选透逐通速逻遇道遮邮部都配酒酱酸采里重野量金针钛钟钢钥钮钻铁铜铝铰银铺链销锁错锥键锯镍镜长门闪闭问间阈阳阴阵阶阻附际限除陶随隐隔难集雕雪雾需震霍青静靛非面鞍音页顶项顺顾预领频颗题颜风饱馈首马驱验骗骤骨骼高魅鱼鲁鲑鸡鸣鸭鹿麒麟麦麻黄黑默鼠齐齿龙！（），：；？"
 	}
 	$bool enabled true
 }

build_scripts/build.py

@@ -825,17 +825,17 @@ def execbuildscript(filepath):
 if with_common_modules:
 	add_pragma_module(
 		name="pr_bullet",
-		commitSha="a64c52cf58dc667ae0c0a99ef4aa931e44f94e5e",
+		commitSha="be622341b5890ae2f8f1c97481ff52ddbd351cf0",
 		repositoryUrl="https://github.com/Silverlan/pr_bullet.git"
 	)
 	add_pragma_module(
 		name="pr_audio_soloud",
-		commitSha="73ee6c707e47f41e06148c55aceae8eb43c34842",
+		commitSha="7d4361d289ff1527e4783cde65dd7e5852684975",
 		repositoryUrl="https://github.com/Silverlan/pr_soloud.git"
 	)
 	add_pragma_module(
 		name="pr_audio_dummy",
-		commitSha="84e1249c296dfc6cf288c8262142170851286f48",
+		commitSha="1a806a1a7b2283bd8551d07e4f1d680499f68b90",
 		repositoryUrl="https://github.com/Silverlan/pr_audio_dummy.git"
 	)
 	add_pragma_module_prebuilt("Silverlan/pr_mount_external_prebuilt")
@@ -862,7 +862,7 @@ def execbuildscript(filepath):
 		)
 		add_pragma_module(
 			name="pr_unirender",
-			commitSha="7356fb4ba517e999cf853e41f8ce79918e3307d2",
+			commitSha="b2602180ead8d811acb37c6fe6d86d75ed0fb3a7",
 			repositoryUrl="https://github.com/Silverlan/pr_cycles.git"
 		)
 		add_pragma_module(
@@ -891,7 +891,7 @@ def execbuildscript(filepath):
 if with_vr:
 	add_pragma_module(
 		name="pr_openvr",
-		commitSha="15b090a2c5c6e55cff146d6344bfb03347a3d1d4",
+		commitSha="2dd977344ebe8cd102cd24aa1ddcb34d696c7dda",
 		repositoryUrl="https://github.com/Silverlan/pr_openvr.git"
 	)
 

build_scripts/scripts/external_libs.py

@@ -10,19 +10,19 @@
 os.chdir(external_libs_dir)
 get_submodule("alsoundsystem","https://github.com/Silverlan/alsoundsystem.git","7daad8c34ab5000fc92b6f326b08fdc81b984cfe")
 get_submodule("datasystem","https://github.com/Silverlan/datasystem.git","7642296ea0f8316957e1123034e87034294f8b46")
-get_submodule("iglfw","https://github.com/Silverlan/iglfw.git","c5ea5319c17e206e8e418a2549a195e662f59dfd")
+get_submodule("iglfw","https://github.com/Silverlan/iglfw.git","0a32680dcf085f4541252110229439125e35c3c6")
 get_submodule("luasystem","https://github.com/Silverlan/luasystem.git","b36cfa22c79906270dec09a0d882e92c07a12104")
 get_submodule("materialsystem","https://github.com/Silverlan/materialsystem.git","b5ef761c20f5f6afa573bee079340d6da4db8bd2")
 get_submodule("mathutil","https://github.com/Silverlan/mathutil.git","90a6cbb229cf3b2e7af1eb9bc58b3ff22db5a611")
 get_submodule("networkmanager","https://github.com/Silverlan/networkmanager.git","981bc5809c1a768267ddace778205e1be0262730")
 get_submodule("panima","https://github.com/Silverlan/panima.git","08492a7bd8b214ff8472ae3288a32020aff1f60e")
 get_submodule("prosper","https://github.com/Silverlan/prosper.git","8e3cf2412f90842f1ab5b10427526d21ab97eba9")
-get_submodule("sharedutils","https://github.com/Silverlan/sharedutils.git","af5493d8be32d29a7b131fb6b903a32222358fa4")
+get_submodule("sharedutils","https://github.com/Silverlan/sharedutils.git","cbfdabddc7bacbcb1c00bfaccda5c7b10a8fc912")
 get_submodule("util_bsp","https://github.com/Silverlan/util_bsp.git","7c49f7b9a59b1e9776a355881aeecede8a8f9be3")
-get_submodule("util_formatted_text","https://github.com/Silverlan/util_formatted_text.git","3fbb26580f732d0297cd6738f28636f6a1fd1f0c")
+get_submodule("util_formatted_text","https://github.com/Silverlan/util_formatted_text.git","c473a2bdc1ad84ef52d391226d6983ef3076958e")
 get_submodule("util_image","https://github.com/Silverlan/util_image.git","bc1af9d7a0e4e4e51550a4730d65e072ae97d592")
 get_submodule("util_pad","https://github.com/Silverlan/util_pad.git","49d78bd7725cc320fae67c6eff5c25524d1363c0")
-get_submodule("util_pragma_doc","https://github.com/Silverlan/util_pragma_doc.git","71b9593872633adafa8dada0797bdf4fabf74c4f")
+get_submodule("util_pragma_doc","https://github.com/Silverlan/util_pragma_doc.git","88e85503b120f820143f6f4566e194b539297ffa")
 get_submodule("util_smdmodel","https://github.com/Silverlan/util_smdmodel.git","10fb2d10eb62188c8b9639a62da646152277a748")
 get_submodule("util_sound","https://github.com/Silverlan/util_sound.git","dcc284ca1affd33c9964ff1646e7aa7cf902eb96")
 get_submodule("util_source2","https://github.com/Silverlan/util_source2.git","2d45b2c76921475b61647ea63aeb180b37a17d44")
@@ -33,8 +33,8 @@
 get_submodule("util_vmf","https://github.com/Silverlan/util_vmf.git","3080ba05280ae5b0a76ef283870864c16d1c7826")
 get_submodule("util_zip","https://github.com/Silverlan/util_zip.git","d9bf05a5cbf71bf53f9fbea82c7352f870989ed1")
 get_submodule("vfilesystem","https://github.com/Silverlan/vfilesystem.git","25c839e313b1bb1c2b4dee56c4a0298c53f546b4")
-get_submodule("wgui","https://github.com/Silverlan/wgui.git","bfa72cae6258f1233c60e5fd9ecae1bbf53ee7e7")
-get_submodule("util_unicode","https://github.com/Silverlan/util_unicode.git","344d62ac0b06db9d970b08e9cf3a1d039ed6b28a")
+get_submodule("wgui","https://github.com/Silverlan/wgui.git","28f5feb6f72f472f77d15dc75f26e5c6672ca0ba")
+get_submodule("util_unicode","https://github.com/Silverlan/util_unicode.git","5a0ac6c02f199e42d7d38d99231503cf42e26f8a")
 get_submodule("cppbezierfit","https://github.com/Silverlan/cppbezierfit.git","eb08f35ad74c1124f3cd4ef3a8958cded6a04b0e")
 
 os.chdir(curDir)

build_scripts/scripts/modules.py

@@ -9,7 +9,7 @@
 modules_dir = curDir +"/modules"
 os.chdir(modules_dir)
 get_submodule("interfaces","https://github.com/Silverlan/pragma_interfaces.git","48c1b84f2245324e90871924e4f606f846197818")
-get_submodule("pr_audio_dummy","https://github.com/Silverlan/pr_audio_dummy.git","84e1249c296dfc6cf288c8262142170851286f48")
+get_submodule("pr_audio_dummy","https://github.com/Silverlan/pr_audio_dummy.git","1a806a1a7b2283bd8551d07e4f1d680499f68b90")
 get_submodule("pr_curl","https://github.com/Silverlan/pr_curl.git","974c67cc76710809a9595fcfbc4167554799cd7f")
 get_submodule("pr_prosper_opengl","https://github.com/Silverlan/pr_prosper_opengl.git","4dcc3045f37da63456f2a3ddcf66490497b87106")
 get_submodule("pr_prosper_vulkan","https://github.com/Silverlan/pr_prosper_vulkan.git","f7416f9d24e79a6cdac2798d1d064c20816cbfee")

core/client/include/pragma/asset/c_util_model.hpp

@@ -45,7 +45,7 @@ namespace pragma::asset {
 		bool fullExport = false;
 		bool normalizeTextureNames = false;
 		ImageFormat imageFormat = ImageFormat::DDS;
-		float scale = ::util::pragma::units_to_metres(1.f);
+		float scale = ::pragma::units_to_metres(1.f);
 
 		bool generateAo = false;
 		uint32_t aoResolution = 512;

core/client/include/pragma/c_engine.h

@@ -34,7 +34,7 @@ namespace pragma::debug {
 	class GPUProfilingStage;
 	class GPUProfiler;
 };
-namespace util {
+namespace pragma::string {
 	class Utf8String;
 };
 struct InputBindingLayer;
@@ -74,6 +74,11 @@ class DLLCLIENT CEngine : public Engine, public pragma::RenderContext {
 
 		Count
 	};
+	struct DLLCLIENT DroppedFile {
+		DroppedFile(const std::string &rootPath, const std::string &fullPath);
+		std::string fullPath;
+		std::string fileName;
+	};
 
 	using pragma::RenderContext::DrawFrame;
 	virtual void SetAssetMultiThreadedLoadingEnabled(bool enabled) override;
@@ -109,6 +114,7 @@ class DLLCLIENT CEngine : public Engine, public pragma::RenderContext {
 	virtual void StartDefaultGame(const std::string &map) override;
 	virtual void EndGame() override;
 	virtual bool IsClientConnected() override;
+	const std::vector<DroppedFile> &GetDroppedFiles() const;
 	bool IsWindowFocused() const;
 	bool IsValidAxisInput(float axisInput) const;
 	void GetMappedKeys(const std::string &cmd, std::vector<GLFW::Key> &keys, uint32_t maxKeys = 1);
@@ -156,11 +162,13 @@ class DLLCLIENT CEngine : public Engine, public pragma::RenderContext {
 	void ScrollInput(prosper::Window &window, Vector2 offset);
 	void OnWindowFocusChanged(prosper::Window &window, bool bFocus);
 	void OnFilesDropped(prosper::Window &window, std::vector<std::string> &files);
+	void OnDragEnter(prosper::Window &window);
+	void OnDragExit(prosper::Window &window);
 	void OnWindowResized(prosper::Window &window, Vector2i size);
 	bool OnWindowShouldClose(prosper::Window &window);
 	void JoystickButtonInput(prosper::Window &window, const GLFW::Joystick &joystick, uint32_t key, GLFW::KeyState state);
 	void JoystickAxisInput(prosper::Window &window, const GLFW::Joystick &joystick, uint32_t axis, GLFW::Modifier mods, float newVal, float deltaVal);
-	void OnPreedit(prosper::Window &window, const util::Utf8String &preeditString, const std::vector<int> &blockSizes, int focusedBlock, int caret);
+	void OnPreedit(prosper::Window &window, const pragma::string::Utf8String &preeditString, const std::vector<int> &blockSizes, int focusedBlock, int caret);
 	void OnIMEStatusChanged(prosper::Window &window, bool imeEnabled);
 	float GetRawJoystickAxisMagnitude() const;
 	// Util
@@ -279,6 +287,8 @@ class DLLCLIENT CEngine : public Engine, public pragma::RenderContext {
 	std::vector<std::shared_ptr<prosper::TimerQuery>> m_gpuTimers;
 	std::vector<std::chrono::nanoseconds> m_gpuExecTimes {};
 
+	std::vector<DroppedFile> m_droppedFiles = {}; // Only contains files during OnFilesDropped-call
+
 	virtual void Think() override;
 	virtual void Tick() override;
 	void Input(int key, GLFW::KeyState state, GLFW::Modifier mods = {}, float magnitude = 1.f);

core/client/include/pragma/clientstate/clientstate.h

@@ -73,7 +73,7 @@ namespace pragma::networking {
 namespace prosper {
 	class RenderTarget;
 };
-namespace util {
+namespace pragma::string {
 	class Utf8String;
 };
 class DLLCLIENT ClientState : public NetworkState {
@@ -239,8 +239,10 @@ class DLLCLIENT ClientState : public NetworkState {
 	Bool CharInput(unsigned int c);
 	Bool ScrollInput(Vector2 offset);
 	void OnFilesDropped(std::vector<std::string> &files);
+	void OnDragEnter(prosper::Window &window);
+	void OnDragExit(prosper::Window &window);
 	bool OnWindowShouldClose(prosper::Window &window);
-	void OnPreedit(prosper::Window &window, const util::Utf8String &preeditString, const std::vector<int> &blockSizes, int focusedBlock, int caret);
+	void OnPreedit(prosper::Window &window, const pragma::string::Utf8String &preeditString, const std::vector<int> &blockSizes, int focusedBlock, int caret);
 	void OnIMEStatusChanged(prosper::Window &window, bool imeEnabled);
 
 	Material *LoadMaterial(const std::string &path, const std::function<void(Material *)> &onLoaded, bool bReload = false);

core/client/include/pragma/entities/game/c_game_shadow_manager.hpp

@@ -24,7 +24,7 @@ namespace prosper {
 namespace Anvil {
 	class DescriptorSet;
 };
-namespace util::pragma {
+namespace pragma {
 	enum class LightType : uint8_t;
 };
 namespace pragma {
@@ -54,11 +54,11 @@ namespace pragma {
 		struct LightSourceData {
 			std::shared_ptr<prosper::IPrimaryCommandBuffer> drawCmd;
 			pragma::CLightComponent *light;
-			util::pragma::LightType type;
+			pragma::LightType type;
 			Vector3 position;
 			float radius;
 		};
-		void RenderShadows(std::shared_ptr<prosper::IPrimaryCommandBuffer> &drawCmd, pragma::CLightComponent &light, pragma::CLightComponent::ShadowMapType smType, util::pragma::LightType type, bool drawParticleShadows);
+		void RenderShadows(std::shared_ptr<prosper::IPrimaryCommandBuffer> &drawCmd, pragma::CLightComponent &light, pragma::CLightComponent::ShadowMapType smType, pragma::LightType type, bool drawParticleShadows);
 		bool UpdateShadowCasters(std::shared_ptr<prosper::IPrimaryCommandBuffer> &drawCmd, pragma::CLightComponent &light, pragma::CLightComponent::ShadowMapType smType);
 		void UpdateWorldShadowCasters(std::shared_ptr<prosper::IPrimaryCommandBuffer> &drawCmd, pragma::CLightComponent &light);
 		void UpdateEntityShadowCasters(std::shared_ptr<prosper::IPrimaryCommandBuffer> &drawCmd, pragma::CLightComponent &light);

core/client/include/pragma/game/c_game.h

@@ -103,17 +103,14 @@ namespace prosper {
 };
 namespace util {
 	struct DrawSceneInfo;
+};
+namespace pragma::string {
 	class Utf8String;
 };
 #pragma warning(push)
 #pragma warning(disable : 4251)
 class DLLCLIENT CGame : public Game {
   public:
-	struct DLLCLIENT DroppedFile {
-		DroppedFile(const std::string &fullPath);
-		std::string fullPath;
-		std::string fileName;
-	};
 	struct GlobalRenderSettingsBufferData {
 		GlobalRenderSettingsBufferData();
 		std::shared_ptr<prosper::IBuffer> debugBuffer = nullptr;
@@ -224,8 +221,10 @@ class DLLCLIENT CGame : public Game {
 	Bool CharInput(unsigned int c);
 	Bool ScrollInput(Vector2 offset);
 	void OnFilesDropped(std::vector<std::string> &files);
+	void OnDragEnter(prosper::Window &window);
+	void OnDragExit(prosper::Window &window);
 	bool OnWindowShouldClose(prosper::Window &window);
-	void OnPreedit(prosper::Window &window, const util::Utf8String &preeditString, const std::vector<int> &blockSizes, int focusedBlock, int caret);
+	void OnPreedit(prosper::Window &window, const pragma::string::Utf8String &preeditString, const std::vector<int> &blockSizes, int focusedBlock, int caret);
 	void OnIMEStatusChanged(prosper::Window &window, bool imeEnabled);
 
 	// Game
@@ -288,7 +287,6 @@ class DLLCLIENT CGame : public Game {
 	void RenderDebugPhysics(std::shared_ptr<prosper::ICommandBuffer> &drawCmd, pragma::CCameraComponent &cam);
 
 	using Game::LoadNavMesh;
-	const std::vector<DroppedFile> &GetDroppedFiles() const;
 
 	void OnReceivedRegisterNetEvent(NetPacket &packet);
 	virtual pragma::NetEventId FindNetEvent(const std::string &name) const override;
@@ -454,8 +452,6 @@ class DLLCLIENT CGame : public Game {
 	CallbackHandle m_cbProfilingHandle = {};
 	std::unique_ptr<pragma::debug::ProfilingStageManager<pragma::debug::ProfilingStage>> m_profilingStageManager;
 
-	std::vector<DroppedFile> m_droppedFiles = {}; // Only contains files during OnFilesDropped-call
-
 	struct DLLCLIENT MessagePacketTracker {
 		MessagePacketTracker();
 		uint8_t lastInMessageId;

core/client/include/pragma/gui/wicommandlineentry.hpp

@@ -30,7 +30,7 @@ class DLLCLIENT WICommandLineEntry : public WITextEntry {
 	virtual void OnFocusGained() override;
 	virtual void OnFocusKilled() override;
 	virtual void OnTextEntered() override;
-	virtual void OnTextChanged(const util::Utf8String &text, bool changedByUser) override;
+	virtual void OnTextChanged(const pragma::string::Utf8String &text, bool changedByUser) override;
 	void InitializeAutoCompleteList();
 	std::vector<std::string> m_commandHistory = {};
 	std::function<void(const std::string &, std::vector<std::string> &)> m_fAutoCompleteHandler = nullptr;