diff --git a/frontend/src/utils/gameView.ts b/frontend/src/utils/gameView.ts index c217919..a26b403 100644 --- a/frontend/src/utils/gameView.ts +++ b/frontend/src/utils/gameView.ts @@ -157,6 +157,11 @@ export function createGameView( gl.texParameterf(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.NEAREST) gl.texParameterf(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.NEAREST) gl.texParameterf(gl.TEXTURE_2D, gl.TEXTURE_WRAP_S, gl.CLAMP_TO_EDGE) + // CitizenFX watches this exact wrap-mode sequence and replaces the seeded pixel with the live + // game backbuffer. These calls are intentionally not redundant. + gl.texParameterf(gl.TEXTURE_2D, gl.TEXTURE_WRAP_T, gl.CLAMP_TO_EDGE) + gl.texParameterf(gl.TEXTURE_2D, gl.TEXTURE_WRAP_T, gl.MIRRORED_REPEAT) + gl.texParameterf(gl.TEXTURE_2D, gl.TEXTURE_WRAP_T, gl.REPEAT) gl.texParameterf(gl.TEXTURE_2D, gl.TEXTURE_WRAP_T, gl.CLAMP_TO_EDGE) gl.uniform1i(gl.getUniformLocation(program, 'u_texture'), 0) diff --git a/sky_phone/source/client/camera.lua b/sky_phone/source/client/camera.lua index 37590a5..f6f5993 100644 --- a/sky_phone/source/client/camera.lua +++ b/sky_phone/source/client/camera.lua @@ -5,8 +5,6 @@ local front_camera_fov = 25.0 local front_camera_distance = 0.75 local front_camera_height = 0.05 local front_camera_target_height = 0.03 -local camera_emote = "malemirrorselfie3" -local camera_emote_texture_variation = 8 local camera_state = { active = false, enforcing = false, @@ -21,16 +19,6 @@ local camera_state = { previous_vehicle_view = nil, } -local function start_camera_emote() - exports.rpemotes:EmoteCommandStart(camera_emote, camera_emote_texture_variation) -end - -local function stop_camera_emote() - if LocalPlayer.state.currentEmote == camera_emote then - exports.rpemotes:EmoteCancel(true) - end -end - local function rotation_to_direction(rotation) local z = math.rad(rotation.z) local x = math.rad(rotation.x) @@ -150,7 +138,6 @@ local function set_camera_active(active) end camera_state.active = active if active then - start_camera_emote() camera_state.front_camera = false clear_front_camera() camera_state.previous_ped_view = GetFollowPedCamViewMode() @@ -192,7 +179,6 @@ local function set_camera_active(active) end camera_state.flash_enabled = false camera_state.front_camera = false - stop_camera_emote() clear_front_camera() restore_camera_view() if not camera_state.nui_focused then