freecam: Add support for changing field of view (#395)

* freecam

Add field of view get from player settings

* [Refactor] Add fov support to map editor

Author: Xenius97

[editor]/editor_gui/client/options_action.lua

@@ -68,6 +68,7 @@ function setFreecamSpeeds()
 	freecam.setFreecamOption ( "fastMaxSpeed", dialog.fastMove:getValue() )
 	freecam.setFreecamOption ( "slowMaxSpeed", dialog.slowMove:getValue() )
 	freecam.setFreecamOption ( "mouseSensitivity", dialog.mouseSensitivity:getValue() )
+	freecam.setFreecamOption ( "fov", dialog.fov:getValue() )
 end
 
 ---This part decides whether gui should be refreshed or not

[editor]/editor_gui/client/options_backend.lua

@@ -27,6 +27,7 @@ local xmlVariants = {
 ["enablePrecisionSnap"]="enableprecisionsnap",
 ["enablePrecisionRotation"]="enableprecisionrotation",
 ["enableColPatch"]="enablecolpatch",
+["fov"]="fov",
 }
 local nodeTypes = {
 ["enableSounds"]="bool",
@@ -56,6 +57,7 @@ local nodeTypes = {
 ["enablePrecisionRotation"]="bool",
 ["enableXYZlines"]="bool",
 ["enableColPatch"]="bool",
+["fov"]="progress",
 }
 local defaults = {
 ["enableSounds"]=true,
@@ -84,6 +86,7 @@ local defaults = {
 ["enablePrecisionRotation"]=false,
 ["enableXYZlines"]=true,
 ["enableColPatch"]=false,
+["fov"]=dxGetStatus()["SettingFOV"],
 }
 
 --stuff involving xml and dumping

[editor]/editor_gui/client/options_gui.lua

@@ -48,6 +48,7 @@ function createOptionsDialog()
 	guiCreateLabel ( 0.02, 0.22, 1, 0.1, "Fast camera move speed:", true, dialog.cameraTab )
 	guiCreateLabel ( 0.02, 0.42, 1, 0.1, "Slow camera move speed:", true, dialog.cameraTab )
 	guiCreateLabel ( 0.02, 0.72, 1, 0.1, "Look sensitivity:", true, dialog.cameraTab )
+	guiCreateLabel ( 0.5, 0.02, 1, 0.1, "Field of View:", true, dialog.cameraTab )
 
 	dialog.normalMove = editingControl.slider:create{["x"]=0.02,["y"]=0.08,["width"]=0.4,["height"]=0.11,["relative"]=true,["parent"]=dialog.cameraTab,
 		["min"]=1,
@@ -65,9 +66,13 @@ function createOptionsDialog()
 		["min"]=0.01,
 		["max"]=1.3,
 	}
+	dialog.fov = editingControl.slider:create{["x"]=0.5,["y"]=0.08,["width"]=0.4,["height"]=0.11,["relative"]=true,["parent"]=dialog.cameraTab,
+		["min"]=70,
+		["max"]=90,
+	}
 
-	dialog.smoothCamMove = editingControl.boolean:create{["x"]=0.5,["y"]=0.06,["width"]=1,["height"]=0.1,["relative"]=true,["parent"]=dialog.cameraTab,["label"]="Smooth Camera movement"}
-	dialog.invertMouseLook = editingControl.boolean:create{["x"]=0.5,["y"]=0.16,["width"]=1,["height"]=0.1,["relative"]=true,["parent"]=dialog.cameraTab,["label"]="Invert mouse look"}
+	dialog.smoothCamMove = editingControl.boolean:create{["x"]=0.5,["y"]=0.22,["width"]=1,["height"]=0.1,["relative"]=true,["parent"]=dialog.cameraTab,["label"]="Smooth Camera movement"}
+	dialog.invertMouseLook = editingControl.boolean:create{["x"]=0.5,["y"]=0.32,["width"]=1,["height"]=0.1,["relative"]=true,["parent"]=dialog.cameraTab,["label"]="Invert mouse look"}
 	--create movement settings
 	guiCreateLabel ( 0.02, 0.12, 1, 0.1, "Normal element movement speed:", true, dialog.movementTab )
 	guiCreateLabel ( 0.02, 0.32, 1, 0.1, "Fast element movement speed:", true, dialog.movementTab )

[editor]/editor_main/client/controls.lua

@@ -109,6 +109,7 @@ addEventHandler("onClientResourceStart", root,
 			freecam.setFreecamOption("key_backward", cc.camera_move_backwards)
 			freecam.setFreecamOption("key_left", cc.camera_move_left)
 			freecam.setFreecamOption("key_right", cc.camera_move_right)
+			freecam.setFreecamOption("fov", cc.camera_move_right)
 		elseif resource == thisResource then
 			bindKey ("lctrl","both",blockMTAControls )
 			processControls()

[editor]/freecam/freecam.lua

@@ -24,7 +24,8 @@ local options = {
 	key_forward_veh = "accelerate",
 	key_backward_veh = "brake_reverse",
 	key_left_veh = "vehicle_left",
-	key_right_veh = "vehicle_right"
+	key_right_veh = "vehicle_right",
+	fov = 70
 }
 
 local controlToKey = {
@@ -209,7 +210,7 @@ local function freecamFrame ()
     camTargetZ = camPosZ + freeModeAngleZ * 100
 
     -- Set the new camera position and target
-    setCameraMatrix ( camPosX, camPosY, camPosZ, camTargetX, camTargetY, camTargetZ )
+    setCameraMatrix ( camPosX, camPosY, camPosZ, camTargetX, camTargetY, camTargetZ, 0, options.fov )
 end
 
 local function freecamMouse (cX,cY,aX,aY)
@@ -271,7 +272,7 @@ function setFreecamEnabled (x, y, z)
 	end
 
 	if (x and y and z) then
-	    setCameraMatrix ( x, y, z )
+	    setCameraMatrix ( x, y, z, nil, nil, nil, 0, options.fov )
 	end
 	addEventHandler("onClientRender", root, freecamFrame)
 	addEventHandler("onClientCursorMove",root, freecamMouse)