Fixed Cameras

Lachee · Apr 28, 2021 · a16a62e · a16a62e
1 parent 1d92607
commit a16a62e
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 44 deletions.
diff --git a/README.md b/README.md
@@ -33,6 +33,3 @@ This will replace the previous garage with this one.
 
 **Dont forget to run the `.sql` in the `sql/` folder**
 
-### TODO 
-
-- Fix camera
diff --git a/client/functions.lua b/client/functions.lua
@@ -101,7 +101,7 @@ SpawnVehicle = function(data, isRecovery)
         end
 
         -- Always abort here cause the vehicle exists
-        return HandleCamera(cachedData["currentGarage"])
+        return
     end
 
     -- Close the menu
@@ -130,7 +130,6 @@ SpawnVehicle = function(data, isRecovery)
                 TriggerServerEvent('garage:addKeys', plate)
                 Citizen.Wait(100)
                 TriggerServerEvent('erp_garage:modifystate', vehicleProps, 0, nil)
-                HandleCamera(cachedData["currentGarage"])
             end)
 
             if isRecovery then
@@ -285,38 +284,47 @@ HandleAction = function(action)
     end
 end
 
-HandleCamera = function(garage, toggle)
+-- Detatches the camera from the garage
+DetatchGarageCamera = function() 
+    -- currentGarage = cachedData["currentGarage"]
+    -- if not currentGarage then
+    --     return false
+    -- end
+
+    print('Detatch Camera ')    
+
+    -- Destroy the cam
+    if cachedData["cam"] then
+        DestroyCam(cachedData["cam"])
+    end
+
+    -- Revert
+    RenderScriptCams(0, 1, 750, 1, 0)
+    return true
+end
+
+-- Attaches the camera to a particular garage
+AttachGarageCamera = function(garage)
     if not garage then return; end
-    local Camerapos = Config.Garages[garage]["camera"]
-
+
+    local Camerapos = Config.Garages[garage]["camera"]    
     if not Camerapos then return end
 
-    if not toggle then
-        if cachedData["cam"] then
-            DestroyCam(cachedData["cam"])
-        end
-
-        if DoesEntityExist(cachedData["vehicle"]) then
-            DeleteEntity(cachedData["vehicle"])
-        end
-
-        RenderScriptCams(0, 1, 750, 1, 0)
-
-        return
-    end
-
+    print('Attach Camera Camera ' .. garage)    
+
+    -- Clear previous camera
     if cachedData["cam"] then
         DestroyCam(cachedData["cam"])
     end
 
+    -- Create the script and make it active
     cachedData["cam"] = CreateCam("DEFAULT_SCRIPTED_CAMERA", true)
-
     SetCamCoord(cachedData["cam"], Camerapos["x"], Camerapos["y"], Camerapos["z"])
     SetCamRot(cachedData["cam"], Camerapos["rotationX"], Camerapos["rotationY"], Camerapos["rotationZ"])
     SetCamActive(cachedData["cam"], true)
 
+    -- Render the script
     RenderScriptCams(1, 1, 750, 1, 1)
-
     Citizen.Wait(500)
 end
 
@@ -424,6 +432,6 @@ function tomoney(value)
     if value == nil then
         return '~g~FREE'
     end
-    
+
     return '$' .. tostring(esx.Math.GroupDigits(value))
 end
diff --git a/client/garageMenu.lua b/client/garageMenu.lua
@@ -128,7 +128,8 @@ function MenuRecoveryList()
         return
     end
 
-    HandleCamera(currentGarage, true)
+    AttachGarageCamera(currentGarage)
+
     ped = GetPlayerPed(-1);
     MenuTitle = "Recovery"
     ClearMenu()
@@ -167,13 +168,13 @@ end
 -- Displays a list of vehicles
 function MenuVehicleList()
     currentGarage = cachedData["currentGarage"]
-
     if not currentGarage then
         CloseMenu()
         return
     end
 
-    HandleCamera(currentGarage, true)
+    AttachGarageCamera(currentGarage)
+
     ped = GetPlayerPed(-1);
     MenuTitle = "My vehicles :"
     ClearMenu()

diff --git a/client/gui.lua b/client/gui.lua
@@ -192,14 +192,18 @@ end
 
 --------------------------------------------------------------------------------------------------------------------
 function CloseMenu()
+    if Menu.hidden then
+        return
+    end
+
     -- Reset the camera, untrigger the inmenu
-    HandleCamera(currentGarage, false)
     TriggerEvent("inmenu", false)
 
     --Clear the menu
     ClearMenu()
 
     --Finally hide the menu
+    DetatchGarageCamera()
     Menu.hidden = true
 end
 

diff --git a/config.lua b/config.lua
@@ -18,7 +18,7 @@ Config.Garages = {
                 ["heading"] = 160.0
             }
         },
-        ["camera_fake"] = {
+        ["camera"] = {
             ["x"] = 283.28225708008,
             ["y"] = -333.24017333984,
             ["z"] = 50.004745483398,
@@ -37,7 +37,7 @@ Config.Garages = {
                 ["heading"] = 320.0
             }
         },
-        ["camera_fake"] = {
+        ["camera"] = {
             ["x"] = -1813.5513916016,
             ["y"] = -340.40087890625,
             ["z"] = 46.962894439697,
@@ -56,7 +56,6 @@ Config.Garages = {
                 ["heading"] = 118.94
             }
         }
-
     },
     ["F"] = {
         ["positions"] = {
@@ -68,8 +67,6 @@ Config.Garages = {
                 ["heading"] = 45.58
             }
         }
-
-
     },
     ["G"] = {
         ["positions"] = {
@@ -105,7 +102,7 @@ Config.Garages = {
                 ["heading"] = 319.3
             }
         },
-        ["camera_fake"] = {
+        ["camera"] = {
             ["x"] = 1023.97,
             ["y"] = -756.88062744141,
             ["z"] = 59.571212768555,
@@ -174,8 +171,7 @@ Config.Garages = {
                 ["heading"] = 159.29
             }
         },
-
-        ["camera_fake"] = {
+        ["camera"] = {
             ["x"] = 231.94,
             ["y"] = -803.61,
             ["z"] = 32.51,
@@ -194,7 +190,6 @@ Config.Garages = {
                 ["heading"] = 162.14
             }
         }
-
     },
     ["O"] = {
         ["positions"] = {
@@ -206,7 +201,6 @@ Config.Garages = {
                 ["heading"] = 15.5
             }
         }
-
     },
     ["P"] = {
         ["positions"] = {
@@ -218,7 +212,6 @@ Config.Garages = {
                 ["heading"] = 164.31
             }
         }
-
     },
     ["Q"] = {
         ["positions"] = {
@@ -276,7 +269,7 @@ Config.Garages = {
                 ["text"] = "[ ~o~E~s~ ] Store Vehicle",
             }
         },
-        ["camera_fake"] = {
+        ["camera"] = {
             ["x"] = -709.066,
             ["y"] = -1348.404,
             ["z"] = 5.970,
@@ -297,7 +290,7 @@ Config.Garages = {
                 ["text"] = "[ ~o~E~s~ ] Store Vehicle",
             }
         },
-        ["camera_fake"] = {
+        ["camera"] = {
             ["x"] = -1301.229,
             ["y"] = -3385.397,
             ["z"] = 24.265,
@@ -318,7 +311,7 @@ Config.Garages = {
                 ["text"] = "[ ~o~E~s~ ] Store Vehicle",
             }
         },
-        ["camera_fake"] = {
+        ["camera"] = {
             ["x"] = 901.102,
             ["y"] = -1256.479,
             ["z"] = 31.271,

diff --git a/fxmanifest.lua b/fxmanifest.lua
@@ -1,4 +1,4 @@
-version '1.0.5'
+version '1.1.0'
 author 'Lachee'
 description 'Modified version of a garage script.'
 repository 'https://github.com/lachee/fivem-garage'
Original file line number	Diff line number	Diff line change
Expand Up		@@ -33,6 +33,3 @@ This will replace the previous garage with this one.

		Dont forget to run the `.sql` in the `sql/` folder

		### TODO

		- Fix camera