diff --git a/Assets/Materials/emo.vmat b/Assets/Materials/emo.vmat new file mode 100644 index 0000000..69846b1 --- /dev/null +++ b/Assets/Materials/emo.vmat @@ -0,0 +1,42 @@ +// THIS FILE IS AUTO-GENERATED + +Layer0 +{ + shader "shaders/complex.shader" + + //---- Rendering ---- + F_DO_NOT_CAST_SHADOWS 1 + + //---- Ambient Occlusion ---- + g_flAmbientOcclusionDirectDiffuse "0.000" + g_flAmbientOcclusionDirectSpecular "0.000" + TextureAmbientOcclusion "materials/default/default_ao.tga" + + //---- Color ---- + g_flModelTintAmount "1.000" + g_vColorTint "[1.000000 1.000000 1.000000 0.000000]" + TextureColor "textures/pd7aum1vufg.jpg" + + //---- Fade ---- + g_flFadeExponent "1.000" + + //---- Fog ---- + g_bFogEnabled "1" + + //---- Metalness ---- + g_flMetalness "0.000" + + //---- Normal ---- + TextureNormal "materials/default/default_normal.tga" + + //---- Roughness ---- + g_flRoughnessScaleFactor "1.000" + TextureRoughness "materials/default/default_rough.tga" + + //---- Texture Coordinates ---- + g_nScaleTexCoordUByModelScaleAxis "0" + g_nScaleTexCoordVByModelScaleAxis "0" + g_vTexCoordOffset "[0.000 0.000]" + g_vTexCoordScale "[100.000 100.000]" + g_vTexCoordScrollSpeed "[0.000 0.000]" +} \ No newline at end of file diff --git a/Assets/frictions/High-Performance Road Tire.whfric b/Assets/frictions/High-Performance Road Tire.whfric new file mode 100644 index 0000000..d1b93e8 --- /dev/null +++ b/Assets/frictions/High-Performance Road Tire.whfric @@ -0,0 +1,22 @@ +{ + "Longitudinal": { + "B": 18, + "C": 1.5, + "D": 1.5, + "E": 0.3 + }, + "Lateral": { + "B": 12, + "C": 1.3, + "D": 1.8, + "E": -1.8 + }, + "Aligning": { + "B": 2.8, + "C": 2.1, + "D": 0.1, + "E": -2.5 + }, + "__references": [], + "__version": 0 +} \ No newline at end of file diff --git a/Assets/frictions/aboba.whfric b/Assets/frictions/aboba.whfric new file mode 100644 index 0000000..812f6dd --- /dev/null +++ b/Assets/frictions/aboba.whfric @@ -0,0 +1,22 @@ +{ + "Longitudinal": { + "B": 0, + "C": 1, + "D": 1, + "E": 0.3 + }, + "Lateral": { + "B": 1, + "C": 1, + "D": 1, + "E": 0.3 + }, + "Aligning": { + "B": 2.8, + "C": 2.1, + "D": 0.1, + "E": -2.5 + }, + "__references": [], + "__version": 0 +} \ No newline at end of file diff --git a/Assets/textures/pd7AUm1VuFg.jpg b/Assets/textures/pd7AUm1VuFg.jpg new file mode 100644 index 0000000..7e07e43 Binary files /dev/null and b/Assets/textures/pd7AUm1VuFg.jpg differ diff --git a/Code/Input/InputResolver.cs b/Code/Input/InputResolver.cs index 50e97be..e7a2a89 100644 --- a/Code/Input/InputResolver.cs +++ b/Code/Input/InputResolver.cs @@ -3,11 +3,9 @@ namespace VeloX; public class InputResolver { - public GameObject Driver { get; internal set; } - - - private bool IsDriverActive => Driver.IsValid(); + public Connection Driver { get; internal set; } + private bool IsDriverActive => Driver is not null; public Vector2 MouseDelta => IsDriverActive ? Input.MouseDelta : default; public Vector2 MouseWheel => IsDriverActive ? Input.MouseWheel : default; @@ -40,8 +38,6 @@ public class InputResolver public void StopAllHaptics() { if ( IsDriverActive ) - { Input.StopAllHaptics(); - } } } diff --git a/Code/Utils/EngineStream/EngineStreamPlayer.cs b/Code/Utils/EngineStream/EngineStreamPlayer.cs index cdc4070..3e9a09c 100644 --- a/Code/Utils/EngineStream/EngineStreamPlayer.cs +++ b/Code/Utils/EngineStream/EngineStreamPlayer.cs @@ -2,7 +2,6 @@ using Sandbox.Audio; using System; using System.Collections.Generic; -using System.IO; using VeloX.Audio; using static VeloX.EngineStream;