diff --git a/.gitignore b/.gitignore index 1cab6f5..5ad4c9d 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ mods/ *.DotSettings *.orig Debug Portable/ +BuildPS4/ diff --git a/Assets/Plugins/orbis.meta b/Assets/Plugins/orbis.meta new file mode 100644 index 0000000..b46cb24 --- /dev/null +++ b/Assets/Plugins/orbis.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b2956b4811b8eff40be7af2d9df0edea +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/orbis/libfmod.prx b/Assets/Plugins/orbis/libfmod.prx new file mode 100644 index 0000000..3cd25fd Binary files /dev/null and b/Assets/Plugins/orbis/libfmod.prx differ diff --git a/Assets/Plugins/orbis/libfmod.prx.meta b/Assets/Plugins/orbis/libfmod.prx.meta new file mode 100644 index 0000000..d2e2e87 --- /dev/null +++ b/Assets/Plugins/orbis/libfmod.prx.meta @@ -0,0 +1,77 @@ +fileFormatVersion: 2 +guid: 44e2293e12e398b4992024f4c342c694 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + : Any + second: + enabled: 0 + settings: + Exclude Editor: 1 + Exclude GameCoreScarlett: 1 + Exclude GameCoreXboxOne: 1 + Exclude Linux64: 1 + Exclude OSXUniversal: 1 + Exclude PS4: 0 + Exclude PS5: 1 + Exclude Win: 1 + Exclude Win64: 1 + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + CPU: AnyCPU + DefaultValueInitialized: true + OS: AnyOS + - first: + PS4: PS4 + second: + enabled: 1 + settings: {} + - first: + PS5: PS5 + second: + enabled: 0 + settings: {} + - first: + Standalone: Linux64 + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: OSXUniversal + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win + second: + enabled: 0 + settings: + CPU: x86 + - first: + Standalone: Win64 + second: + enabled: 0 + settings: + CPU: x86_64 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/orbis/libfmodL.prx b/Assets/Plugins/orbis/libfmodL.prx new file mode 100644 index 0000000..cd9b4b8 Binary files /dev/null and b/Assets/Plugins/orbis/libfmodL.prx differ diff --git a/Assets/Plugins/orbis/libfmodL.prx.meta b/Assets/Plugins/orbis/libfmodL.prx.meta new file mode 100644 index 0000000..15d19c9 --- /dev/null +++ b/Assets/Plugins/orbis/libfmodL.prx.meta @@ -0,0 +1,77 @@ +fileFormatVersion: 2 +guid: 08d67a8c86ec1994e8a69b83bc7815e8 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + : Any + second: + enabled: 0 + settings: + Exclude Editor: 1 + Exclude GameCoreScarlett: 1 + Exclude GameCoreXboxOne: 1 + Exclude Linux64: 1 + Exclude OSXUniversal: 1 + Exclude PS4: 0 + Exclude PS5: 1 + Exclude Win: 1 + Exclude Win64: 1 + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + CPU: AnyCPU + DefaultValueInitialized: true + OS: AnyOS + - first: + PS4: PS4 + second: + enabled: 1 + settings: {} + - first: + PS5: PS5 + second: + enabled: 0 + settings: {} + - first: + Standalone: Linux64 + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: OSXUniversal + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win + second: + enabled: 0 + settings: + CPU: x86 + - first: + Standalone: Win64 + second: + enabled: 0 + settings: + CPU: x86_64 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/windows/x86/SDL2.dll.meta b/Assets/Plugins/windows/x86/SDL2.dll.meta index a562aba..b70fb70 100644 --- a/Assets/Plugins/windows/x86/SDL2.dll.meta +++ b/Assets/Plugins/windows/x86/SDL2.dll.meta @@ -17,14 +17,18 @@ PluginImporter: enabled: 0 settings: Exclude Editor: 0 + Exclude GameCoreScarlett: 1 + Exclude GameCoreXboxOne: 1 Exclude Linux64: 0 Exclude OSXUniversal: 0 + Exclude PS4: 1 + Exclude PS5: 1 Exclude Win: 0 Exclude Win64: 1 - first: Any: second: - enabled: 1 + enabled: 0 settings: {} - first: Editor: Editor diff --git a/Assets/Plugins/windows/x86/fmod.dll.meta b/Assets/Plugins/windows/x86/fmod.dll.meta index 4de60b1..040950b 100644 --- a/Assets/Plugins/windows/x86/fmod.dll.meta +++ b/Assets/Plugins/windows/x86/fmod.dll.meta @@ -17,14 +17,18 @@ PluginImporter: enabled: 0 settings: Exclude Editor: 0 + Exclude GameCoreScarlett: 1 + Exclude GameCoreXboxOne: 1 Exclude Linux64: 0 Exclude OSXUniversal: 0 + Exclude PS4: 1 + Exclude PS5: 1 Exclude Win: 0 Exclude Win64: 1 - first: Any: second: - enabled: 1 + enabled: 0 settings: {} - first: Editor: Editor diff --git a/Assets/Plugins/windows/x86/fmodL.dll.meta b/Assets/Plugins/windows/x86/fmodL.dll.meta index a709fb6..68782b8 100644 --- a/Assets/Plugins/windows/x86/fmodL.dll.meta +++ b/Assets/Plugins/windows/x86/fmodL.dll.meta @@ -17,14 +17,18 @@ PluginImporter: enabled: 0 settings: Exclude Editor: 0 + Exclude GameCoreScarlett: 1 + Exclude GameCoreXboxOne: 1 Exclude Linux64: 0 Exclude OSXUniversal: 0 + Exclude PS4: 1 + Exclude PS5: 1 Exclude Win: 0 Exclude Win64: 1 - first: Any: second: - enabled: 1 + enabled: 0 settings: {} - first: Editor: Editor diff --git a/Assets/Plugins/windows/x86_64/SDL2.dll.meta b/Assets/Plugins/windows/x86_64/SDL2.dll.meta index 25e060b..af4aaed 100644 --- a/Assets/Plugins/windows/x86_64/SDL2.dll.meta +++ b/Assets/Plugins/windows/x86_64/SDL2.dll.meta @@ -17,14 +17,18 @@ PluginImporter: enabled: 0 settings: Exclude Editor: 0 + Exclude GameCoreScarlett: 1 + Exclude GameCoreXboxOne: 1 Exclude Linux64: 0 Exclude OSXUniversal: 0 + Exclude PS4: 1 + Exclude PS5: 1 Exclude Win: 1 Exclude Win64: 0 - first: Any: second: - enabled: 1 + enabled: 0 settings: {} - first: Editor: Editor diff --git a/Assets/Plugins/windows/x86_64/fmod.dll.meta b/Assets/Plugins/windows/x86_64/fmod.dll.meta index 4d0c8b1..731d7a2 100644 --- a/Assets/Plugins/windows/x86_64/fmod.dll.meta +++ b/Assets/Plugins/windows/x86_64/fmod.dll.meta @@ -17,14 +17,18 @@ PluginImporter: enabled: 0 settings: Exclude Editor: 0 + Exclude GameCoreScarlett: 1 + Exclude GameCoreXboxOne: 1 Exclude Linux64: 0 Exclude OSXUniversal: 0 + Exclude PS4: 1 + Exclude PS5: 1 Exclude Win: 1 Exclude Win64: 0 - first: Any: second: - enabled: 1 + enabled: 0 settings: {} - first: Editor: Editor diff --git a/Assets/Plugins/windows/x86_64/fmodL.dll.meta b/Assets/Plugins/windows/x86_64/fmodL.dll.meta index d68721f..f0482b2 100644 --- a/Assets/Plugins/windows/x86_64/fmodL.dll.meta +++ b/Assets/Plugins/windows/x86_64/fmodL.dll.meta @@ -17,14 +17,18 @@ PluginImporter: enabled: 0 settings: Exclude Editor: 0 + Exclude GameCoreScarlett: 1 + Exclude GameCoreXboxOne: 1 Exclude Linux64: 0 Exclude OSXUniversal: 0 + Exclude PS4: 1 + Exclude PS5: 1 Exclude Win: 1 Exclude Win64: 0 - first: Any: second: - enabled: 1 + enabled: 0 settings: {} - first: Editor: Editor diff --git a/Assets/Scenes/ConsoleTest.unity b/Assets/Scenes/ConsoleTest.unity new file mode 100644 index 0000000..6dc1c61 --- /dev/null +++ b/Assets/Scenes/ConsoleTest.unity @@ -0,0 +1,501 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 0 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 705507994} + m_IndirectSpecularColor: {r: 0.18028438, g: 0.22571537, b: 0.30692333, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 12 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 500 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 500 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 2 + m_PVRDenoiserTypeDirect: 0 + m_PVRDenoiserTypeIndirect: 0 + m_PVRDenoiserTypeAO: 0 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 0 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 0} + m_LightingSettings: {fileID: 4890085278179872738, guid: f0ed978cba596434485fe01a320af46a, + type: 2} +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &157597863 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 157597865} + - component: {fileID: 157597864} + m_Layer: 0 + m_Name: UniQuake Test + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &157597864 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 157597863} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 88251366d87c86e4482acc6b369e93f7, type: 3} + m_Name: + m_EditorClassIdentifier: + mod: + args: + mainCamera: {fileID: 963194227} + visualStyles: + - {fileID: 11400000, guid: d187fe54fb9a3e047bf4cec083877e72, type: 2} +--- !u!4 &157597865 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 157597863} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &567286279 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 567286283} + - component: {fileID: 567286282} + - component: {fileID: 567286281} + - component: {fileID: 567286280} + m_Layer: 0 + m_Name: View Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &567286280 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 567286279} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 1 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 +--- !u!81 &567286281 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 567286279} + m_Enabled: 1 +--- !u!20 &567286282 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 567286279} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 4 + far clip plane: 16384 + field of view: 70 + orthographic: 0 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 128 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 0 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &567286283 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 567286279} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 963194228} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &705507993 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 705507995} + - component: {fileID: 705507994} + m_Layer: 0 + m_Name: Directional Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!108 &705507994 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 705507993} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 1 + m_Shape: 0 + m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} + m_Intensity: 1 + m_Range: 10 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 2 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 1 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!4 &705507995 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 705507993} + m_LocalRotation: {x: 0.39713123, y: -0.30997548, z: 0.14454393, w: 0.8516508} + m_LocalPosition: {x: 0, y: 3, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 50, y: -40, z: 0} +--- !u!1 &963194225 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 963194228} + - component: {fileID: 963194227} + - component: {fileID: 963194226} + - component: {fileID: 963194229} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &963194226 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 963194225} + m_Enabled: 1 +--- !u!20 &963194227 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 963194225} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 4 + far clip plane: 16384 + field of view: 70 + orthographic: 0 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 64 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &963194228 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 963194225} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 250, z: -2500} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 567286283} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &963194229 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 963194225} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: + - {fileID: 567286282} + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 diff --git a/Assets/Scenes/ConsoleTest.unity.meta b/Assets/Scenes/ConsoleTest.unity.meta new file mode 100644 index 0000000..a263d86 --- /dev/null +++ b/Assets/Scenes/ConsoleTest.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b4cabf4bccc7dc846a91dd2dfac4ecee +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/ConsoleTest.cs b/Assets/Scripts/ConsoleTest.cs new file mode 100644 index 0000000..5ec35ab --- /dev/null +++ b/Assets/Scripts/ConsoleTest.cs @@ -0,0 +1,40 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class ConsoleTest : MonoBehaviour +{ + [SerializeField] + private string mod, args; + + [SerializeField] + private Camera mainCamera; + + [SerializeField] + private List visualStyles = new List(); + + private UniQuake uq; + + private void Start() + { + Debug.Log($"Running in {IntPtr.Size * 8}-bit mode"); + + uq = gameObject.AddComponent(); + uq.BaseGame = MissionPack.Quake; + uq.ModDirectory = mod; + uq.AdditionalArguments = ParseArgs(); + uq.Camera = mainCamera; + uq.GameLayer = Layers.Game1; + uq.ViewModelLayer = Layers.ViewModel1; + uq.SetVisualStyle(visualStyles[0]); + } + + private string[] ParseArgs() + { + if (args == null) + return new string[0]; + + return args.Split(new[] {' ', '\t', '\r', '\n'}, StringSplitOptions.RemoveEmptyEntries); + } +} diff --git a/Assets/Scripts/ConsoleTest.cs.meta b/Assets/Scripts/ConsoleTest.cs.meta new file mode 100644 index 0000000..32705f6 --- /dev/null +++ b/Assets/Scripts/ConsoleTest.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 88251366d87c86e4482acc6b369e93f7 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/SystemLibrary.cs b/Assets/Scripts/SystemLibrary.cs index 015fb13..6064e54 100644 --- a/Assets/Scripts/SystemLibrary.cs +++ b/Assets/Scripts/SystemLibrary.cs @@ -26,5 +26,23 @@ public static class SystemLibrary [DllImport("kernel32")] public static extern IntPtr GetProcAddress(IntPtr hModule, string procedureName); +#else + public static IntPtr LoadLibrary(string filename) + { + // sceKernelLoadStartModule + return IntPtr.Zero; + } + + public static bool FreeLibrary(IntPtr hModule) + { + // sceKernelStopUnloadModule + return false; + } + + public static IntPtr GetProcAddress(IntPtr hModule, string procedureName) + { + // sceKernelDlsym + return IntPtr.Zero; + } #endif } diff --git a/Assets/Scripts/UniQuake.Interop.cs b/Assets/Scripts/UniQuake.Interop.cs index a504867..3d83b68 100644 --- a/Assets/Scripts/UniQuake.Interop.cs +++ b/Assets/Scripts/UniQuake.Interop.cs @@ -13,6 +13,8 @@ public partial class UniQuake #else private const string DllPath = "Plugins/x86/uniquake.dll"; #endif +#elif UNITY_PS4 || UNITY_PS5 + private const string DllPath = "Plugins/uniquake.prx"; #endif private IntPtr libraryHandle; diff --git a/Assets/logo.png b/Assets/logo.png new file mode 100644 index 0000000..426b8e8 Binary files /dev/null and b/Assets/logo.png differ diff --git a/Assets/logo.png.meta b/Assets/logo.png.meta new file mode 100644 index 0000000..1f8ffdd --- /dev/null +++ b/Assets/logo.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 4ecca43f2cca2bf4c9990a1ac751a25d +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/manifest.json b/Packages/manifest.json index 6826a3c..efc421f 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -5,7 +5,8 @@ "com.unity.ide.visualstudio": "2.0.9", "com.unity.ide.vscode": "1.2.3", "com.unity.inputsystem": "1.0.2", - "com.unity.render-pipelines.universal": "10.5.0", + "com.unity.render-pipelines.ps4": "file:ps4/com.unity.render-pipelines.ps4-1.4.0.tgz", + "com.unity.render-pipelines.universal": "10.5.1", "com.unity.test-framework": "1.1.27", "com.unity.textmeshpro": "3.0.6", "com.unity.timeline": "1.4.8", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 313d11d..a90fe01 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -63,7 +63,7 @@ "url": "https://packages.unity.com" }, "com.unity.render-pipelines.core": { - "version": "10.5.0", + "version": "10.5.1", "depth": 1, "source": "registry", "dependencies": { @@ -71,14 +71,20 @@ }, "url": "https://packages.unity.com" }, + "com.unity.render-pipelines.ps4": { + "version": "file:ps4/com.unity.render-pipelines.ps4-1.4.0.tgz", + "depth": 0, + "source": "local-tarball", + "dependencies": {} + }, "com.unity.render-pipelines.universal": { - "version": "10.5.0", + "version": "10.5.1", "depth": 0, "source": "registry", "dependencies": { "com.unity.mathematics": "1.1.0", - "com.unity.render-pipelines.core": "10.5.0", - "com.unity.shadergraph": "10.5.0" + "com.unity.render-pipelines.core": "10.5.1", + "com.unity.shadergraph": "10.5.1" }, "url": "https://packages.unity.com" }, @@ -90,11 +96,11 @@ "url": "https://packages.unity.com" }, "com.unity.shadergraph": { - "version": "10.5.0", + "version": "10.5.1", "depth": 1, "source": "registry", "dependencies": { - "com.unity.render-pipelines.core": "10.5.0", + "com.unity.render-pipelines.core": "10.5.1", "com.unity.searcher": "4.3.2" }, "url": "https://packages.unity.com" diff --git a/Packages/ps4/com.unity.render-pipelines.ps4-1.4.0.tgz b/Packages/ps4/com.unity.render-pipelines.ps4-1.4.0.tgz new file mode 100644 index 0000000..1cca254 Binary files /dev/null and b/Packages/ps4/com.unity.render-pipelines.ps4-1.4.0.tgz differ diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index e45e94b..4fd2000 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -17,7 +17,7 @@ PlayerSettings: defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1} - m_ShowUnitySplashScreen: 1 + m_ShowUnitySplashScreen: 0 m_ShowUnitySplashLogo: 1 m_SplashScreenOverlayOpacity: 1 m_SplashScreenAnimation: 1 @@ -132,6 +132,11 @@ PlayerSettings: - {fileID: 0} - {fileID: 0} - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1 @@ -260,7 +265,14 @@ PlayerSettings: AndroidMinifyDebug: 0 AndroidValidateAppBundleSize: 1 AndroidAppBundleSizeToValidate: 150 - m_BuildTargetIcons: [] + m_BuildTargetIcons: + - m_BuildTarget: + m_Icons: + - serializedVersion: 2 + m_Icon: {fileID: 2800000, guid: 4ecca43f2cca2bf4c9990a1ac751a25d, type: 3} + m_Width: 128 + m_Height: 128 + m_Kind: 0 m_BuildTargetPlatformIcons: [] m_BuildTargetBatching: - m_BuildTarget: Standalone @@ -505,7 +517,7 @@ PlayerSettings: ps4AppType: 0 ps4ParamSfxPath: ps4VideoOutPixelFormat: 0 - ps4VideoOutInitialWidth: 1920 + ps4VideoOutInitialWidth: 2560 ps4VideoOutBaseModeInitialWidth: 1920 ps4VideoOutReprojectionRate: 60 ps4PronunciationXMLPath: @@ -544,7 +556,7 @@ PlayerSettings: resetTempFolder: 1 restrictedAudioUsageRights: 0 ps4UseResolutionFallback: 0 - ps4ReprojectionSupport: 0 + ps4ReprojectionSupport: 1 ps4UseAudio3dBackend: 0 ps4UseLowGarlicFragmentationMode: 1 ps4SocialScreenEnabled: 0