game main menu btn to start editor

stuntrally · Mar 31, 2024 · 3fd130a · 3fd130a
1 parent fed8874
commit 3fd130a
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 12 deletions.
diff --git a/data/gui/Game_Main.layout b/data/gui/Game_Main.layout
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <MyGUI type="Layout" version="3.2.0">
 
-	<Widget type="Window" skin="WindowC" position="1768 156 600 650" align="Center" layer="Overlapped" name="MainMenuWnd">
+	<Widget type="Window" skin="WindowC" position="1768 156 600 730" align="Center" layer="Overlapped" name="MainMenuWnd">
 		<Property key="MinSize" value="500 400"/>
 		<Property key="Caption" value="Stunt Rally #{GameVersion}"/>
 		<Property key="Alpha" value="0.7"/>
@@ -10,7 +10,7 @@
 
 <!-- 0 pan +8 img +12 btn   +72  12 84 156 228 300  336 408 480  -->
 
-		<Widget type="ImageBox" skin="ImageBox" position="0 420 589 201">
+		<Widget type="ImageBox" skin="ImageBox" position="0 520 589 201">
 			<Property key="ImageTexture" value="stuntrally-logo.jpg"/>
 			<!-- <Property key="ImageCoord" value="0 0 1892 645"/> 2.933 -->
 			<Property key="InheritsAlpha" value="false"/>
@@ -88,6 +88,15 @@
 			<Property key="InheritsAlpha" value="false"/>
 			<Property key="FontName" value="font.big"/>
 		</Widget>
+
+		<Widget type="Button" skin="Button" position="108 426 404 50" align="Left" name="BtnTrackEditor">
+			<Property key="Caption" value="#{TrackEditor}"/>
+			<Property key="Colour" value="0.7 0.9 0.9"/>
+			<Property key="TextColour" value="0.7 1.0 1.0"/>
+			<Property key="InheritsAlpha" value="false"/>
+			<Property key="FontName" value="font.big"/>
+			<UserString key="tip" value="#{TipTrackEditor}"/>
+		</Widget>
 	</Widget>
 
 <!-- 0 pan +8 img +12 btn   +72  12 84 156 228 300  336 408 480 -->

diff --git a/src/game/CGui.h b/src/game/CGui.h
@@ -572,6 +572,7 @@ class CGui : public BGui
 
 
 	//  🔗 open urls
+	void btnTrackEditor(WP);  // start ed exe
 	void btnWelcome(WP), btnWebsite(WP), btnWiki(WP), btnWikiInput(WP);
 	void btnForum(WP), btnSources(WP), btnEdTut(WP), btnTransl(WP), btnDonations(WP);
 };
diff --git a/src/game/Gui_Init.cpp b/src/game/Gui_Init.cpp
@@ -541,6 +541,7 @@ void CGui::InitGui()
 
 
 	//  🔗 open url btns  -------------
+	Btn("BtnTrackEditor", btnTrackEditor);
 	Btn("OpenWelcome", btnWelcome);  Btn("OpenWebsite", btnWebsite);   Btn("OpenSources", btnSources);
 	Btn("OpenForum",   btnForum);    Btn("OpenDonations", btnDonations);
 	//  wiki

diff --git a/src/game/Gui_Util.cpp b/src/game/Gui_Util.cpp
@@ -354,6 +354,17 @@ void CGui::GuiUpdate()
 
 //  🔗 open urls
 //.......................................................................................
+//  start ed exe
+void CGui::btnTrackEditor(WP)
+{
+	auto path = PATHS::Bin();
+#if OGRE_PLATFORM == OGRE_PLATFORM_WIN32
+	PATHS::OpenBin(path + "\\SR-Editor3.exe", path);
+#else
+	PATHS::OpenBin(path + "/sr-editor3", path);
+#endif
+}
+
 void CGui::btnWelcome(WP)
 {
 	app->mWndWelcome->setVisible(true);

diff --git a/src/vdrift/paths.cpp b/src/vdrift/paths.cpp
@@ -38,7 +38,7 @@ namespace
 string /*PATHS::ogre_plugin,*/ PATHS::home_dir,
 	PATHS::user_config, PATHS::game_config,
 	PATHS::user_data, PATHS::game_data,
-	PATHS::cache_dir;
+	PATHS::cache_dir, PATHS::game_bin;
 stringstream PATHS::info;
 
 
@@ -141,6 +141,10 @@ void PATHS::Init(bool log_paths)
 
 	CreateDir(DataUser());  // user data
 
+
+	fs::path exe = execname();  // binary dir
+	game_bin = exe.parent_path();
+
 
 	// Find game data dir and defaults config dir
 	char *datadir = getenv("STUNTRALLY3_DATA_ROOT");
@@ -154,14 +158,14 @@ void PATHS::Init(bool log_paths)
 		//dirs.push_back(user_data_dir);
 
 		// Adding relative path for running from sources
-		dirs.push_back(execname().parent_path().parent_path().parent_path() / "data");
-		dirs.push_back(execname().parent_path().parent_path().parent_path());
-		dirs.push_back(execname().parent_path().parent_path() / "data");
-		dirs.push_back(execname().parent_path().parent_path());
-		dirs.push_back(execname().parent_path() / "data");
-		dirs.push_back(execname().parent_path());
+		dirs.push_back(exe.parent_path().parent_path().parent_path() / "data");
+		dirs.push_back(exe.parent_path().parent_path().parent_path());
+		dirs.push_back(exe.parent_path().parent_path() / "data");
+		dirs.push_back(exe.parent_path().parent_path());
+		dirs.push_back(exe.parent_path() / "data");
+		dirs.push_back(exe.parent_path());
 		// Adding relative path from installed executable
-		dirs.push_back(execname().parent_path().parent_path() / shareDir);
+		dirs.push_back(exe.parent_path().parent_path() / shareDir);
 		#ifndef _WIN32
 		// Adding XDG_DATA_DIRS
 		{
@@ -220,6 +224,7 @@ void PATHS::Init(bool log_paths)
 		info << "Paths info" << endl;
 		info << "-------------" << endl;
 		// info << "Ogre plugin-: " << ogre_plugin << endl;
+		info << "Bin exe:      " << Bin() << endl;
 		info << "Data:         " << Data() << endl;
 		info << "ConfigDir:    " << GameConfigDir() << endl;  //?
 		// info << "Home:         " << home_dir << endl;
@@ -395,7 +400,7 @@ namespace
 }
 
 
-//  open web browser with url
+//  Open web browser with Url
 void PATHS::OpenUrl(const string& url)
 {
 #ifdef WIN32
@@ -405,3 +410,21 @@ void PATHS::OpenUrl(const string& url)
 	system(cmd.c_str());
 #endif
 }
+
+//  Start binary, exe  ----
+//  Crucial for starting  Track Editor
+//  from  Linux .AppImage pack  which starts game only
+void PATHS::OpenBin(const string& cmd, const string& path)
+{
+#ifdef WIN32
+	ShellExecuteA(
+		0,  // hwnd
+		0,  // str operation
+		cmd.c_str(),  // file
+		0,  // params
+		path.c_str(),  // dir
+		SW_SHOW);
+#else
+	system(cmd.c_str());  // no path, uses pwd?
+#endif
+}
diff --git a/src/vdrift/paths.h b/src/vdrift/paths.h
@@ -13,7 +13,7 @@ class PATHS
 private:
 	static std::string /*ogre_plugin,*/ home_dir;
 	static std::string user_config, game_config;
-	static std::string user_data, game_data, cache_dir;
+	static std::string user_data, game_data, cache_dir, game_bin;
 
 public:
 	static void Init(bool log_paths=true);
@@ -33,6 +33,7 @@ class PATHS
 	{
 		return user_config +"/"+ (ed ? "editor" : "game") + (old ? "_old" : "") + ".cfg";
 	}
+	static std::string Bin() {             return game_bin; }  // exe
 	static std::string Data() {            return game_data; }
 	static std::string DataUser() {        return user_data + "/data";  }
 	static std::string Tracks() {          return game_data + "/tracks";  }
@@ -59,5 +60,6 @@ class PATHS
 	static bool CreateDir(const std::string& path);
 
 	static void OpenUrl(const std::string& url);
+	static void OpenBin(const std::string& cmd, const std::string& path);
 
 };