fix #6331

add /camtime{factor,exponent} commands parse optional factor (#3) and exponent (#4) camera state-transition parameters in Spring.SetCameraState
spring · Nov 11, 2019 · 266b51a · 266b51a
1 parent 7318ff0
commit 266b51a
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 4 deletions.
diff --git a/rts/Game/CameraHandler.cpp b/rts/Game/CameraHandler.cpp
@@ -137,6 +137,9 @@ void CCameraHandler::Init()
 		RegisterAction("viewsave");
 		RegisterAction("viewload");
 
+		RegisterAction("camtimefactor");
+		RegisterAction("camtimeexponent");
+
 		SortRegisteredActions();
 	}
 
@@ -505,12 +508,12 @@ void CCameraHandler::PushAction(const Action& action)
 		case hashString("viewsave"): {
 			if (!action.extra.empty()) {
 				SaveView(action.extra);
-				LOG("Saved view: %s", action.extra.c_str());
+				LOG("[CamHandler::%s] saved view \"%s\"", __func__, action.extra.c_str());
 			}
 		} break;
 		case hashString("viewload"): {
-			if (!LoadView(action.extra))
-				LOG_L(L_WARNING, "Loading view failed!");
+			if (LoadView(action.extra))
+				LOG("[CamHandler::%s] loaded view \"%s\"", __func__, action.extra.c_str());
 
 		} break;
 
@@ -520,6 +523,19 @@ void CCameraHandler::PushAction(const Action& action)
 		case hashString("togglecammode"): {
 			ToggleState();
 		} break;
+
+		case hashString("camtimefactor"): {
+			if (!action.extra.empty())
+				camTransState.timeFactor = std::atof(action.extra.c_str());
+
+			LOG("[CamHandler::%s] set transition-time factor to %f", __func__, camTransState.timeFactor);
+		} break;
+		case hashString("camtimeexponent"): {
+			if (!action.extra.empty())
+				camTransState.timeExponent = std::atof(action.extra.c_str());
+
+			LOG("[CamHandler::%s] set transition-time exponent to %f", __func__, camTransState.timeExponent);
+		} break;
 	}
 }
 

diff --git a/rts/Game/CameraHandler.h b/rts/Game/CameraHandler.h
@@ -59,6 +59,10 @@ class CCameraHandler : public CommandReceiver
 	void PushMode();
 	void PopMode();
 
+	void SetTransitionParams(float factor, float expon) {
+		camTransState.timeFactor   = factor;
+		camTransState.timeExponent =  expon;
+  }
 	void CameraTransition(float nsecs);
 	void UpdateTransition();
 
@@ -73,6 +77,9 @@ class CCameraHandler : public CommandReceiver
 	int GetModeIndex(const std::string& modeName) const;
 	unsigned int GetCurrentControllerNum() const { return currCamCtrlNum; }
 
+	float GetTransitionTimeFactor() const { return camTransState.timeFactor; }
+	float GetTransitionTimeExponent() const { return camTransState.timeExponent; }
+
 
 	/**
 	 * @brief write current camera settings in a vector
@@ -110,6 +117,7 @@ class CCameraHandler : public CommandReceiver
 
 		float timeStart = 0.0f;
 		float timeEnd = 0.0f;
+		// configurable parameters
 		float timeFactor = 0.0f;
 		float timeExponent = 0.0f;
 	};

diff --git a/rts/Lua/LuaUnsyncedCtrl.cpp b/rts/Lua/LuaUnsyncedCtrl.cpp
@@ -852,8 +852,9 @@ int LuaUnsyncedCtrl::SetCameraState(lua_State* L)
 		return 0;
 
 	if (!lua_istable(L, 1))
-		luaL_error(L, "Incorrect arguments to SetCameraState(table[, camTime])");
+		luaL_error(L, "[%s(stateTable[, camTransTime[, transTimeFactor[, transTimeExpon] ] ])] incorrect arguments", __func__);
 
+	camHandler->SetTransitionParams(luaL_optfloat(L, 3, camHandler->GetTransitionTimeFactor()), luaL_optfloat(L, 4, camHandler->GetTransitionTimeExponent()));
 	camHandler->CameraTransition(luaL_optfloat(L, 2, 0.0f));
 
 	const bool retval = camHandler->SetState(ParseCamStateMap(L, 1));