diff --git a/BUILDING.md b/BUILDING.md index 3999851..158c819 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -1,72 +1,109 @@ -# Linux build +# Linux build and launch -The project targets **Unity 2018.1.6f1**. Keep this version for now: the -simulation uses the bundled UNet networking API and the legacy .NET runtime. -No engine migration has been made. +The simulation builds and runs on Debian 13 x86_64 with its original +**Unity 2018.1.6f1** editor. UNet, the legacy .NET runtime, the scene, and the +traffic algorithms are retained. The source recovery is described in +[Recovery/README.md](Recovery/README.md). -## Toolchain +## Run over SSH -The following tools were installed and launched on this Debian 13 x86_64 host: +On the server: -- Unity Editor: `/opt/unity/2018.1.6f1/Editor/Unity`, including Linux player support. -- Blender 2.79b: `/opt/blender-2.79b-linux-glibc219-x86_64/blender`, also available - as `blender` on PATH. The project's Blender models use the 2.79 file format. -- GTK 2, libsoup 2.4, GLU, and GConf 2 compatibility libraries. GConf was installed - from Debian's `libgconf-2-4_3.2.6-8_amd64.deb` and - `gconf2-common_3.2.6-8_all.deb`; Debian 13 no longer ships those packages. -- Xvfb and xauth for running the old editor without a desktop display. +```sh +./run-linux.sh --vnc +``` -Downloads: [Unity 2018.1.6f1](https://unity.com/releases/editor/whats-new/2018.1.6f1), -[Blender 2.79b](https://download.blender.org/release/Blender2.79/), -[Debian GConf packages](https://deb.debian.org/debian/pool/main/g/gconf/). +On your local computer, open a second SSH connection with a tunnel: -## Build command +```sh +ssh -L 5901:127.0.0.1:5901 your-server +``` -Once Unity is activated and the damaged source assets below are restored: +Connect a VNC viewer to `127.0.0.1:5901`. The VNC service listens only on +localhost; access it through the SSH tunnel. The launcher starts a virtual +1280×800 display, both Python services, the simulation server, and its graphical +client. It requires `xvfb`, `xauth`, and `x11vnc`. Close the client or press +Ctrl-C in the launcher terminal to stop all its processes. + +Other modes: + +```sh +./run-linux.sh --server # Python services and headless simulation server +./run-linux.sh --demo # Server plus graphical client on the current desktop +``` + +Python 3 and Bash are required. The launcher uses local HTTP ports 8080/8081 and +UNet port 7777; it refuses to start if an existing service occupies those ports. +Traffic lights start in the original `off` state (uncontrolled intersections). +The simulation does not automatically cycle them; the original HTTP API can +control them. Logs are written under `Builds/linux/`. + +A separate graphical Linux client can connect to an already running server: + +```sh +Builds/linux/Simulation.x86_64 --connect SERVER_ADDRESS \ + -screen-width 1280 -screen-height 800 -screen-fullscreen 0 -force-glcore +``` + +Without `--connect`, the player opens the original connection menu. `--server` +starts the server automatically; `--traffic-url` and `--event-url` can select +other HTTP services. Keep server and client in separate processes, as the +original simulation uses delayed client interpolation. + +## Build ```sh ./build-linux.sh ``` -For an editor installed elsewhere: +Output: `Builds/linux/Simulation.x86_64` and `Builds/linux/Simulation_Data/`. +Distribute both together. The build log is `Builds/linux/build.log`. +The script uses Xvfb when no display is available and places temporary import +files in `Builds/linux/tmp` by default to avoid filling a small `/tmp` tmpfs. +Override the editor or temporary directory when needed: ```sh -UNITY_EDITOR=/path/to/2018.1.6f1/Editor/Unity ./build-linux.sh +UNITY_EDITOR=/path/to/2018.1.6f1/Editor/Unity TMPDIR=/large/tmp ./build-linux.sh ``` -The intended output is `Builds/linux/Simulation.x86_64`, with its accompanying -data directory. The editor log is `Builds/linux/build.log`. The build uses -`Assets/Scenes/Main.unity`; the original settings incorrectly named the absent -`SampleScene.unity` despite already containing Main's GUID. +The build includes `Assets/Scenes/Main.unity`. The original build settings +incorrectly named the nonexistent `SampleScene.unity`. -The existing standalone startup code selects the client menu. This build command -preserves that behavior. +## Installed toolchain -## Current blockers and verification +- `/opt/unity/2018.1.6f1/Editor/Unity`, including Linux player support. +- Blender 2.79b at `/opt/blender-2.79b-linux-glibc219-x86_64/blender`, also + available as `blender` on PATH for importing the original `.blend` models. +- GTK 2, libsoup 2.4, GLU, and GConf 2 compatibility libraries. GConf came from + Debian's `libgconf-2-4_3.2.6-8_amd64.deb` and + `gconf2-common_3.2.6-8_all.deb`, as Debian 13 no longer includes it. +- Xvfb, xauth, and x11vnc for SSH access. Mesa llvmpipe successfully rendered the + client without a physical GPU. This software rendering can be slower than a + desktop GPU. The machine has no audio device, so Unity reports audio fallback + messages and runs without sound. -**No Linux executable has been built.** The editor starts, but the attempted -batch build exits with status 1 at license activation: +Downloads: [Unity 2018.1.6f1](https://unity.com/releases/editor/whats-new/2018.1.6f1), +[Blender 2.79b](https://download.blender.org/release/Blender2.79/), +[Debian GConf packages](https://deb.debian.org/debian/pool/main/g/gconf/). +Recovery-only tools (ILSpy, UnityPy, OpenEXR, and .NET SDK) are not needed to build +or run the restored source. -```text -Failed to activate/update license. Missing or bad username and password. -``` +## Activation on this machine -Unity Personal is free for eligible users, but still requires activation. -For a desktop session, sign in to Unity Hub, then use Settings > Licenses > -Add license > Get a free personal license if it is not activated automatically. -See [Unity's Hub license instructions](https://docs.unity.com/en-us/hub/manage-license). +Unity Personal was activated using the signed-in account. The modern +entitlement alone was insufficient for this editor; Unity's official Licensing +Client successfully issued the compatible legacy license with `--activate-ulf`. +The editor now reads `~/.local/share/unity3d/Unity/Unity_lic.ulf`. +No additional sign-in is needed for builds on this machine while that license +remains valid. Licenses and credentials are outside the repository and build. -For SSH access, Unity CLI 1.0.0-beta.9 is installed at -`/root/.local/bin/unity`, along with GNOME Keyring and `libsecret-tools`. -Its login command prints a URL that can be opened in a browser on another -device. Run `./unity-ssh.sh` as the same Linux user that will run the build. -It starts a private D-Bus session and a dedicated Unity keyring under -`~/.local/share/unity-ssh/keyrings`, leaving the desktop login keyring intact. -Choose a password on first use and use the same password when reopening the -helper. This password protects saved credentials locally; enter your Unity -account password only on Unity's sign-in page. The helper verifies that the -keyring can store and retrieve a test credential before opening a shell. -In that shell, run: +`./unity-ssh.sh` opens a private D-Bus session with a dedicated keyring in +`~/.local/share/unity-ssh/keyrings`. It preserves the desktop keyring. Use the +same local keyring password when reopening it; this is separate from your Unity +account password. The helper checks that credentials can be stored before +opening its shell. Run `./unity-ssh.sh --check` to check the keyring alone. + +For an account sign-in or modern Personal activation, run inside that shell: ```sh unity auth login @@ -74,37 +111,27 @@ unity license activate --personal --accept-eula unity license status ``` -The activation command accepts the Unity Personal license terms. Type `exit` -when finished to close the shell and its keyring session. +The login command prints a browser URL usable on another computer. The activation +command accepts the Personal terms. Those commands alone may still require the +legacy ULF compatibility step for Unity 2018. See the official +[Unity CLI documentation](https://docs.unity.com/en-us/unity-cli/use-unity-cli). -The command options and browser-assisted login startup have been checked here. -Keyring tests with temporary credentials cover creation, reopening, incorrect -password rejection, inherited desktop sessions, and concurrent-session -rejection. The CLI's own credential-store check resolves the Secret Service -backend inside the helper. Run `./unity-ssh.sh --check` to check the keyring -without starting a Unity sign-in. -Sign-in, activation, and compatibility with the old editor still need to be -verified. See [Unity CLI instructions](https://docs.unity.com/en-us/unity-cli/use-unity-cli) -and [release notes](https://docs.unity.com/en-us/unity-cli/release-notes). +## Verification -There is also existing file corruption, independent of activation. An audit -found **33 asset files whose contents are Unity metadata instead of their -expected source/model/image/material data**. Five of these are C# source files: +Verified on this host: -- `UnityProject/Assets/Scripts/CarLL.cs` -- `UnityProject/Assets/Scripts/misc/trafficLightColor.cs` -- `UnityProject/Assets/Standard Assets/CrossPlatformInput/Scripts/VirtualInput.cs` -- `UnityProject/Assets/!ext/PostProcessing/Editor/PostProcessingInspector.cs` -- `UnityProject/Assets/!ext/PostProcessing/Editor/Monitors/WaveformMonitor.cs` +- Linux player and editor C# compilation using the genuine Unity 2018 libraries. +- A complete Linux standalone build, followed by server and graphical client + startup through `run-linux.sh --vnc`. +- Client connection, car spawning, completed trips, and traffic counts sent to + the original Python backend. +- HTTP traffic-light changes, queuing at red lights, and resumed traffic. +- A local event displayed by the client's notification UI. +- Rendered town, pedestrians, cars, post-processing, and recovered lighting. +- No missing-script warnings or managed runtime exceptions during the successful + server/client test. Old vendor API deprecation and model import warnings remain. +- Launcher shutdown cleans up the services, players, VNC server, and virtual + display it started. -A separate compilation attempt with Unity's bundled Mono compiler and genuine -2018.1 assemblies fails with `CS8025: Parsing error` in `VirtualInput.cs`. -The full asset list is in the local `Builds/linux/source-audit.txt`; compiler -output is in `Builds/linux/script-check/compile.log`. - -Some metadata is damaged too: there are duplicated GUIDs, source code stored in -`.cs.meta` files, and empty directories with `.meta` names. The file at -`UnityProject/Scripts/CarLL.cs` is not a usable backup: it contains a -`TrafficController` class. A clean original checkout/archive is needed to -restore these files reliably. Existing assets and the old Library cache were -left intact. +Local screenshots and test captures are under `Builds/linux/`; generated output +and the preserved old Library cache are ignored by Git. diff --git a/Recovery/README.md b/Recovery/README.md new file mode 100644 index 0000000..5def562 --- /dev/null +++ b/Recovery/README.md @@ -0,0 +1,74 @@ +# Source recovery + +The checkout contained asset contents replaced by `.meta` data, metadata +replaced by models/images/source code, duplicated GUIDs, and directories named +like missing files. The old Library cache was also damaged. Recoveries preserve +existing asset references wherever the original GUID could be recovered. + +## Provenance + +- `UnityProject/Assets/junctionAssets.zip`: restored the corrupted buildings and + fence models, seven materials, four prefabs, and several metadata files from + the bundled `junctionAssets - Copy` archive. Intact source files were retained. +- `UnityProject/Scripts/other.zip`: restored metadata for `canvasChooser`, + `serverRunningMenu`, and `destroyCar`. +- The bundled Windows server's `Simulation_Data/Managed/Assembly-CSharp.dll`: + decompiled `CarLL` and `trafficLightColor` with ILSpy 9.1.0.7988. Removed + generated UNet weaving methods and changed the woven `CallRpcDecodeBits` call + back to the source `RpcDecodeBits`, so Unity can weave the assembly again. + The assembly SHA-256 was + `9b23bd2b83c61ce07b579da9b594ddd535ed543435545b355f2c94d09d53a6e4`. +- [Unity PostProcessing v1](https://github.com/Unity-Technologies/PostProcessing/tree/933df236f509ed64ae5763ed57af33f2342cd1c2), + commit `933df236f509ed64ae5763ed57af33f2342cd1c2`: restored damaged editor + scripts, missing model editors, shaders, blue-noise textures, and metadata. +- Unity's original 2018.1.6 Standard Assets distribution, downloaded from the + [official release installer](https://download.unity3d.com/download_unity/a68afd074ea7/MacStandardAssetsInstaller/StandardAssets.pkg) + (MD5 `b891fafc108fec1232c5b1409c79bb9c`): restored `VirtualInput.cs`, the + damaged mobile control prefab/sprite, and associated metadata from the + CrossPlatformInput package. +- Original cached Unity import records: recovered lost GUIDs, model sub-asset + IDs/material mappings, and native asset metadata. Texture metadata uses the + corresponding intact neighboring import settings and the recovered GUID. +- Original cached textures: recovered `Lightmap-0_comp_dir.png` including its + directionality alpha channel, and `Lightmap-1_comp_light.exr` with HDR values. + UnityPy decoded the directional BC7 texture; [bcdec](https://github.com/iOrange/bcdec) + decoded BC6H into floating point for OpenEXR output. These are recoveries from + the imported, compressed cache, not byte-identical original source images. + The HDR decoding/orientation was checked against an intact source lightmap. + +The old `UnityProject/Library` is preserved locally at +`Builds/recovery/Library-original`. Recovery intermediates and audit files are +under `Builds/recovery/`. Neither directory is required by the restored build. + +## Small compatibility and startup changes + +- Renamed `Assets/!ext` to `Assets/ThirdParty`, keeping its GUIDs. In the original + folder, the legacy Linux player build omitted the vendor C# classes although + editor compilation succeeded. The renamed folder produces the post-processing + and particle-effect classes in the player, eliminating missing-script warnings. +- Initialized traffic control and notification spawning in `OnStartServer`, so + starting networking after the scene loads works correctly. +- Initialized RPC receiver state before the first update can arrive and corrected + the client disconnect callback's base method. +- Added `--server`, `--connect`, `--traffic-url`, and `--event-url` startup options, + disabled the old resolution popup, and removed repetitive server log output. +- Added a launcher for the original Python backends plus separate UNet server + and client processes. The launcher binds the HTTP services to localhost; their + standalone default remains unchanged. +- Unity regenerated damaged PresetManager and UnityConnectSettings files, which + had contained unrelated PlayerSettings and TimeManager data respectively. + +## Unrestored optional files + +`unrestored/` preserves corrupt files outside Unity's import tree, under their +original paths. They are not required by Main: + +- One unused motion-capture FBX animation. +- An unused `tweet.prefab`; the working scene uses `clientGame.prefab` instead. +- A reference photograph and three FBX exporter documentation/archive files. +- `FbxExportSettings.asset`, which incorrectly contained EditorSettings YAML + rather than the exporter's JSON settings and caused an import exception. + +These files still need an intact source if their optional functionality is +wanted. The Windows-only FBX exporter tools were not ported. Existing backup +`.blend1` files are retained and ignored by Git. diff --git a/UnityProject/Assets/!ext/FbxExporters/Editor/FbxSdk/README.txt b/Recovery/unrestored/UnityProject/Assets/!ext/FbxExporters/Editor/FbxSdk/README.txt similarity index 100% rename from UnityProject/Assets/!ext/FbxExporters/Editor/FbxSdk/README.txt rename to Recovery/unrestored/UnityProject/Assets/!ext/FbxExporters/Editor/FbxSdk/README.txt diff --git a/UnityProject/Assets/!ext/FbxExporters/Editor/FbxSdk/README.txt.meta b/Recovery/unrestored/UnityProject/Assets/!ext/FbxExporters/Editor/FbxSdk/README.txt.meta similarity index 100% rename from UnityProject/Assets/!ext/FbxExporters/Editor/FbxSdk/README.txt.meta rename to Recovery/unrestored/UnityProject/Assets/!ext/FbxExporters/Editor/FbxSdk/README.txt.meta diff --git a/UnityProject/Assets/!ext/FbxExporters/README.txt b/Recovery/unrestored/UnityProject/Assets/!ext/FbxExporters/README.txt similarity index 100% rename from UnityProject/Assets/!ext/FbxExporters/README.txt rename to Recovery/unrestored/UnityProject/Assets/!ext/FbxExporters/README.txt diff --git a/UnityProject/Assets/!ext/FbxExporters/README.txt.meta b/Recovery/unrestored/UnityProject/Assets/!ext/FbxExporters/README.txt.meta similarity index 100% rename from UnityProject/Assets/!ext/FbxExporters/README.txt.meta rename to Recovery/unrestored/UnityProject/Assets/!ext/FbxExporters/README.txt.meta diff --git a/UnityProject/Assets/!ext/FbxExporters/UnityFbxForMaya.zip b/Recovery/unrestored/UnityProject/Assets/!ext/FbxExporters/UnityFbxForMaya.zip similarity index 100% rename from UnityProject/Assets/!ext/FbxExporters/UnityFbxForMaya.zip rename to Recovery/unrestored/UnityProject/Assets/!ext/FbxExporters/UnityFbxForMaya.zip diff --git a/UnityProject/Assets/!ext/FbxExporters/UnityFbxForMaya.zip.meta b/Recovery/unrestored/UnityProject/Assets/!ext/FbxExporters/UnityFbxForMaya.zip.meta similarity index 100% rename from UnityProject/Assets/!ext/FbxExporters/UnityFbxForMaya.zip.meta rename to Recovery/unrestored/UnityProject/Assets/!ext/FbxExporters/UnityFbxForMaya.zip.meta diff --git a/UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-GetHit-L1.FBX b/Recovery/unrestored/UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-GetHit-L1.FBX similarity index 100% rename from UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-GetHit-L1.FBX rename to Recovery/unrestored/UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-GetHit-L1.FBX diff --git a/UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-GetHit-L1.FBX.meta b/Recovery/unrestored/UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-GetHit-L1.FBX.meta similarity index 100% rename from UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-GetHit-L1.FBX.meta rename to Recovery/unrestored/UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-GetHit-L1.FBX.meta diff --git a/UnityProject/Assets/junctionAssets/blends/referencia/corner store/image.jpg b/Recovery/unrestored/UnityProject/Assets/junctionAssets/blends/referencia/corner store/image.jpg similarity index 100% rename from UnityProject/Assets/junctionAssets/blends/referencia/corner store/image.jpg rename to Recovery/unrestored/UnityProject/Assets/junctionAssets/blends/referencia/corner store/image.jpg diff --git a/UnityProject/Assets/junctionAssets/blends/referencia/corner store/image.jpg.meta b/Recovery/unrestored/UnityProject/Assets/junctionAssets/blends/referencia/corner store/image.jpg.meta similarity index 94% rename from UnityProject/Assets/junctionAssets/blends/referencia/corner store/image.jpg.meta rename to Recovery/unrestored/UnityProject/Assets/junctionAssets/blends/referencia/corner store/image.jpg.meta index 7f3170b..7d9d43d 100644 --- a/UnityProject/Assets/junctionAssets/blends/referencia/corner store/image.jpg.meta +++ b/Recovery/unrestored/UnityProject/Assets/junctionAssets/blends/referencia/corner store/image.jpg.meta @@ -1,84 +1,85 @@ -fileFormatVersion: 2 -guid: ebfb0e86bee8ff248ba3f2f493a0b917 -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 5 - 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 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapU: -1 - wrapV: -1 - wrapW: -1 - 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 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: ebfb0e86bee8ff248ba3f2f493a0b917 +TextureImporter: + fileIDToRecycleName: + 2186277476908879412: ImportLogs + externalObjects: {} + serializedVersion: 5 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: -1 + wrapV: -1 + wrapW: -1 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/junctionAssets/prefabs/tweet.prefab b/Recovery/unrestored/UnityProject/Assets/junctionAssets/prefabs/tweet.prefab similarity index 100% rename from UnityProject/Assets/junctionAssets/prefabs/tweet.prefab rename to Recovery/unrestored/UnityProject/Assets/junctionAssets/prefabs/tweet.prefab diff --git a/UnityProject/Assets/junctionAssets/prefabs/tweet.prefab.meta b/Recovery/unrestored/UnityProject/Assets/junctionAssets/prefabs/tweet.prefab.meta similarity index 100% rename from UnityProject/Assets/junctionAssets/prefabs/tweet.prefab.meta rename to Recovery/unrestored/UnityProject/Assets/junctionAssets/prefabs/tweet.prefab.meta diff --git a/UnityProject/ProjectSettings/FbxExportSettings.asset b/Recovery/unrestored/UnityProject/ProjectSettings/FbxExportSettings.asset similarity index 100% rename from UnityProject/ProjectSettings/FbxExportSettings.asset rename to Recovery/unrestored/UnityProject/ProjectSettings/FbxExportSettings.asset diff --git a/UnityProject/Assets/!ext.meta b/UnityProject/Assets/!ext.meta deleted file mode 100644 index e69de29..0000000 diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor Resources/Monitors/WaveformRender.shader.meta b/UnityProject/Assets/!ext/PostProcessing/Editor Resources/Monitors/WaveformRender.shader.meta deleted file mode 100644 index 7b2ca92..0000000 --- a/UnityProject/Assets/!ext/PostProcessing/Editor Resources/Monitors/WaveformRender.shader.meta +++ /dev/null @@ -1,65 +0,0 @@ -Shader "Hidden/Post FX/Monitors/Waveform Render" -{ - SubShader - { - ZTest Always Cull Off ZWrite Off - Fog { Mode off } - - CGINCLUDE - - #pragma fragmentoption ARB_precision_hint_fastest - #pragma target 5.0 - #include "UnityCG.cginc" - - StructuredBuffer _Waveform; - float2 _Size; - float4 _Channels; - float _Exposure; - - float3 Tonemap(float3 x, float exposure) - { - const float a = 6.2; - const float b = 0.5; - const float c = 1.7; - const float d = 0.06; - x *= exposure; - x = max((0.0).xxx, x - (0.004).xxx); - x = (x * (a * x + b)) / (x * (a * x + c) + d); - return x * x; - } - - float4 FragWaveform(v2f_img i) : SV_Target - { - const float3 red = float3(1.4, 0.03, 0.02); - const float3 green = float3(0.02, 1.1, 0.05); - const float3 blue = float3(0.0, 0.25, 1.5); - float3 color = float3(0.0, 0.0, 0.0); - - uint2 uvI = i.pos.xy; - float4 w = _Waveform[uvI.y + uvI.x * _Size.y]; // Waveform data is stored in columns instead of rows - - color += red * w.r * _Channels.r; - color += green * w.g * _Channels.g; - color += blue * w.b * _Channels.b; - color += w.aaa * _Channels.a * 1.5; - color = Tonemap(color, _Exposure); - color += (0.1).xxx; - - return float4(saturate(color), 1.0); - } - - ENDCG - - // (0) - Pass - { - CGPROGRAM - - #pragma vertex vert_img - #pragma fragment FragWaveform - - ENDCG - } - } - FallBack off -} diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor Resources/UI/Trackball.shader.meta b/UnityProject/Assets/!ext/PostProcessing/Editor Resources/UI/Trackball.shader.meta deleted file mode 100644 index 64bc3ba..0000000 --- a/UnityProject/Assets/!ext/PostProcessing/Editor Resources/UI/Trackball.shader.meta +++ /dev/null @@ -1,118 +0,0 @@ -Shader "Hidden/Post FX/UI/Trackball" -{ - CGINCLUDE - - #include "UnityCG.cginc" - - #define PI 3.14159265359 - #define PI2 6.28318530718 - - float _Offset; - float _DisabledState; - float2 _Resolution; // x: size, y: size / 2 - - float3 HsvToRgb(float3 c) - { - float4 K = float4(1.0, 2.0 / 3.0, 1.0 / 3.0, 3.0); - float3 p = abs(frac(c.xxx + K.xyz) * 6.0 - K.www); - return c.z * lerp(K.xxx, saturate(p - K.xxx), c.y); - } - - float4 CreateWheel(v2f_img i, float crossColor, float offsetColor) - { - const float kHueOuterRadius = 0.45; - const float kHueInnerRadius = 0.38; - const float kLumOuterRadius = 0.495; - const float kLumInnerRadius = 0.48; - - float4 color = (0.0).xxxx; - float2 uvc = i.uv - (0.5).xx; - float dist = sqrt(dot(uvc, uvc)); - float delta = fwidth(dist); - float angle = atan2(uvc.x, uvc.y); - - // Cross - { - float radius = (0.5 - kHueInnerRadius) * _Resolution.x + 1.0; - float2 pixel = (_Resolution.xx - 1.0) * i.uv + 1.0; - - float vline = step(floor(fmod(pixel.x, _Resolution.y)), 0.0); - vline *= step(radius, pixel.y) * step(pixel.y, _Resolution.x - radius); - - float hline = step(floor(fmod(pixel.y, _Resolution.y)), 0.0); - hline *= step(radius, pixel.x) * step(pixel.x, _Resolution.x - radius); - - color += hline.xxxx * (1.0).xxxx; - color += vline.xxxx * (1.0).xxxx; - color = saturate(color); - color *= half4((crossColor).xxx, 0.05); - } - - // Hue - { - float alphaOut = smoothstep(kHueOuterRadius - delta, kHueOuterRadius + delta, dist); - float alphaIn = smoothstep(kHueInnerRadius - delta, kHueInnerRadius + delta, dist); - - float hue = angle; - hue = 1.0 - ((hue > 0.0) ? hue : PI2 + hue) / PI2; - float4 c = float4(HsvToRgb(float3(hue, 1.0, 1.0)), 1.0); - color += lerp((0.0).xxxx, c, alphaIn - alphaOut); - } - - // Offset - { - float alphaOut = smoothstep(kLumOuterRadius - delta, kLumOuterRadius + delta, dist); - float alphaIn = smoothstep(kLumInnerRadius - delta, kLumInnerRadius + delta / 2, dist); - float4 c = float4((offsetColor).xxx, 1.0); - - float a = PI * _Offset; - if (_Offset >= 0 && angle < a && angle > 0.0) - c = float4((1.0).xxx, 0.5); - else if (angle > a && angle < 0.0) - c = float4((1.0).xxx, 0.5); - - color += lerp((0.0).xxxx, c, alphaIn - alphaOut); - } - - return color * _DisabledState; - } - - float4 FragTrackballDark(v2f_img i) : SV_Target - { - return CreateWheel(i, 1.0, 0.15); - } - - float4 FragTrackballLight(v2f_img i) : SV_Target - { - return CreateWheel(i, 0.0, 0.3); - } - - ENDCG - - SubShader - { - Cull Off ZWrite Off ZTest Always - - // (0) Dark skin - Pass - { - CGPROGRAM - - #pragma vertex vert_img - #pragma fragment FragTrackballDark - - ENDCG - } - - // (1) Light skin - Pass - { - CGPROGRAM - - #pragma vertex vert_img - #pragma fragment FragTrackballLight - - ENDCG - } - } -} diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor/Models/BloomModelEditor.cs.meta b/UnityProject/Assets/!ext/PostProcessing/Editor/Models/BloomModelEditor.cs.meta deleted file mode 100644 index 0d86370..0000000 --- a/UnityProject/Assets/!ext/PostProcessing/Editor/Models/BloomModelEditor.cs.meta +++ /dev/null @@ -1,106 +0,0 @@ -using UnityEngine.PostProcessing; - -namespace UnityEditor.PostProcessing -{ - using Mode = BuiltinDebugViewsModel.Mode; - using Settings = BuiltinDebugViewsModel.Settings; - - [PostProcessingModelEditor(typeof(BuiltinDebugViewsModel), alwaysEnabled: true)] - public class BuiltinDebugViewsEditor : PostProcessingModelEditor - { - struct DepthSettings - { - public SerializedProperty scale; - } - - struct MotionVectorsSettings - { - public SerializedProperty sourceOpacity; - public SerializedProperty motionImageOpacity; - public SerializedProperty motionImageAmplitude; - public SerializedProperty motionVectorsOpacity; - public SerializedProperty motionVectorsResolution; - public SerializedProperty motionVectorsAmplitude; - } - - SerializedProperty m_Mode; - DepthSettings m_Depth; - MotionVectorsSettings m_MotionVectors; - - public override void OnEnable() - { - m_Mode = FindSetting((Settings x) => x.mode); - - m_Depth = new DepthSettings - { - scale = FindSetting((Settings x) => x.depth.scale) - }; - - m_MotionVectors = new MotionVectorsSettings - { - sourceOpacity = FindSetting((Settings x) => x.motionVectors.sourceOpacity), - motionImageOpacity = FindSetting((Settings x) => x.motionVectors.motionImageOpacity), - motionImageAmplitude = FindSetting((Settings x) => x.motionVectors.motionImageAmplitude), - motionVectorsOpacity = FindSetting((Settings x) => x.motionVectors.motionVectorsOpacity), - motionVectorsResolution = FindSetting((Settings x) => x.motionVectors.motionVectorsResolution), - motionVectorsAmplitude = FindSetting((Settings x) => x.motionVectors.motionVectorsAmplitude), - }; - } - - public override void OnInspectorGUI() - { - EditorGUILayout.PropertyField(m_Mode); - - int mode = m_Mode.intValue; - - if (mode == (int)Mode.Depth) - { - EditorGUILayout.PropertyField(m_Depth.scale); - } - else if (mode == (int)Mode.MotionVectors) - { - EditorGUILayout.HelpBox("Switch to play mode to see motion vectors.", MessageType.Info); - - EditorGUILayout.LabelField("Source Image", EditorStyles.boldLabel); - EditorGUI.indentLevel++; - EditorGUILayout.PropertyField(m_MotionVectors.sourceOpacity, EditorGUIHelper.GetContent("Opacity")); - EditorGUI.indentLevel--; - - EditorGUILayout.Space(); - - EditorGUILayout.LabelField("Motion Vectors (overlay)", EditorStyles.boldLabel); - EditorGUI.indentLevel++; - - if (m_MotionVectors.motionImageOpacity.floatValue > 0f) - EditorGUILayout.HelpBox("Please keep opacity to 0 if you're subject to motion sickness.", MessageType.Warning); - - EditorGUILayout.PropertyField(m_MotionVectors.motionImageOpacity, EditorGUIHelper.GetContent("Opacity")); - EditorGUILayout.PropertyField(m_MotionVectors.motionImageAmplitude, EditorGUIHelper.GetContent("Amplitude")); - EditorGUI.indentLevel--; - - EditorGUILayout.Space(); - - EditorGUILayout.LabelField("Motion Vectors (arrows)", EditorStyles.boldLabel); - EditorGUI.indentLevel++; - EditorGUILayout.PropertyField(m_MotionVectors.motionVectorsOpacity, EditorGUIHelper.GetContent("Opacity")); - EditorGUILayout.PropertyField(m_MotionVectors.motionVectorsResolution, EditorGUIHelper.GetContent("Resolution")); - EditorGUILayout.PropertyField(m_MotionVectors.motionVectorsAmplitude, EditorGUIHelper.GetContent("Amplitude")); - EditorGUI.indentLevel--; - } - else - { - CheckActiveEffect(mode == (int)Mode.AmbientOcclusion && !profile.ambientOcclusion.enabled, "Ambient Occlusion"); - CheckActiveEffect(mode == (int)Mode.FocusPlane && !profile.depthOfField.enabled, "Depth Of Field"); - CheckActiveEffect(mode == (int)Mode.EyeAdaptation && !profile.eyeAdaptation.enabled, "Eye Adaptation"); - CheckActiveEffect((mode == (int)Mode.LogLut || mode == (int)Mode.PreGradingLog) && !profile.colorGrading.enabled, "Color Grading"); - CheckActiveEffect(mode == (int)Mode.UserLut && !profile.userLut.enabled, "User Lut"); - } - } - - void CheckActiveEffect(bool expr, string name) - { - if (expr) - EditorGUILayout.HelpBox(string.Format("{0} isn't enabled, the debug view won't work.", name), MessageType.Warning); - } - } -} diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor/Utils/EditorResources.cs.meta b/UnityProject/Assets/!ext/PostProcessing/Editor/Utils/EditorResources.cs.meta deleted file mode 100644 index 309b81a..0000000 --- a/UnityProject/Assets/!ext/PostProcessing/Editor/Utils/EditorResources.cs.meta +++ /dev/null @@ -1,58 +0,0 @@ -using UnityEngine; - -namespace UnityEditor.PostProcessing -{ - using UnityObject = Object; - - static class EditorResources - { - static string m_EditorResourcesPath = string.Empty; - - internal static string editorResourcesPath - { - get - { - if (string.IsNullOrEmpty(m_EditorResourcesPath)) - { - string path; - - if (SearchForEditorResourcesPath(out path)) - m_EditorResourcesPath = path; - else - Debug.LogError("Unable to locate editor resources. Make sure the PostProcessing package has been installed correctly."); - } - - return m_EditorResourcesPath; - } - } - - internal static T Load(string name) - where T : UnityObject - { - return AssetDatabase.LoadAssetAtPath(editorResourcesPath + name); - } - - static bool SearchForEditorResourcesPath(out string path) - { - path = string.Empty; - - string searchStr = "/PostProcessing/Editor Resources/"; - string str = null; - - foreach (var assetPath in AssetDatabase.GetAllAssetPaths()) - { - if (assetPath.Contains(searchStr)) - { - str = assetPath; - break; - } - } - - if (str == null) - return false; - - path = str.Substring(0, str.LastIndexOf(searchStr) + searchStr.Length); - return true; - } - } -} diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_10.png.meta b/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_10.png.meta deleted file mode 100644 index ecadafb..0000000 Binary files a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_10.png.meta and /dev/null differ diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_26.png.meta b/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_26.png.meta deleted file mode 100644 index 930ec4e..0000000 Binary files a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_26.png.meta and /dev/null differ diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_32.png.meta b/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_32.png.meta deleted file mode 100644 index 24d31e9..0000000 Binary files a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_32.png.meta and /dev/null differ diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/DepthOfField.cginc.meta b/UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/DepthOfField.cginc.meta deleted file mode 100644 index 9c3e812..0000000 --- a/UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/DepthOfField.cginc.meta +++ /dev/null @@ -1,243 +0,0 @@ -#ifndef __DEPTH_OF_FIELD__ -#define __DEPTH_OF_FIELD__ - -#if SHADER_TARGET >= 50 - // Use separate texture/sampler objects on Shader Model 5.0 - #define SEPARATE_TEXTURE_SAMPLER - #define DOF_DECL_TEX2D(tex) Texture2D tex; SamplerState sampler##tex - #define DOF_TEX2D(tex, coord) tex.Sample(sampler##tex, coord) -#else - #define DOF_DECL_TEX2D(tex) sampler2D tex - #define DOF_TEX2D(tex, coord) tex2D(tex, coord) -#endif - -#include "Common.cginc" -#include "DiskKernels.cginc" - -DOF_DECL_TEX2D(_CameraDepthTexture); -DOF_DECL_TEX2D(_CameraMotionVectorsTexture); -DOF_DECL_TEX2D(_CoCTex); - -// Camera parameters -float _Distance; -float _LensCoeff; // f^2 / (N * (S1 - f) * film_width * 2) -float _MaxCoC; -float _RcpMaxCoC; -float _RcpAspect; -half3 _TaaParams; // Jitter.x, Jitter.y, Blending - -struct VaryingsDOF -{ - float4 pos : SV_POSITION; - half2 uv : TEXCOORD0; - half2 uvAlt : TEXCOORD1; -}; - -// Common vertex shader with single pass stereo rendering support -VaryingsDOF VertDOF(AttributesDefault v) -{ - half2 uvAlt = v.texcoord; -#if UNITY_UV_STARTS_AT_TOP - if (_MainTex_TexelSize.y < 0.0) uvAlt.y = 1.0 - uvAlt.y; -#endif - - VaryingsDOF o; - o.pos = UnityObjectToClipPos(v.vertex); - -#if defined(UNITY_SINGLE_PASS_STEREO) - o.uv = UnityStereoScreenSpaceUVAdjust(v.texcoord, _MainTex_ST); - o.uvAlt = UnityStereoScreenSpaceUVAdjust(uvAlt, _MainTex_ST); -#else - o.uv = v.texcoord; - o.uvAlt = uvAlt; -#endif - - return o; -} - -// CoC calculation -half4 FragCoC(VaryingsDOF i) : SV_Target -{ - float depth = LinearEyeDepth(DOF_TEX2D(_CameraDepthTexture, i.uv)); - half coc = (depth - _Distance) * _LensCoeff / max(depth, 1e-5); - return saturate(coc * 0.5 * _RcpMaxCoC + 0.5); -} - -// Temporal filter -half4 FragTempFilter(VaryingsDOF i) : SV_Target -{ - float3 uvOffs = _MainTex_TexelSize.xyy * float3(1, 1, 0); - -#if defined(SEPARATE_TEXTURE_SAMPLER) - - half4 cocTL = _CoCTex.GatherRed(sampler_CoCTex, i.uv - uvOffs.xy * 0.5); // top-left - half4 cocBR = _CoCTex.GatherRed(sampler_CoCTex, i.uv + uvOffs.xy * 0.5); // bottom-right - half coc1 = cocTL.x; // top - half coc2 = cocTL.z; // left - half coc3 = cocBR.x; // bottom - half coc4 = cocBR.z; // right - -#else - - half coc1 = DOF_TEX2D(_CoCTex, i.uv - uvOffs.xz).r; // top - half coc2 = DOF_TEX2D(_CoCTex, i.uv - uvOffs.zy).r; // left - half coc3 = DOF_TEX2D(_CoCTex, i.uv + uvOffs.zy).r; // bottom - half coc4 = DOF_TEX2D(_CoCTex, i.uv + uvOffs.xz).r; // right - -#endif - - // Dejittered center sample. - half coc0 = DOF_TEX2D(_CoCTex, i.uv - _TaaParams.xy).r; - - // CoC dilation: determine the closest point in the four neighbors. - float3 closest = float3(0, 0, coc0); - closest = coc1 < closest.z ? float3(-uvOffs.xz, coc1) : closest; - closest = coc2 < closest.z ? float3(-uvOffs.zy, coc2) : closest; - closest = coc3 < closest.z ? float3(+uvOffs.zy, coc3) : closest; - closest = coc4 < closest.z ? float3(+uvOffs.xz, coc4) : closest; - - // Sample the history buffer with the motion vector at the closest point. - float2 motion = DOF_TEX2D(_CameraMotionVectorsTexture, i.uv + closest.xy).xy; - half cocHis = DOF_TEX2D(_MainTex, i.uv - motion).r; - - // Neighborhood clamping. - half cocMin = closest.z; - half cocMax = max(max(max(max(coc0, coc1), coc2), coc3), coc4); - cocHis = clamp(cocHis, cocMin, cocMax); - - // Blend with the history. - return lerp(coc0, cocHis, _TaaParams.z); -} - -// Prefilter: downsampling and premultiplying. -half4 FragPrefilter(VaryingsDOF i) : SV_Target -{ -#if defined(SEPARATE_TEXTURE_SAMPLER) - - // Sample source colors. - half4 c_r = _MainTex.GatherRed (sampler_MainTex, i.uv); - half4 c_g = _MainTex.GatherGreen(sampler_MainTex, i.uv); - half4 c_b = _MainTex.GatherBlue (sampler_MainTex, i.uv); - - half3 c0 = half3(c_r.x, c_g.x, c_b.x); - half3 c1 = half3(c_r.y, c_g.y, c_b.y); - half3 c2 = half3(c_r.z, c_g.z, c_b.z); - half3 c3 = half3(c_r.w, c_g.w, c_b.w); - - // Sample CoCs. - half4 cocs = _CoCTex.Gather(sampler_CoCTex, i.uvAlt) * 2.0 - 1.0; - half coc0 = cocs.x; - half coc1 = cocs.y; - half coc2 = cocs.z; - half coc3 = cocs.w; - -#else - - float3 duv = _MainTex_TexelSize.xyx * float3(0.5, 0.5, -0.5); - - // Sample source colors. - half3 c0 = DOF_TEX2D(_MainTex, i.uv - duv.xy).rgb; - half3 c1 = DOF_TEX2D(_MainTex, i.uv - duv.zy).rgb; - half3 c2 = DOF_TEX2D(_MainTex, i.uv + duv.zy).rgb; - half3 c3 = DOF_TEX2D(_MainTex, i.uv + duv.xy).rgb; - - // Sample CoCs. - half coc0 = DOF_TEX2D(_CoCTex, i.uvAlt - duv.xy).r * 2.0 - 1.0; - half coc1 = DOF_TEX2D(_CoCTex, i.uvAlt - duv.zy).r * 2.0 - 1.0; - half coc2 = DOF_TEX2D(_CoCTex, i.uvAlt + duv.zy).r * 2.0 - 1.0; - half coc3 = DOF_TEX2D(_CoCTex, i.uvAlt + duv.xy).r * 2.0 - 1.0; - -#endif - - // Apply CoC and luma weights to reduce bleeding and flickering. - float w0 = abs(coc0) / (Max3(c0) + 1.0); - float w1 = abs(coc1) / (Max3(c1) + 1.0); - float w2 = abs(coc2) / (Max3(c2) + 1.0); - float w3 = abs(coc3) / (Max3(c3) + 1.0); - - // Weighted average of the color samples - half3 avg = c0 * w0 + c1 * w1 + c2 * w2 + c3 * w3; - avg /= max(w0 + w1 + w2 + w3, 1e-5); - - // Select the largest CoC value. - half coc_min = Min4(coc0, coc1, coc2, coc3); - half coc_max = Max4(coc0, coc1, coc2, coc3); - half coc = (-coc_min > coc_max ? coc_min : coc_max) * _MaxCoC; - - // Premultiply CoC again. - avg *= smoothstep(0, _MainTex_TexelSize.y * 2, abs(coc)); - -#if defined(UNITY_COLORSPACE_GAMMA) - avg = GammaToLinearSpace(avg); -#endif - - return half4(avg, coc); -} - -// Bokeh filter with disk-shaped kernels -half4 FragBlur(VaryingsDOF i) : SV_Target -{ - half4 samp0 = DOF_TEX2D(_MainTex, i.uv); - - half4 bgAcc = 0.0; // Background: far field bokeh - half4 fgAcc = 0.0; // Foreground: near field bokeh - - UNITY_LOOP for (int si = 0; si < kSampleCount; si++) - { - float2 disp = kDiskKernel[si] * _MaxCoC; - float dist = length(disp); - - float2 duv = float2(disp.x * _RcpAspect, disp.y); - half4 samp = DOF_TEX2D(_MainTex, i.uv + duv); - - // BG: Compare CoC of the current sample and the center sample - // and select smaller one. - half bgCoC = max(min(samp0.a, samp.a), 0.0); - - // Compare the CoC to the sample distance. - // Add a small margin to smooth out. - const half margin = _MainTex_TexelSize.y * 2; - half bgWeight = saturate((bgCoC - dist + margin) / margin); - half fgWeight = saturate((-samp.a - dist + margin) / margin); - - // Cut influence from focused areas because they're darkened by CoC - // premultiplying. This is only needed for near field. - fgWeight *= step(_MainTex_TexelSize.y, -samp.a); - - // Accumulation - bgAcc += half4(samp.rgb, 1.0) * bgWeight; - fgAcc += half4(samp.rgb, 1.0) * fgWeight; - } - - // Get the weighted average. - bgAcc.rgb /= bgAcc.a + (bgAcc.a == 0.0); // zero-div guard - fgAcc.rgb /= fgAcc.a + (fgAcc.a == 0.0); - - // BG: Calculate the alpha value only based on the center CoC. - // This is a rather aggressive approximation but provides stable results. - bgAcc.a = smoothstep(_MainTex_TexelSize.y, _MainTex_TexelSize.y * 2.0, samp0.a); - - // FG: Normalize the total of the weights. - fgAcc.a *= UNITY_PI / kSampleCount; - - // Alpha premultiplying - half alpha = saturate(fgAcc.a); - half3 rgb = lerp(bgAcc.rgb, fgAcc.rgb, alpha); - - return half4(rgb, alpha); -} - -// Postfilter blur -half4 FragPostBlur(VaryingsDOF i) : SV_Target -{ - // 9 tap tent filter with 4 bilinear samples - const float4 duv = _MainTex_TexelSize.xyxy * float4(0.5, 0.5, -0.5, 0); - half4 acc; - acc = DOF_TEX2D(_MainTex, i.uv - duv.xy); - acc += DOF_TEX2D(_MainTex, i.uv - duv.zy); - acc += DOF_TEX2D(_MainTex, i.uv + duv.zy); - acc += DOF_TEX2D(_MainTex, i.uv + duv.xy); - return acc / 4.0; -} - -#endif // __DEPTH_OF_FIELD__ diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Attributes/GetSetAttribute.cs.meta b/UnityProject/Assets/!ext/PostProcessing/Runtime/Attributes/GetSetAttribute.cs.meta deleted file mode 100644 index 17c2975..0000000 --- a/UnityProject/Assets/!ext/PostProcessing/Runtime/Attributes/GetSetAttribute.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -namespace UnityEngine.PostProcessing -{ - public sealed class MinAttribute : PropertyAttribute - { - public readonly float min; - - public MinAttribute(float min) - { - this.min = min; - } - } -} diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Components/BloomComponent.cs.meta b/UnityProject/Assets/!ext/PostProcessing/Runtime/Components/BloomComponent.cs.meta deleted file mode 100644 index 7e41204..0000000 --- a/UnityProject/Assets/!ext/PostProcessing/Runtime/Components/BloomComponent.cs.meta +++ /dev/null @@ -1,258 +0,0 @@ -using System.Collections.Generic; -using UnityEngine.Rendering; - -namespace UnityEngine.PostProcessing -{ - using Mode = BuiltinDebugViewsModel.Mode; - - public sealed class BuiltinDebugViewsComponent : PostProcessingComponentCommandBuffer - { - static class Uniforms - { - internal static readonly int _DepthScale = Shader.PropertyToID("_DepthScale"); - internal static readonly int _TempRT = Shader.PropertyToID("_TempRT"); - internal static readonly int _Opacity = Shader.PropertyToID("_Opacity"); - internal static readonly int _MainTex = Shader.PropertyToID("_MainTex"); - internal static readonly int _TempRT2 = Shader.PropertyToID("_TempRT2"); - internal static readonly int _Amplitude = Shader.PropertyToID("_Amplitude"); - internal static readonly int _Scale = Shader.PropertyToID("_Scale"); - } - - const string k_ShaderString = "Hidden/Post FX/Builtin Debug Views"; - - enum Pass - { - Depth, - Normals, - MovecOpacity, - MovecImaging, - MovecArrows - } - - ArrowArray m_Arrows; - - class ArrowArray - { - public Mesh mesh { get; private set; } - - public int columnCount { get; private set; } - public int rowCount { get; private set; } - - public void BuildMesh(int columns, int rows) - { - // Base shape - var arrow = new Vector3[6] - { - new Vector3(0f, 0f, 0f), - new Vector3(0f, 1f, 0f), - new Vector3(0f, 1f, 0f), - new Vector3(-1f, 1f, 0f), - new Vector3(0f, 1f, 0f), - new Vector3(1f, 1f, 0f) - }; - - // make the vertex array - int vcount = 6 * columns * rows; - var vertices = new List(vcount); - var uvs = new List(vcount); - - for (int iy = 0; iy < rows; iy++) - { - for (int ix = 0; ix < columns; ix++) - { - var uv = new Vector2( - (0.5f + ix) / columns, - (0.5f + iy) / rows - ); - - for (int i = 0; i < 6; i++) - { - vertices.Add(arrow[i]); - uvs.Add(uv); - } - } - } - - // make the index array - var indices = new int[vcount]; - - for (int i = 0; i < vcount; i++) - indices[i] = i; - - // initialize the mesh object - mesh = new Mesh { hideFlags = HideFlags.DontSave }; - mesh.SetVertices(vertices); - mesh.SetUVs(0, uvs); - mesh.SetIndices(indices, MeshTopology.Lines, 0); - mesh.UploadMeshData(true); - - // update the properties - columnCount = columns; - rowCount = rows; - } - - public void Release() - { - GraphicsUtils.Destroy(mesh); - mesh = null; - } - } - - public override bool active - { - get - { - return model.IsModeActive(Mode.Depth) - || model.IsModeActive(Mode.Normals) - || model.IsModeActive(Mode.MotionVectors); - } - } - - public override DepthTextureMode GetCameraFlags() - { - var mode = model.settings.mode; - var flags = DepthTextureMode.None; - - switch (mode) - { - case Mode.Normals: - flags |= DepthTextureMode.DepthNormals; - break; - case Mode.MotionVectors: - flags |= DepthTextureMode.MotionVectors | DepthTextureMode.Depth; - break; - case Mode.Depth: - flags |= DepthTextureMode.Depth; - break; - } - - return flags; - } - - public override CameraEvent GetCameraEvent() - { - return model.settings.mode == Mode.MotionVectors - ? CameraEvent.BeforeImageEffects - : CameraEvent.BeforeImageEffectsOpaque; - } - - public override string GetName() - { - return "Builtin Debug Views"; - } - - public override void PopulateCommandBuffer(CommandBuffer cb) - { - var settings = model.settings; - var material = context.materialFactory.Get(k_ShaderString); - material.shaderKeywords = null; - - if (context.isGBufferAvailable) - material.EnableKeyword("SOURCE_GBUFFER"); - - switch (settings.mode) - { - case Mode.Depth: - DepthPass(cb); - break; - case Mode.Normals: - DepthNormalsPass(cb); - break; - case Mode.MotionVectors: - MotionVectorsPass(cb); - break; - } - - context.Interrupt(); - } - - void DepthPass(CommandBuffer cb) - { - var material = context.materialFactory.Get(k_ShaderString); - var settings = model.settings.depth; - - cb.SetGlobalFloat(Uniforms._DepthScale, 1f / settings.scale); - cb.Blit((Texture)null, BuiltinRenderTextureType.CameraTarget, material, (int)Pass.Depth); - } - - void DepthNormalsPass(CommandBuffer cb) - { - var material = context.materialFactory.Get(k_ShaderString); - cb.Blit((Texture)null, BuiltinRenderTextureType.CameraTarget, material, (int)Pass.Normals); - } - - void MotionVectorsPass(CommandBuffer cb) - { -#if UNITY_EDITOR - // Don't render motion vectors preview when the editor is not playing as it can in some - // cases results in ugly artifacts (i.e. when resizing the game view). - if (!Application.isPlaying) - return; -#endif - - var material = context.materialFactory.Get(k_ShaderString); - var settings = model.settings.motionVectors; - - // Blit the original source image - int tempRT = Uniforms._TempRT; - cb.GetTemporaryRT(tempRT, context.width, context.height, 0, FilterMode.Bilinear); - cb.SetGlobalFloat(Uniforms._Opacity, settings.sourceOpacity); - cb.SetGlobalTexture(Uniforms._MainTex, BuiltinRenderTextureType.CameraTarget); - cb.Blit(BuiltinRenderTextureType.CameraTarget, tempRT, material, (int)Pass.MovecOpacity); - - // Motion vectors (imaging) - if (settings.motionImageOpacity > 0f && settings.motionImageAmplitude > 0f) - { - int tempRT2 = Uniforms._TempRT2; - cb.GetTemporaryRT(tempRT2, context.width, context.height, 0, FilterMode.Bilinear); - cb.SetGlobalFloat(Uniforms._Opacity, settings.motionImageOpacity); - cb.SetGlobalFloat(Uniforms._Amplitude, settings.motionImageAmplitude); - cb.SetGlobalTexture(Uniforms._MainTex, tempRT); - cb.Blit(tempRT, tempRT2, material, (int)Pass.MovecImaging); - cb.ReleaseTemporaryRT(tempRT); - tempRT = tempRT2; - } - - // Motion vectors (arrows) - if (settings.motionVectorsOpacity > 0f && settings.motionVectorsAmplitude > 0f) - { - PrepareArrows(); - - float sy = 1f / settings.motionVectorsResolution; - float sx = sy * context.height / context.width; - - cb.SetGlobalVector(Uniforms._Scale, new Vector2(sx, sy)); - cb.SetGlobalFloat(Uniforms._Opacity, settings.motionVectorsOpacity); - cb.SetGlobalFloat(Uniforms._Amplitude, settings.motionVectorsAmplitude); - cb.DrawMesh(m_Arrows.mesh, Matrix4x4.identity, material, 0, (int)Pass.MovecArrows); - } - - cb.SetGlobalTexture(Uniforms._MainTex, tempRT); - cb.Blit(tempRT, BuiltinRenderTextureType.CameraTarget); - cb.ReleaseTemporaryRT(tempRT); - } - - void PrepareArrows() - { - int row = model.settings.motionVectors.motionVectorsResolution; - int col = row * Screen.width / Screen.height; - - if (m_Arrows == null) - m_Arrows = new ArrowArray(); - - if (m_Arrows.columnCount != col || m_Arrows.rowCount != row) - { - m_Arrows.Release(); - m_Arrows.BuildMesh(col, row); - } - } - - public override void OnDisable() - { - if (m_Arrows != null) - m_Arrows.Release(); - - m_Arrows = null; - } - } -} diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Components/DepthOfFieldComponent.cs.meta b/UnityProject/Assets/!ext/PostProcessing/Runtime/Components/DepthOfFieldComponent.cs.meta deleted file mode 100644 index d912c32..0000000 --- a/UnityProject/Assets/!ext/PostProcessing/Runtime/Components/DepthOfFieldComponent.cs.meta +++ /dev/null @@ -1,165 +0,0 @@ -using UnityEngine.Rendering; - -namespace UnityEngine.PostProcessing -{ - using DebugMode = BuiltinDebugViewsModel.Mode; - - public sealed class DepthOfFieldComponent : PostProcessingComponentRenderTexture - { - static class Uniforms - { - internal static readonly int _DepthOfFieldTex = Shader.PropertyToID("_DepthOfFieldTex"); - internal static readonly int _DepthOfFieldCoCTex = Shader.PropertyToID("_DepthOfFieldCoCTex"); - internal static readonly int _Distance = Shader.PropertyToID("_Distance"); - internal static readonly int _LensCoeff = Shader.PropertyToID("_LensCoeff"); - internal static readonly int _MaxCoC = Shader.PropertyToID("_MaxCoC"); - internal static readonly int _RcpMaxCoC = Shader.PropertyToID("_RcpMaxCoC"); - internal static readonly int _RcpAspect = Shader.PropertyToID("_RcpAspect"); - internal static readonly int _MainTex = Shader.PropertyToID("_MainTex"); - internal static readonly int _CoCTex = Shader.PropertyToID("_CoCTex"); - internal static readonly int _TaaParams = Shader.PropertyToID("_TaaParams"); - internal static readonly int _DepthOfFieldParams = Shader.PropertyToID("_DepthOfFieldParams"); - } - - const string k_ShaderString = "Hidden/Post FX/Depth Of Field"; - - public override bool active - { - get - { - return model.enabled - && !context.interrupted; - } - } - - public override DepthTextureMode GetCameraFlags() - { - return DepthTextureMode.Depth; - } - - RenderTexture m_CoCHistory; - - // Height of the 35mm full-frame format (36mm x 24mm) - const float k_FilmHeight = 0.024f; - - float CalculateFocalLength() - { - var settings = model.settings; - - if (!settings.useCameraFov) - return settings.focalLength / 1000f; - - float fov = context.camera.fieldOfView * Mathf.Deg2Rad; - return 0.5f * k_FilmHeight / Mathf.Tan(0.5f * fov); - } - - float CalculateMaxCoCRadius(int screenHeight) - { - // Estimate the allowable maximum radius of CoC from the kernel - // size (the equation below was empirically derived). - float radiusInPixels = (float)model.settings.kernelSize * 4f + 6f; - - // Applying a 5% limit to the CoC radius to keep the size of - // TileMax/NeighborMax small enough. - return Mathf.Min(0.05f, radiusInPixels / screenHeight); - } - - bool CheckHistory(int width, int height) - { - return m_CoCHistory != null && m_CoCHistory.IsCreated() && - m_CoCHistory.width == width && m_CoCHistory.height == height; - } - - RenderTextureFormat SelectFormat(RenderTextureFormat primary, RenderTextureFormat secondary) - { - if (SystemInfo.SupportsRenderTextureFormat(primary)) return primary; - if (SystemInfo.SupportsRenderTextureFormat(secondary)) return secondary; - return RenderTextureFormat.Default; - } - - public void Prepare(RenderTexture source, Material uberMaterial, bool antialiasCoC, Vector2 taaJitter, float taaBlending) - { - var settings = model.settings; - var colorFormat = RenderTextureFormat.DefaultHDR; - var cocFormat = SelectFormat(RenderTextureFormat.R8, RenderTextureFormat.RHalf); - - // Avoid using R8 on OSX with Metal. #896121, https://goo.gl/MgKqu6 - #if (UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX) && !UNITY_2017_1_OR_NEWER - if (SystemInfo.graphicsDeviceType == GraphicsDeviceType.Metal) - cocFormat = SelectFormat(RenderTextureFormat.RHalf, RenderTextureFormat.Default); - #endif - - // Material setup - var f = CalculateFocalLength(); - var s1 = Mathf.Max(settings.focusDistance, f); - var aspect = (float)source.width / source.height; - var coeff = f * f / (settings.aperture * (s1 - f) * k_FilmHeight * 2); - var maxCoC = CalculateMaxCoCRadius(source.height); - - var material = context.materialFactory.Get(k_ShaderString); - material.SetFloat(Uniforms._Distance, s1); - material.SetFloat(Uniforms._LensCoeff, coeff); - material.SetFloat(Uniforms._MaxCoC, maxCoC); - material.SetFloat(Uniforms._RcpMaxCoC, 1f / maxCoC); - material.SetFloat(Uniforms._RcpAspect, 1f / aspect); - - // CoC calculation pass - var rtCoC = context.renderTextureFactory.Get(context.width, context.height, 0, cocFormat, RenderTextureReadWrite.Linear); - Graphics.Blit(null, rtCoC, material, 0); - - if (antialiasCoC) - { - // CoC temporal filter pass - material.SetTexture(Uniforms._CoCTex, rtCoC); - - var blend = CheckHistory(context.width, context.height) ? taaBlending : 0f; - material.SetVector(Uniforms._TaaParams, new Vector3(taaJitter.x, taaJitter.y, blend)); - - var rtFiltered = RenderTexture.GetTemporary(context.width, context.height, 0, cocFormat); - Graphics.Blit(m_CoCHistory, rtFiltered, material, 1); - - context.renderTextureFactory.Release(rtCoC); - if (m_CoCHistory != null) RenderTexture.ReleaseTemporary(m_CoCHistory); - - m_CoCHistory = rtCoC = rtFiltered; - } - - // Downsampling and prefiltering pass - var rt1 = context.renderTextureFactory.Get(context.width / 2, context.height / 2, 0, colorFormat); - material.SetTexture(Uniforms._CoCTex, rtCoC); - Graphics.Blit(source, rt1, material, 2); - - // Bokeh simulation pass - var rt2 = context.renderTextureFactory.Get(context.width / 2, context.height / 2, 0, colorFormat); - Graphics.Blit(rt1, rt2, material, 3 + (int)settings.kernelSize); - - // Postfilter pass - Graphics.Blit(rt2, rt1, material, 7); - - // Give the results to the uber shader. - uberMaterial.SetVector(Uniforms._DepthOfFieldParams, new Vector3(s1, coeff, maxCoC)); - - if (context.profile.debugViews.IsModeActive(DebugMode.FocusPlane)) - { - uberMaterial.EnableKeyword("DEPTH_OF_FIELD_COC_VIEW"); - context.Interrupt(); - } - else - { - uberMaterial.SetTexture(Uniforms._DepthOfFieldTex, rt1); - uberMaterial.SetTexture(Uniforms._DepthOfFieldCoCTex, rtCoC); - uberMaterial.EnableKeyword("DEPTH_OF_FIELD"); - } - - context.renderTextureFactory.Release(rt2); - } - - public override void OnDisable() - { - if (m_CoCHistory != null) - RenderTexture.ReleaseTemporary(m_CoCHistory); - - m_CoCHistory = null; - } - } -} diff --git a/UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Strafe-Left.FBX.meta b/UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Strafe-Left.FBX.meta deleted file mode 100644 index 810d6db..0000000 Binary files a/UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Strafe-Left.FBX.meta and /dev/null differ diff --git a/UnityProject/Assets/Scenes/Main/Lightmap-0_comp_dir.png b/UnityProject/Assets/Scenes/Main/Lightmap-0_comp_dir.png index 9d8519f..efce912 100644 Binary files a/UnityProject/Assets/Scenes/Main/Lightmap-0_comp_dir.png and b/UnityProject/Assets/Scenes/Main/Lightmap-0_comp_dir.png differ diff --git a/UnityProject/Assets/Scenes/Main/Lightmap-0_comp_dir.png.meta b/UnityProject/Assets/Scenes/Main/Lightmap-0_comp_dir.png.meta index 9d8519f..57ecfd6 100644 --- a/UnityProject/Assets/Scenes/Main/Lightmap-0_comp_dir.png.meta +++ b/UnityProject/Assets/Scenes/Main/Lightmap-0_comp_dir.png.meta @@ -1,7 +1,8 @@ fileFormatVersion: 2 guid: 443c89a95a1364841b7342a7f6254fef TextureImporter: - fileIDToRecycleName: {} + fileIDToRecycleName: + 2186277476908879412: ImportLogs externalObjects: {} serializedVersion: 5 mipmaps: diff --git a/UnityProject/Assets/Scenes/Main/Lightmap-1_comp_light.exr b/UnityProject/Assets/Scenes/Main/Lightmap-1_comp_light.exr index 4d7ebc6..e969108 100644 Binary files a/UnityProject/Assets/Scenes/Main/Lightmap-1_comp_light.exr and b/UnityProject/Assets/Scenes/Main/Lightmap-1_comp_light.exr differ diff --git a/UnityProject/Assets/Scenes/Main/Lightmap-1_comp_light.exr.meta b/UnityProject/Assets/Scenes/Main/Lightmap-1_comp_light.exr.meta index f0a6133..5c96df9 100644 Binary files a/UnityProject/Assets/Scenes/Main/Lightmap-1_comp_light.exr.meta and b/UnityProject/Assets/Scenes/Main/Lightmap-1_comp_light.exr.meta differ diff --git a/UnityProject/Assets/Scenes/Main/Lightmap-6_comp_dir.png.meta b/UnityProject/Assets/Scenes/Main/Lightmap-6_comp_dir.png.meta index f62cfef..3936c63 100644 Binary files a/UnityProject/Assets/Scenes/Main/Lightmap-6_comp_dir.png.meta and b/UnityProject/Assets/Scenes/Main/Lightmap-6_comp_dir.png.meta differ diff --git a/UnityProject/Assets/Scripts.meta b/UnityProject/Assets/Scripts.meta index 709eb49..bd571e8 100644 --- a/UnityProject/Assets/Scripts.meta +++ b/UnityProject/Assets/Scripts.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4f704ae4b4f98ae41a0bce26658850c1 +guid: 9acc5d3959837304caa0bdc981c1709e folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/UnityProject/Assets/Scripts/CarClient.cs b/UnityProject/Assets/Scripts/CarClient.cs index 24e12dd..64e58f6 100644 --- a/UnityProject/Assets/Scripts/CarClient.cs +++ b/UnityProject/Assets/Scripts/CarClient.cs @@ -82,6 +82,8 @@ public class CarClient : NetworkBehaviour { [ClientRpc(channel = 0)] public void RpcDecodeBits (ulong newStateBits) { + if (stateBuffer == null) + stateBuffer = new StateBuffer(delay); CompressedStateFrame compressedStateFrame = new CompressedStateFrame(newStateBits); StateFrame newStateFrame = compressedStateFrame.GetDecodedStateFrame(transform); stateBuffer.AddFrame(ref newStateFrame); diff --git a/UnityProject/Assets/Scripts/CarLL.cs b/UnityProject/Assets/Scripts/CarLL.cs index f971b56..b4d1654 100644 --- a/UnityProject/Assets/Scripts/CarLL.cs +++ b/UnityProject/Assets/Scripts/CarLL.cs @@ -1,11 +1,206 @@ -fileFormatVersion: 2 -guid: a77c00a63a6d7274dafec539e3ac85b8 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: +// Recovered from the bundled Windows server assembly; UNet-generated code omitted. +using System; +using UnityEngine; +using UnityEngine.Networking; + +[NetworkSettings(channel = 0, sendInterval = 0f)] +public class CarLL : NetworkBehaviour +{ + public bool IsBraking; + + public bool ShouldExplode; + + public bool ShouldDie; + + [Header("Networking options")] + public float minUpdateInterval = 0.04f; + + public CarClient client; + + public float updateIntervalSlow = 0.15f; + + public float updateIntervalFast = 0.05f; + + public float delay = 2f; + + private float timeAlive; + + private float timeOfLastUpdate; + + [Header("Properites in SI")] + public float maxAcceleration = 7f; + + public float maxBraking = -35f; + + public float maxVelocity = 12f; + + public float maxTurningVelocity = 9f; + + public float burningTimeOut = 5f; + + private float velocity; + + [Header("Turn radii")] + public float rightTurnRadius = 6.5f; + + public float leftTurnRadius = -11f; + + [Header("Misc")] + public float rearWheelsOffset = -1f; + + private float serverSideExplosionTime; + + private bool shouldExplodeSent; + + private bool shouldDieSent; + + private float currentAngle; + + private bool turningDirection; + + private bool isTurning; + + public void StartTurning(bool isLeftTurn) + { + currentAngle = 0f; + turningDirection = isLeftTurn; + isTurning = true; + sendUpdate(); + } + + public bool IsTurningDone() + { + return !isTurning; + } + + private void Start() + { + } + + public void FixedUpdate() + { + if (!base.isServer) + { + return; + } + timeAlive += Time.deltaTime; + if (ShouldExplode) + { + if (shouldExplodeSent) + { + if (timeAlive - timeOfLastUpdate > updateIntervalSlow) + { + sendUpdate(); + } + if (timeAlive - serverSideExplosionTime > burningTimeOut && !shouldDieSent) + { + ShouldDie = true; + forceSendUpdate(); + shouldDieSent = true; + base.transform.position = Vector3.zero; + } + if (timeAlive - serverSideExplosionTime > burningTimeOut + delay * 2f + 10f) + { + UnityEngine.Object.Destroy(base.gameObject); + } + return; + } + forceSendUpdate(); + shouldExplodeSent = true; + serverSideExplosionTime = timeAlive; + } + if (isTurning && velocity > maxTurningVelocity) + { + IsBraking = true; + } + velocity += ((!IsBraking) ? maxAcceleration : maxBraking) * Time.deltaTime; + if (velocity > maxVelocity) + { + velocity = maxVelocity; + } + else if (velocity < 0f) + { + velocity = 0f; + } + float num = velocity * Time.deltaTime; + if (isTurning) + { + float num2 = ((!turningDirection) ? rightTurnRadius : leftTurnRadius); + Vector3 point = base.transform.position + base.transform.forward * rearWheelsOffset + base.transform.right * num2; + float num3 = num * 180f / (num2 * (float)Math.PI); + if (Mathf.Abs(currentAngle + num3) >= 90f) + { + num3 = (float)((!turningDirection) ? 90 : (-90)) - currentAngle; + isTurning = false; + } + else + { + currentAngle += num3; + } + base.transform.RotateAround(point, base.transform.up, num3); + if (timeAlive - timeOfLastUpdate > updateIntervalFast) + { + sendUpdate(); + } + } + else + { + base.transform.position += base.transform.forward * num; + if (timeAlive - timeOfLastUpdate > updateIntervalSlow) + { + sendUpdate(); + } + } + } + + private void sendUpdate() + { + if (timeAlive - timeOfLastUpdate > minUpdateInterval) + { + forceSendUpdate(); + } + } + + private void forceSendUpdate() + { + client.RpcDecodeBits(stateToBits()); + timeOfLastUpdate = timeAlive; + } + + private ulong stateToBits() + { + ulong stateBits = 0uL; + boolToNthBit(IsBraking, 0, ref stateBits); + fixedFromNthBit(base.transform.position.x, 1, 12, 16f, ref stateBits); + fixedFromNthBit(base.transform.position.z, 13, 12, 16f, ref stateBits); + fixedFromNthBit(base.transform.rotation.eulerAngles.y, 25, 7, 0.35277778f, ref stateBits); + boolToNthBit(ShouldExplode, 32, ref stateBits); + boolToNthBit(ShouldDie, 33, ref stateBits); + boolToNthBit(isTurning, 34, ref stateBits); + fixedFromNthBit(timeAlive, 35, 28, 1000f, ref stateBits); + return stateBits; + } + + private void boolToNthBit(bool value, int n, ref ulong stateBits) + { + stateBits |= (ulong)((long)((!value) ? 0 : 1) << n); + } + + private void intFromNthBit(int value, int n, int length, ref ulong stateBits) + { + ulong num = (ulong)((1L << length) - 1); + stateBits |= ((ulong)value & num) << n; + } + + private void fixedFromNthBit(float value, int n, int length, float multiplier, ref ulong stateBits) + { + int value2 = (int)Mathf.Round(value * multiplier); + intFromNthBit(value2, n, length, ref stateBits); + } + + private void OnDrawGizmos() + { + Gizmos.DrawSphere(base.transform.position + base.transform.forward * rearWheelsOffset, 0.15f); + } + +} diff --git a/UnityProject/Assets/Scripts/TrafficController.cs b/UnityProject/Assets/Scripts/TrafficController.cs index 1fcc383..08a0493 100644 --- a/UnityProject/Assets/Scripts/TrafficController.cs +++ b/UnityProject/Assets/Scripts/TrafficController.cs @@ -46,8 +46,9 @@ public class TrafficController : NetworkBehaviour { private float timePassedSpawn = 0; private int current = 0; - void Start () { - if (!isServer) return; + public override void OnStartServer () { + base.OnStartServer(); + url = url.TrimEnd('/'); trafficLights = new TrafficLights(); diff --git a/UnityProject/Assets/Scripts/menu/canvasChooser.cs b/UnityProject/Assets/Scripts/menu/canvasChooser.cs index 264db61..fd4fc46 100644 --- a/UnityProject/Assets/Scripts/menu/canvasChooser.cs +++ b/UnityProject/Assets/Scripts/menu/canvasChooser.cs @@ -1,40 +1,44 @@ -using System.Collections; -using System.Collections.Generic; +using System; +using System.Collections; using UnityEngine; -/* Itt lehet állítani, hogy melyik build legyen szerver és melyik kliens. - * WebGL szerver nem lehet. - */ +public class canvasChooser : MonoBehaviour +{ + public GameObject serverStartCanvas; + public GameObject clientStartCanvas; + public GameObject mainCamera; -public class canvasChooser : MonoBehaviour { + private IEnumerator Start() + { + string[] args = Environment.GetCommandLineArgs(); + bool server = Array.IndexOf(args, "--server") >= 0; + serverStartCanvas.SetActive(server); + clientStartCanvas.SetActive(!server); + mainCamera.SetActive(!server); - public GameObject serverStartCanvas; - public GameObject clientStartCanvas; - public GameObject mainCamera; - - // Use this for initialization - void Start () { -#if UNITY_STANDALONE - - serverStartCanvas.SetActive(false); - clientStartCanvas.SetActive(true); - mainCamera.SetActive(true); - - /*serverStartCanvas.SetActive(true); - clientStartCanvas.SetActive(false); - mainCamera.SetActive(false);*/ -#endif -#if UNITY_WEBGL - serverStartCanvas.SetActive(false); - clientStartCanvas.SetActive(true); - mainCamera.SetActive(true); -#endif -#if UNITY_EDITOR - - serverStartCanvas.SetActive(false); - clientStartCanvas.SetActive(true); - mainCamera.SetActive(true); -#endif - } + // Let the scene finish starting before UNet activates its scene objects. + yield return null; + if (server) + { + serverStartMenu menu = serverStartCanvas.GetComponent(); + string trafficUrl = Argument(args, "--traffic-url"); + string eventUrl = Argument(args, "--event-url"); + if (trafficUrl != null) menu.trafficAddress.text = trafficUrl.TrimEnd('/'); + if (eventUrl != null) menu.eventAddress.text = eventUrl.TrimEnd('/'); + menu.createServer(); + Debug.Log("Simulation server started on port " + menu.network.networkPort); + } + else + { + string address = Argument(args, "--connect"); + if (address != null) + clientStartCanvas.GetComponent().joinServer(address); + } + } + private static string Argument(string[] args, string name) + { + int index = Array.IndexOf(args, name); + return index >= 0 && index + 1 < args.Length ? args[index + 1] : null; + } } diff --git a/UnityProject/Assets/Scripts/menu/canvasChooser.cs.meta b/UnityProject/Assets/Scripts/menu/canvasChooser.cs.meta index 264db61..f37c3c3 100644 --- a/UnityProject/Assets/Scripts/menu/canvasChooser.cs.meta +++ b/UnityProject/Assets/Scripts/menu/canvasChooser.cs.meta @@ -1,40 +1,11 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -/* Itt lehet állítani, hogy melyik build legyen szerver és melyik kliens. - * WebGL szerver nem lehet. - */ - -public class canvasChooser : MonoBehaviour { - - public GameObject serverStartCanvas; - public GameObject clientStartCanvas; - public GameObject mainCamera; - - // Use this for initialization - void Start () { -#if UNITY_STANDALONE - - serverStartCanvas.SetActive(false); - clientStartCanvas.SetActive(true); - mainCamera.SetActive(true); - - /*serverStartCanvas.SetActive(true); - clientStartCanvas.SetActive(false); - mainCamera.SetActive(false);*/ -#endif -#if UNITY_WEBGL - serverStartCanvas.SetActive(false); - clientStartCanvas.SetActive(true); - mainCamera.SetActive(true); -#endif -#if UNITY_EDITOR - - serverStartCanvas.SetActive(false); - clientStartCanvas.SetActive(true); - mainCamera.SetActive(true); -#endif - } - -} +fileFormatVersion: 2 +guid: a5533452e90b11345b3c3510cc82a51f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Scripts/menu/clientGameMenu.cs b/UnityProject/Assets/Scripts/menu/clientGameMenu.cs index 80124ba..326ce6f 100644 --- a/UnityProject/Assets/Scripts/menu/clientGameMenu.cs +++ b/UnityProject/Assets/Scripts/menu/clientGameMenu.cs @@ -30,6 +30,8 @@ public class clientGameMenu : NetworkBehaviour { [ClientRpc(channel = 0)] public void RpcSetNewTweet (Tweet newTweet) { + if (tweetAnimator == null) + tweetAnimator = new TweetAnimator(0.5f, 7.5f, tweetContainer); tweetAnimator.SetNewTweet(newTweet); } diff --git a/UnityProject/Assets/Scripts/menu/serverRunningMenu.cs b/UnityProject/Assets/Scripts/menu/serverRunningMenu.cs index 4527839..61b31e4 100644 --- a/UnityProject/Assets/Scripts/menu/serverRunningMenu.cs +++ b/UnityProject/Assets/Scripts/menu/serverRunningMenu.cs @@ -34,8 +34,6 @@ public class serverRunningMenu : NetworkBehaviour if (timePassed < 1) timePassed += Time.deltaTime; else { - Debug.Log(NetworkServer.connections); - Debug.Log(NetworkServer.connections.Count); timePassed = 0; diff --git a/UnityProject/Assets/Scripts/menu/serverRunningMenu.cs.meta b/UnityProject/Assets/Scripts/menu/serverRunningMenu.cs.meta index a86e423..c1dac3b 100644 --- a/UnityProject/Assets/Scripts/menu/serverRunningMenu.cs.meta +++ b/UnityProject/Assets/Scripts/menu/serverRunningMenu.cs.meta @@ -1,33 +1,11 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using UnityEngine.Networking; -using UnityEngine.UI; - - -[NetworkSettings(channel = 0, sendInterval = 0)] -public class serverStartMenu : NetworkBehaviour -{ - public TrafficController traffic; - public tweetPoller tweet; - public InputField trafficAddress; - public InputField eventAddress; - - public GameObject next; - - public NetworkManager network; - - public void createServer () - { - if(trafficAddress.text != "") - traffic.url = trafficAddress.text; - - if (eventAddress.text != "") - tweet.url = eventAddress.text; - - - network.StartServer(); - gameObject.SetActive(false); - next.SetActive(true); - } -} +fileFormatVersion: 2 +guid: 02335c5d9c8e07347918bd15ceb1adc2 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Scripts/misc/destroyCar.cs.meta b/UnityProject/Assets/Scripts/misc/destroyCar.cs.meta index a3c1f85..deef342 100644 --- a/UnityProject/Assets/Scripts/misc/destroyCar.cs.meta +++ b/UnityProject/Assets/Scripts/misc/destroyCar.cs.meta @@ -1,17 +1,11 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using UnityEngine.Networking; - -public class destroyCar : NetworkBehaviour { - - public carCount text; - - void OnTriggerEnter (Collider other) - { - if(isServer) { - text.IncrementValue(); - Destroy(other.gameObject); - } - } -} +fileFormatVersion: 2 +guid: 88b7ddbf951e255478383ee9f8ecc0b2 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Scripts/misc/networkManagerCustom.cs b/UnityProject/Assets/Scripts/misc/networkManagerCustom.cs index 9289baa..f5541fd 100644 --- a/UnityProject/Assets/Scripts/misc/networkManagerCustom.cs +++ b/UnityProject/Assets/Scripts/misc/networkManagerCustom.cs @@ -19,12 +19,13 @@ public class networkManagerCustom : NetworkManager offlineCanvas.SetActive(true); offlineCanvas.GetComponent().errorField.text = "Error: " + conn.lastError.ToString(); - base.OnServerDisconnect(conn); + base.OnClientDisconnect(conn); } public override void OnClientConnect (NetworkConnection conn) { + Debug.Log("Simulation client connected to " + networkAddress); //onlineCanvas.SetActive(true); offlineCanvas.GetComponent().errorField.text = "No errors so far."; diff --git a/UnityProject/Assets/Scripts/misc/trafficLightColor.cs b/UnityProject/Assets/Scripts/misc/trafficLightColor.cs index 499b407..c0c359f 100644 --- a/UnityProject/Assets/Scripts/misc/trafficLightColor.cs +++ b/UnityProject/Assets/Scripts/misc/trafficLightColor.cs @@ -1,11 +1,94 @@ -fileFormatVersion: 2 -guid: ed316f5bd09830c46bd502b7cb2bed3f -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 200 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: +// Recovered from the bundled Windows server assembly; UNet-generated code omitted. +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.Networking; + +public class trafficLightColor : NetworkBehaviour +{ + private Renderer render; + + public float delay = 1.5f; + + private Color[] newColors; + + private float timeOfUpdate; + + private bool dirty; + + public float blinkInterval = 1f; + + private float blinkTime; + + private bool blinkingIsYellow; + + private bool areLightsOff; + + private Dictionary colorLUT = new Dictionary + { + { + "red", + Color.red + }, + { + "yellow", + Color.yellow + }, + { + "green", + Color.green + }, + { + "off", + Color.white + } + }; + + private void Start() + { + render = GetComponent(); + } + + private void Update() + { + if (dirty && Time.time - timeOfUpdate > delay) + { + render.materials[5].color = newColors[0]; + render.materials[7].color = newColors[1]; + render.materials[4].color = newColors[2]; + render.materials[3].color = newColors[3]; + areLightsOff = render.materials[5].color == Color.white || render.materials[7].color == Color.white || render.materials[4].color == Color.white || render.materials[3].color == Color.white; + dirty = false; + } + if (areLightsOff) + { + render.materials[5].color = ((!blinkingIsYellow) ? Color.white : Color.yellow); + render.materials[7].color = ((!blinkingIsYellow) ? Color.white : Color.yellow); + render.materials[4].color = ((!blinkingIsYellow) ? Color.white : Color.yellow); + render.materials[3].color = ((!blinkingIsYellow) ? Color.white : Color.yellow); + } + blinkTime += Time.deltaTime; + if (blinkTime > blinkInterval) + { + blinkTime = 0f; + blinkingIsYellow = !blinkingIsYellow; + } + } + + [ClientRpc] + public void RpcUpdateColors(string north, string east, string south, string west) + { + if (!dirty) + { + newColors = new Color[4] + { + colorLUT[north], + colorLUT[east], + colorLUT[south], + colorLUT[west] + }; + timeOfUpdate = Time.time; + dirty = true; + } + } + +} diff --git a/UnityProject/Assets/Standard Assets/CrossPlatformInput/Prefabs/MobileSingleStickControl.prefab b/UnityProject/Assets/Standard Assets/CrossPlatformInput/Prefabs/MobileSingleStickControl.prefab index 42b2d51..69cf960 100644 --- a/UnityProject/Assets/Standard Assets/CrossPlatformInput/Prefabs/MobileSingleStickControl.prefab +++ b/UnityProject/Assets/Standard Assets/CrossPlatformInput/Prefabs/MobileSingleStickControl.prefab @@ -1,5 +1,376 @@ -fileFormatVersion: 2 -guid: 3369231b1ed7ad34e84d9240a571db81 -NativeFormatImporter: - userData: - assetBundleName: +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &100000 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 224: {fileID: 22400000} + - 223: {fileID: 22300000} + - 114: {fileID: 11400000} + - 114: {fileID: 11400012} + m_Layer: 5 + m_Name: MobileSingleStickControl + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &100002 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 224: {fileID: 22400002} + - 222: {fileID: 22200002} + - 114: {fileID: 11400010} + - 114: {fileID: 11400008} + m_Layer: 5 + m_Name: MobileJoystick + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &100004 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 224: {fileID: 22400004} + - 222: {fileID: 22200000} + - 114: {fileID: 11400006} + - 114: {fileID: 11400004} + - 114: {fileID: 11400002} + m_Layer: 5 + m_Name: JumpButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &100006 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 224: {fileID: 22400006} + - 222: {fileID: 22200004} + - 114: {fileID: 11400016} + - 114: {fileID: 11400014} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 100000} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1301386320, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + ignoreReversedGraphics: 1 + blockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &11400002 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 100004} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 85bf3be603548374ca46f521a3aa7fda, type: 3} + m_Name: + m_EditorClassIdentifier: + Name: Jump +--- !u!114 &11400004 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 100004} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -1862395651, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + delegates: + - eventID: 2 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 11400002} + m_MethodName: SetDownState + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: Jump + m_BoolArgument: 0 + m_CallState: 1 + m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + - eventID: 3 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 11400002} + m_MethodName: SetUpState + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: Jump + m_BoolArgument: 0 + m_CallState: 1 + m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!114 &11400006 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 100004} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Sprite: {fileID: 21300000, guid: 3d8675433a508ec47b8f895201eacf20, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!114 &11400008 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 100002} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 00c3c865782347f41b6358d9fba14b48, type: 3} + m_Name: + m_EditorClassIdentifier: + MovementRange: 100 + axesToUse: 0 + horizontalAxisName: Horizontal + verticalAxisName: Vertical +--- !u!114 &11400010 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 100002} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Sprite: {fileID: 21300000, guid: 9866a92691696b346901281f2b329034, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!114 &11400012 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 100000} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 71398ce7fbc3a5b4fa50b50bd54317a7, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &11400014 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 100006} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1573420865, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: .125490203} + m_EffectDistance: {x: 2, y: -2} + m_UseGraphicAlpha: 1 +--- !u!114 &11400016 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 100006} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: .643137276} + m_FontData: + m_Font: {fileID: 12800000, guid: 01cd679a1b9ee48bf9c546f6ce2cb97e, type: 3} + m_FontSize: 26 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Jump +--- !u!222 &22200000 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 100004} +--- !u!222 &22200002 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 100002} +--- !u!222 &22200004 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 100006} +--- !u!223 &22300000 +Canvas: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 100000} + m_Enabled: 1 + serializedVersion: 2 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 1 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 +--- !u!224 &22400000 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 100000} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_Children: + - {fileID: 22400004} + - {fileID: 22400002} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!224 &22400002 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 100002} + 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: 22400000} + m_RootOrder: 1 + m_AnchorMin: {x: .160000011, y: .200000003} + m_AnchorMax: {x: .160000011, y: .200000003} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 80, y: 80} + m_Pivot: {x: .5, y: .5} +--- !u!224 &22400004 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 100004} + 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: + - {fileID: 22400006} + m_Father: {fileID: 22400000} + m_RootOrder: 0 + m_AnchorMin: {x: .779999971, y: .00999999978} + m_AnchorMax: {x: .99000001, y: .150000006} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!224 &22400006 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 100006} + 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: 22400004} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: [] + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 0} + m_RootGameObject: {fileID: 100000} + m_IsPrefabParent: 1 diff --git a/UnityProject/Assets/Standard Assets/CrossPlatformInput/Scripts/InputAxisScrollbar.cs.meta b/UnityProject/Assets/Standard Assets/CrossPlatformInput/Scripts/InputAxisScrollbar.cs.meta index fad46a8..f698509 100644 --- a/UnityProject/Assets/Standard Assets/CrossPlatformInput/Scripts/InputAxisScrollbar.cs.meta +++ b/UnityProject/Assets/Standard Assets/CrossPlatformInput/Scripts/InputAxisScrollbar.cs.meta @@ -1,118 +1,9 @@ -using System; -using UnityEngine; -using UnityEngine.EventSystems; - -namespace UnityStandardAssets.CrossPlatformInput -{ - public class Joystick : MonoBehaviour, IPointerDownHandler, IPointerUpHandler, IDragHandler - { - public enum AxisOption - { - // Options for which axes to use - Both, // Use both - OnlyHorizontal, // Only horizontal - OnlyVertical // Only vertical - } - - public int MovementRange = 100; - public AxisOption axesToUse = AxisOption.Both; // The options for the axes that the still will use - public string horizontalAxisName = "Horizontal"; // The name given to the horizontal axis for the cross platform input - public string verticalAxisName = "Vertical"; // The name given to the vertical axis for the cross platform input - - Vector3 m_StartPos; - bool m_UseX; // Toggle for using the x axis - bool m_UseY; // Toggle for using the Y axis - CrossPlatformInputManager.VirtualAxis m_HorizontalVirtualAxis; // Reference to the joystick in the cross platform input - CrossPlatformInputManager.VirtualAxis m_VerticalVirtualAxis; // Reference to the joystick in the cross platform input - - void OnEnable() - { - CreateVirtualAxes(); - } - - void Start() - { - m_StartPos = transform.position; - } - - void UpdateVirtualAxes(Vector3 value) - { - var delta = m_StartPos - value; - delta.y = -delta.y; - delta /= MovementRange; - if (m_UseX) - { - m_HorizontalVirtualAxis.Update(-delta.x); - } - - if (m_UseY) - { - m_VerticalVirtualAxis.Update(delta.y); - } - } - - void CreateVirtualAxes() - { - // set axes to use - m_UseX = (axesToUse == AxisOption.Both || axesToUse == AxisOption.OnlyHorizontal); - m_UseY = (axesToUse == AxisOption.Both || axesToUse == AxisOption.OnlyVertical); - - // create new axes based on axes to use - if (m_UseX) - { - m_HorizontalVirtualAxis = new CrossPlatformInputManager.VirtualAxis(horizontalAxisName); - CrossPlatformInputManager.RegisterVirtualAxis(m_HorizontalVirtualAxis); - } - if (m_UseY) - { - m_VerticalVirtualAxis = new CrossPlatformInputManager.VirtualAxis(verticalAxisName); - CrossPlatformInputManager.RegisterVirtualAxis(m_VerticalVirtualAxis); - } - } - - - public void OnDrag(PointerEventData data) - { - Vector3 newPos = Vector3.zero; - - if (m_UseX) - { - int delta = (int)(data.position.x - m_StartPos.x); - delta = Mathf.Clamp(delta, - MovementRange, MovementRange); - newPos.x = delta; - } - - if (m_UseY) - { - int delta = (int)(data.position.y - m_StartPos.y); - delta = Mathf.Clamp(delta, -MovementRange, MovementRange); - newPos.y = delta; - } - transform.position = new Vector3(m_StartPos.x + newPos.x, m_StartPos.y + newPos.y, m_StartPos.z + newPos.z); - UpdateVirtualAxes(transform.position); - } - - - public void OnPointerUp(PointerEventData data) - { - transform.position = m_StartPos; - UpdateVirtualAxes(m_StartPos); - } - - - public void OnPointerDown(PointerEventData data) { } - - void OnDisable() - { - // remove the joysticks from the cross platform input - if (m_UseX) - { - m_HorizontalVirtualAxis.Remove(); - } - if (m_UseY) - { - m_VerticalVirtualAxis.Remove(); - } - } - } -} \ No newline at end of file +fileFormatVersion: 2 +guid: 7d3269566d48b8447bb48d2259e28f8b +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: diff --git a/UnityProject/Assets/Standard Assets/CrossPlatformInput/Scripts/VirtualInput.cs b/UnityProject/Assets/Standard Assets/CrossPlatformInput/Scripts/VirtualInput.cs index 7e64612..0b9f5ad 100644 --- a/UnityProject/Assets/Standard Assets/CrossPlatformInput/Scripts/VirtualInput.cs +++ b/UnityProject/Assets/Standard Assets/CrossPlatformInput/Scripts/VirtualInput.cs @@ -1,9 +1,134 @@ -fileFormatVersion: 2 -guid: 1caf40fc8bebb6b43b2550c05ca791d6 -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: +using System; +using System.Collections.Generic; +using UnityEngine; + + +namespace UnityStandardAssets.CrossPlatformInput +{ + public abstract class VirtualInput + { + public Vector3 virtualMousePosition { get; private set; } + + + protected Dictionary m_VirtualAxes = + new Dictionary(); + // Dictionary to store the name relating to the virtual axes + protected Dictionary m_VirtualButtons = + new Dictionary(); + protected List m_AlwaysUseVirtual = new List(); + // list of the axis and button names that have been flagged to always use a virtual axis or button + + + public bool AxisExists(string name) + { + return m_VirtualAxes.ContainsKey(name); + } + + public bool ButtonExists(string name) + { + return m_VirtualButtons.ContainsKey(name); + } + + + public void RegisterVirtualAxis(CrossPlatformInputManager.VirtualAxis axis) + { + // check if we already have an axis with that name and log and error if we do + if (m_VirtualAxes.ContainsKey(axis.name)) + { + Debug.LogError("There is already a virtual axis named " + axis.name + " registered."); + } + else + { + // add any new axes + m_VirtualAxes.Add(axis.name, axis); + + // if we dont want to match with the input manager setting then revert to always using virtual + if (!axis.matchWithInputManager) + { + m_AlwaysUseVirtual.Add(axis.name); + } + } + } + + + public void RegisterVirtualButton(CrossPlatformInputManager.VirtualButton button) + { + // check if already have a buttin with that name and log an error if we do + if (m_VirtualButtons.ContainsKey(button.name)) + { + Debug.LogError("There is already a virtual button named " + button.name + " registered."); + } + else + { + // add any new buttons + m_VirtualButtons.Add(button.name, button); + + // if we dont want to match to the input manager then always use a virtual axis + if (!button.matchWithInputManager) + { + m_AlwaysUseVirtual.Add(button.name); + } + } + } + + + public void UnRegisterVirtualAxis(string name) + { + // if we have an axis with that name then remove it from our dictionary of registered axes + if (m_VirtualAxes.ContainsKey(name)) + { + m_VirtualAxes.Remove(name); + } + } + + + public void UnRegisterVirtualButton(string name) + { + // if we have a button with this name then remove it from our dictionary of registered buttons + if (m_VirtualButtons.ContainsKey(name)) + { + m_VirtualButtons.Remove(name); + } + } + + + // returns a reference to a named virtual axis if it exists otherwise null + public CrossPlatformInputManager.VirtualAxis VirtualAxisReference(string name) + { + return m_VirtualAxes.ContainsKey(name) ? m_VirtualAxes[name] : null; + } + + + public void SetVirtualMousePositionX(float f) + { + virtualMousePosition = new Vector3(f, virtualMousePosition.y, virtualMousePosition.z); + } + + + public void SetVirtualMousePositionY(float f) + { + virtualMousePosition = new Vector3(virtualMousePosition.x, f, virtualMousePosition.z); + } + + + public void SetVirtualMousePositionZ(float f) + { + virtualMousePosition = new Vector3(virtualMousePosition.x, virtualMousePosition.y, f); + } + + + public abstract float GetAxis(string name, bool raw); + + public abstract bool GetButton(string name); + public abstract bool GetButtonDown(string name); + public abstract bool GetButtonUp(string name); + + public abstract void SetButtonDown(string name); + public abstract void SetButtonUp(string name); + public abstract void SetAxisPositive(string name); + public abstract void SetAxisNegative(string name); + public abstract void SetAxisZero(string name); + public abstract void SetAxis(string name, float value); + public abstract Vector3 MousePosition(); + } +} diff --git a/UnityProject/Assets/Standard Assets/CrossPlatformInput/Sprites/ButtonCameraCycleUpSprite.png.meta b/UnityProject/Assets/Standard Assets/CrossPlatformInput/Sprites/ButtonCameraCycleUpSprite.png.meta index 92bbbf2..3394885 100644 Binary files a/UnityProject/Assets/Standard Assets/CrossPlatformInput/Sprites/ButtonCameraCycleUpSprite.png.meta and b/UnityProject/Assets/Standard Assets/CrossPlatformInput/Sprites/ButtonCameraCycleUpSprite.png.meta differ diff --git a/UnityProject/Assets/Standard Assets/CrossPlatformInput/Sprites/ButtonTimescaleFullUpSprite.png b/UnityProject/Assets/Standard Assets/CrossPlatformInput/Sprites/ButtonTimescaleFullUpSprite.png index 1acce54..e954b77 100644 Binary files a/UnityProject/Assets/Standard Assets/CrossPlatformInput/Sprites/ButtonTimescaleFullUpSprite.png and b/UnityProject/Assets/Standard Assets/CrossPlatformInput/Sprites/ButtonTimescaleFullUpSprite.png differ diff --git a/UnityProject/Assets/Standard Assets/CrossPlatformInput/Sprites/TouchpadSprite.png.meta b/UnityProject/Assets/Standard Assets/CrossPlatformInput/Sprites/TouchpadSprite.png.meta index 9b86e30..fc51dbc 100644 Binary files a/UnityProject/Assets/Standard Assets/CrossPlatformInput/Sprites/TouchpadSprite.png.meta and b/UnityProject/Assets/Standard Assets/CrossPlatformInput/Sprites/TouchpadSprite.png.meta differ diff --git a/UnityProject/Assets/ThirdParty.meta b/UnityProject/Assets/ThirdParty.meta new file mode 100644 index 0000000..58b289c --- /dev/null +++ b/UnityProject/Assets/ThirdParty.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3b39e0d1d09a86f418e1a3761461ed49 +folderAsset: 'yes' +DefaultImporter: + externalObjects: {} + userData: '' + assetBundleName: '' + assetBundleVariant: '' diff --git a/UnityProject/Assets/!ext/FbxExporters.meta b/UnityProject/Assets/ThirdParty/FbxExporters.meta similarity index 100% rename from UnityProject/Assets/!ext/FbxExporters.meta rename to UnityProject/Assets/ThirdParty/FbxExporters.meta diff --git a/UnityProject/Assets/!ext/FbxExporters/Editor.meta b/UnityProject/Assets/ThirdParty/FbxExporters/Editor.meta similarity index 100% rename from UnityProject/Assets/!ext/FbxExporters/Editor.meta rename to UnityProject/Assets/ThirdParty/FbxExporters/Editor.meta diff --git a/UnityProject/Assets/!ext/FbxExporters/Editor/FbxSdk.meta b/UnityProject/Assets/ThirdParty/FbxExporters/Editor/FbxSdk.meta similarity index 100% rename from UnityProject/Assets/!ext/FbxExporters/Editor/FbxSdk.meta rename to UnityProject/Assets/ThirdParty/FbxExporters/Editor/FbxSdk.meta diff --git a/UnityProject/Assets/!ext/FbxExporters/Editor/FbxSdk/LICENSE.txt b/UnityProject/Assets/ThirdParty/FbxExporters/Editor/FbxSdk/LICENSE.txt similarity index 100% rename from UnityProject/Assets/!ext/FbxExporters/Editor/FbxSdk/LICENSE.txt rename to UnityProject/Assets/ThirdParty/FbxExporters/Editor/FbxSdk/LICENSE.txt diff --git a/UnityProject/Assets/!ext/FbxExporters/Editor/FbxSdk/LICENSE.txt.meta b/UnityProject/Assets/ThirdParty/FbxExporters/Editor/FbxSdk/LICENSE.txt.meta similarity index 100% rename from UnityProject/Assets/!ext/FbxExporters/Editor/FbxSdk/LICENSE.txt.meta rename to UnityProject/Assets/ThirdParty/FbxExporters/Editor/FbxSdk/LICENSE.txt.meta diff --git a/UnityProject/Assets/!ext/FbxExporters/Editor/FbxSdk/Plugins.meta b/UnityProject/Assets/ThirdParty/FbxExporters/Editor/FbxSdk/Plugins.meta similarity index 100% rename from UnityProject/Assets/!ext/FbxExporters/Editor/FbxSdk/Plugins.meta rename to UnityProject/Assets/ThirdParty/FbxExporters/Editor/FbxSdk/Plugins.meta diff --git a/UnityProject/Assets/!ext/FbxExporters/Editor/FbxSdk/Plugins/UnityFbxSdk.dll b/UnityProject/Assets/ThirdParty/FbxExporters/Editor/FbxSdk/Plugins/UnityFbxSdk.dll similarity index 100% rename from UnityProject/Assets/!ext/FbxExporters/Editor/FbxSdk/Plugins/UnityFbxSdk.dll rename to UnityProject/Assets/ThirdParty/FbxExporters/Editor/FbxSdk/Plugins/UnityFbxSdk.dll diff --git a/UnityProject/Assets/!ext/FbxExporters/Editor/FbxSdk/Plugins/UnityFbxSdk.dll.meta b/UnityProject/Assets/ThirdParty/FbxExporters/Editor/FbxSdk/Plugins/UnityFbxSdk.dll.meta similarity index 100% rename from UnityProject/Assets/!ext/FbxExporters/Editor/FbxSdk/Plugins/UnityFbxSdk.dll.meta rename to UnityProject/Assets/ThirdParty/FbxExporters/Editor/FbxSdk/Plugins/UnityFbxSdk.dll.meta diff --git a/UnityProject/Assets/!ext/FbxExporters/Editor/FbxSdk/Plugins/x64.meta b/UnityProject/Assets/ThirdParty/FbxExporters/Editor/FbxSdk/Plugins/x64.meta similarity index 100% rename from UnityProject/Assets/!ext/FbxExporters/Editor/FbxSdk/Plugins/x64.meta rename to UnityProject/Assets/ThirdParty/FbxExporters/Editor/FbxSdk/Plugins/x64.meta diff --git a/UnityProject/Assets/!ext/FbxExporters/Editor/FbxSdk/Plugins/x64/MacOS.meta b/UnityProject/Assets/ThirdParty/FbxExporters/Editor/FbxSdk/Plugins/x64/MacOS.meta similarity index 100% rename from UnityProject/Assets/!ext/FbxExporters/Editor/FbxSdk/Plugins/x64/MacOS.meta rename to UnityProject/Assets/ThirdParty/FbxExporters/Editor/FbxSdk/Plugins/x64/MacOS.meta diff --git a/UnityProject/Assets/!ext/FbxExporters/Editor/FbxSdk/Plugins/x64/MacOS/UnityFbxSdkNative.bundle.meta b/UnityProject/Assets/ThirdParty/FbxExporters/Editor/FbxSdk/Plugins/x64/MacOS/UnityFbxSdkNative.bundle.meta similarity index 100% rename from UnityProject/Assets/!ext/FbxExporters/Editor/FbxSdk/Plugins/x64/MacOS/UnityFbxSdkNative.bundle.meta rename to UnityProject/Assets/ThirdParty/FbxExporters/Editor/FbxSdk/Plugins/x64/MacOS/UnityFbxSdkNative.bundle.meta diff --git a/UnityProject/Assets/!ext/FbxExporters/Editor/FbxSdk/Plugins/x64/MacOS/UnityFbxSdkNative.bundle/Contents.meta b/UnityProject/Assets/ThirdParty/FbxExporters/Editor/FbxSdk/Plugins/x64/MacOS/UnityFbxSdkNative.bundle/Contents.meta similarity index 100% rename from UnityProject/Assets/!ext/FbxExporters/Editor/FbxSdk/Plugins/x64/MacOS/UnityFbxSdkNative.bundle/Contents.meta rename to UnityProject/Assets/ThirdParty/FbxExporters/Editor/FbxSdk/Plugins/x64/MacOS/UnityFbxSdkNative.bundle/Contents.meta diff --git a/UnityProject/Assets/!ext/FbxExporters/Editor/FbxSdk/Plugins/x64/MacOS/UnityFbxSdkNative.bundle/Contents/Info.plist b/UnityProject/Assets/ThirdParty/FbxExporters/Editor/FbxSdk/Plugins/x64/MacOS/UnityFbxSdkNative.bundle/Contents/Info.plist similarity index 100% rename from UnityProject/Assets/!ext/FbxExporters/Editor/FbxSdk/Plugins/x64/MacOS/UnityFbxSdkNative.bundle/Contents/Info.plist rename to UnityProject/Assets/ThirdParty/FbxExporters/Editor/FbxSdk/Plugins/x64/MacOS/UnityFbxSdkNative.bundle/Contents/Info.plist diff --git a/UnityProject/Assets/!ext/FbxExporters/Editor/FbxSdk/Plugins/x64/MacOS/UnityFbxSdkNative.bundle/Contents/Info.plist.meta b/UnityProject/Assets/ThirdParty/FbxExporters/Editor/FbxSdk/Plugins/x64/MacOS/UnityFbxSdkNative.bundle/Contents/Info.plist.meta similarity index 100% rename from UnityProject/Assets/!ext/FbxExporters/Editor/FbxSdk/Plugins/x64/MacOS/UnityFbxSdkNative.bundle/Contents/Info.plist.meta rename to UnityProject/Assets/ThirdParty/FbxExporters/Editor/FbxSdk/Plugins/x64/MacOS/UnityFbxSdkNative.bundle/Contents/Info.plist.meta diff --git a/UnityProject/Assets/!ext/FbxExporters/Editor/FbxSdk/Plugins/x64/MacOS/UnityFbxSdkNative.bundle/Contents/MacOS.meta b/UnityProject/Assets/ThirdParty/FbxExporters/Editor/FbxSdk/Plugins/x64/MacOS/UnityFbxSdkNative.bundle/Contents/MacOS.meta similarity index 100% rename from UnityProject/Assets/!ext/FbxExporters/Editor/FbxSdk/Plugins/x64/MacOS/UnityFbxSdkNative.bundle/Contents/MacOS.meta rename to UnityProject/Assets/ThirdParty/FbxExporters/Editor/FbxSdk/Plugins/x64/MacOS/UnityFbxSdkNative.bundle/Contents/MacOS.meta diff --git a/UnityProject/Assets/!ext/FbxExporters/Editor/FbxSdk/Plugins/x64/MacOS/UnityFbxSdkNative.bundle/Contents/MacOS/UnityFbxSdkNative b/UnityProject/Assets/ThirdParty/FbxExporters/Editor/FbxSdk/Plugins/x64/MacOS/UnityFbxSdkNative.bundle/Contents/MacOS/UnityFbxSdkNative similarity index 100% rename from UnityProject/Assets/!ext/FbxExporters/Editor/FbxSdk/Plugins/x64/MacOS/UnityFbxSdkNative.bundle/Contents/MacOS/UnityFbxSdkNative rename to UnityProject/Assets/ThirdParty/FbxExporters/Editor/FbxSdk/Plugins/x64/MacOS/UnityFbxSdkNative.bundle/Contents/MacOS/UnityFbxSdkNative diff --git a/UnityProject/Assets/!ext/FbxExporters/Editor/FbxSdk/Plugins/x64/MacOS/UnityFbxSdkNative.bundle/Contents/MacOS/UnityFbxSdkNative.meta b/UnityProject/Assets/ThirdParty/FbxExporters/Editor/FbxSdk/Plugins/x64/MacOS/UnityFbxSdkNative.bundle/Contents/MacOS/UnityFbxSdkNative.meta similarity index 100% rename from UnityProject/Assets/!ext/FbxExporters/Editor/FbxSdk/Plugins/x64/MacOS/UnityFbxSdkNative.bundle/Contents/MacOS/UnityFbxSdkNative.meta rename to UnityProject/Assets/ThirdParty/FbxExporters/Editor/FbxSdk/Plugins/x64/MacOS/UnityFbxSdkNative.bundle/Contents/MacOS/UnityFbxSdkNative.meta diff --git a/UnityProject/Assets/!ext/FbxExporters/Editor/FbxSdk/Plugins/x64/Windows.meta b/UnityProject/Assets/ThirdParty/FbxExporters/Editor/FbxSdk/Plugins/x64/Windows.meta similarity index 100% rename from UnityProject/Assets/!ext/FbxExporters/Editor/FbxSdk/Plugins/x64/Windows.meta rename to UnityProject/Assets/ThirdParty/FbxExporters/Editor/FbxSdk/Plugins/x64/Windows.meta diff --git a/UnityProject/Assets/!ext/FbxExporters/Editor/FbxSdk/Plugins/x64/Windows/UnityFbxSdkNative.dll b/UnityProject/Assets/ThirdParty/FbxExporters/Editor/FbxSdk/Plugins/x64/Windows/UnityFbxSdkNative.dll similarity index 100% rename from UnityProject/Assets/!ext/FbxExporters/Editor/FbxSdk/Plugins/x64/Windows/UnityFbxSdkNative.dll rename to UnityProject/Assets/ThirdParty/FbxExporters/Editor/FbxSdk/Plugins/x64/Windows/UnityFbxSdkNative.dll diff --git a/UnityProject/Assets/!ext/FbxExporters/Editor/FbxSdk/Plugins/x64/Windows/UnityFbxSdkNative.dll.meta b/UnityProject/Assets/ThirdParty/FbxExporters/Editor/FbxSdk/Plugins/x64/Windows/UnityFbxSdkNative.dll.meta similarity index 100% rename from UnityProject/Assets/!ext/FbxExporters/Editor/FbxSdk/Plugins/x64/Windows/UnityFbxSdkNative.dll.meta rename to UnityProject/Assets/ThirdParty/FbxExporters/Editor/FbxSdk/Plugins/x64/Windows/UnityFbxSdkNative.dll.meta diff --git a/UnityProject/Assets/!ext/FbxExporters/Editor/FbxSdk/docs.zip b/UnityProject/Assets/ThirdParty/FbxExporters/Editor/FbxSdk/docs.zip similarity index 100% rename from UnityProject/Assets/!ext/FbxExporters/Editor/FbxSdk/docs.zip rename to UnityProject/Assets/ThirdParty/FbxExporters/Editor/FbxSdk/docs.zip diff --git a/UnityProject/Assets/!ext/FbxExporters/Editor/FbxSdk/docs.zip.meta b/UnityProject/Assets/ThirdParty/FbxExporters/Editor/FbxSdk/docs.zip.meta similarity index 100% rename from UnityProject/Assets/!ext/FbxExporters/Editor/FbxSdk/docs.zip.meta rename to UnityProject/Assets/ThirdParty/FbxExporters/Editor/FbxSdk/docs.zip.meta diff --git a/UnityProject/Assets/!ext/FbxExporters/Editor/UnityFbxExporterEditor.dll b/UnityProject/Assets/ThirdParty/FbxExporters/Editor/UnityFbxExporterEditor.dll similarity index 100% rename from UnityProject/Assets/!ext/FbxExporters/Editor/UnityFbxExporterEditor.dll rename to UnityProject/Assets/ThirdParty/FbxExporters/Editor/UnityFbxExporterEditor.dll diff --git a/UnityProject/Assets/!ext/FbxExporters/Editor/UnityFbxExporterEditor.dll.meta b/UnityProject/Assets/ThirdParty/FbxExporters/Editor/UnityFbxExporterEditor.dll.meta similarity index 100% rename from UnityProject/Assets/!ext/FbxExporters/Editor/UnityFbxExporterEditor.dll.meta rename to UnityProject/Assets/ThirdParty/FbxExporters/Editor/UnityFbxExporterEditor.dll.meta diff --git a/UnityProject/Assets/!ext/FbxExporters/FBX_Exporter_User_Guide.pdf b/UnityProject/Assets/ThirdParty/FbxExporters/FBX_Exporter_User_Guide.pdf similarity index 100% rename from UnityProject/Assets/!ext/FbxExporters/FBX_Exporter_User_Guide.pdf rename to UnityProject/Assets/ThirdParty/FbxExporters/FBX_Exporter_User_Guide.pdf diff --git a/UnityProject/Assets/!ext/FbxExporters/FBX_Exporter_User_Guide.pdf.meta b/UnityProject/Assets/ThirdParty/FbxExporters/FBX_Exporter_User_Guide.pdf.meta similarity index 100% rename from UnityProject/Assets/!ext/FbxExporters/FBX_Exporter_User_Guide.pdf.meta rename to UnityProject/Assets/ThirdParty/FbxExporters/FBX_Exporter_User_Guide.pdf.meta diff --git a/UnityProject/Assets/!ext/FbxExporters/LICENSE.txt b/UnityProject/Assets/ThirdParty/FbxExporters/LICENSE.txt similarity index 100% rename from UnityProject/Assets/!ext/FbxExporters/LICENSE.txt rename to UnityProject/Assets/ThirdParty/FbxExporters/LICENSE.txt diff --git a/UnityProject/Assets/!ext/FbxExporters/LICENSE.txt.meta b/UnityProject/Assets/ThirdParty/FbxExporters/LICENSE.txt.meta similarity index 100% rename from UnityProject/Assets/!ext/FbxExporters/LICENSE.txt.meta rename to UnityProject/Assets/ThirdParty/FbxExporters/LICENSE.txt.meta diff --git a/UnityProject/Assets/!ext/FbxExporters/RELEASE_NOTES.txt b/UnityProject/Assets/ThirdParty/FbxExporters/RELEASE_NOTES.txt similarity index 100% rename from UnityProject/Assets/!ext/FbxExporters/RELEASE_NOTES.txt rename to UnityProject/Assets/ThirdParty/FbxExporters/RELEASE_NOTES.txt diff --git a/UnityProject/Assets/!ext/FbxExporters/RELEASE_NOTES.txt.meta b/UnityProject/Assets/ThirdParty/FbxExporters/RELEASE_NOTES.txt.meta similarity index 100% rename from UnityProject/Assets/!ext/FbxExporters/RELEASE_NOTES.txt.meta rename to UnityProject/Assets/ThirdParty/FbxExporters/RELEASE_NOTES.txt.meta diff --git a/UnityProject/Assets/!ext/FbxExporters/UnityFbxForMax.zip b/UnityProject/Assets/ThirdParty/FbxExporters/UnityFbxForMax.zip similarity index 100% rename from UnityProject/Assets/!ext/FbxExporters/UnityFbxForMax.zip rename to UnityProject/Assets/ThirdParty/FbxExporters/UnityFbxForMax.zip diff --git a/UnityProject/Assets/!ext/FbxExporters/UnityFbxForMax.zip.meta b/UnityProject/Assets/ThirdParty/FbxExporters/UnityFbxForMax.zip.meta similarity index 100% rename from UnityProject/Assets/!ext/FbxExporters/UnityFbxForMax.zip.meta rename to UnityProject/Assets/ThirdParty/FbxExporters/UnityFbxForMax.zip.meta diff --git a/UnityProject/Assets/!ext/FbxExporters/UnityFbxPrefab.dll b/UnityProject/Assets/ThirdParty/FbxExporters/UnityFbxPrefab.dll similarity index 100% rename from UnityProject/Assets/!ext/FbxExporters/UnityFbxPrefab.dll rename to UnityProject/Assets/ThirdParty/FbxExporters/UnityFbxPrefab.dll diff --git a/UnityProject/Assets/!ext/FbxExporters/UnityFbxPrefab.dll.meta b/UnityProject/Assets/ThirdParty/FbxExporters/UnityFbxPrefab.dll.meta similarity index 100% rename from UnityProject/Assets/!ext/FbxExporters/UnityFbxPrefab.dll.meta rename to UnityProject/Assets/ThirdParty/FbxExporters/UnityFbxPrefab.dll.meta diff --git a/UnityProject/Assets/!ext/PostProcessing.meta b/UnityProject/Assets/ThirdParty/PostProcessing.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing.meta rename to UnityProject/Assets/ThirdParty/PostProcessing.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor Resources.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Editor Resources.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor Resources.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor Resources.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor Resources/Monitors.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Editor Resources/Monitors.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor Resources/Monitors.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor Resources/Monitors.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor Resources/Monitors/HistogramCompute.compute b/UnityProject/Assets/ThirdParty/PostProcessing/Editor Resources/Monitors/HistogramCompute.compute similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor Resources/Monitors/HistogramCompute.compute rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor Resources/Monitors/HistogramCompute.compute diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor Resources/Monitors/HistogramCompute.compute.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Editor Resources/Monitors/HistogramCompute.compute.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor Resources/Monitors/HistogramCompute.compute.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor Resources/Monitors/HistogramCompute.compute.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor Resources/Monitors/HistogramRender.shader b/UnityProject/Assets/ThirdParty/PostProcessing/Editor Resources/Monitors/HistogramRender.shader similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor Resources/Monitors/HistogramRender.shader rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor Resources/Monitors/HistogramRender.shader diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor Resources/Monitors/HistogramRender.shader.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Editor Resources/Monitors/HistogramRender.shader.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor Resources/Monitors/HistogramRender.shader.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor Resources/Monitors/HistogramRender.shader.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor Resources/Monitors/ParadeRender.shader b/UnityProject/Assets/ThirdParty/PostProcessing/Editor Resources/Monitors/ParadeRender.shader similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor Resources/Monitors/ParadeRender.shader rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor Resources/Monitors/ParadeRender.shader diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor Resources/Monitors/ParadeRender.shader.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Editor Resources/Monitors/ParadeRender.shader.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor Resources/Monitors/ParadeRender.shader.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor Resources/Monitors/ParadeRender.shader.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor Resources/Monitors/VectorscopeCompute.compute b/UnityProject/Assets/ThirdParty/PostProcessing/Editor Resources/Monitors/VectorscopeCompute.compute similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor Resources/Monitors/VectorscopeCompute.compute rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor Resources/Monitors/VectorscopeCompute.compute diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor Resources/Monitors/VectorscopeCompute.compute.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Editor Resources/Monitors/VectorscopeCompute.compute.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor Resources/Monitors/VectorscopeCompute.compute.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor Resources/Monitors/VectorscopeCompute.compute.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor Resources/Monitors/VectorscopeRender.shader b/UnityProject/Assets/ThirdParty/PostProcessing/Editor Resources/Monitors/VectorscopeRender.shader similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor Resources/Monitors/VectorscopeRender.shader rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor Resources/Monitors/VectorscopeRender.shader diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor Resources/Monitors/VectorscopeRender.shader.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Editor Resources/Monitors/VectorscopeRender.shader.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor Resources/Monitors/VectorscopeRender.shader.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor Resources/Monitors/VectorscopeRender.shader.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor Resources/Monitors/WaveformCompute.compute b/UnityProject/Assets/ThirdParty/PostProcessing/Editor Resources/Monitors/WaveformCompute.compute similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor Resources/Monitors/WaveformCompute.compute rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor Resources/Monitors/WaveformCompute.compute diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor Resources/Monitors/WaveformCompute.compute.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Editor Resources/Monitors/WaveformCompute.compute.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor Resources/Monitors/WaveformCompute.compute.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor Resources/Monitors/WaveformCompute.compute.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor Resources/Monitors/WaveformRender.shader b/UnityProject/Assets/ThirdParty/PostProcessing/Editor Resources/Monitors/WaveformRender.shader similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor Resources/Monitors/WaveformRender.shader rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor Resources/Monitors/WaveformRender.shader diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/Fog.shader b/UnityProject/Assets/ThirdParty/PostProcessing/Editor Resources/Monitors/WaveformRender.shader.meta similarity index 55% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/Fog.shader rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor Resources/Monitors/WaveformRender.shader.meta index 862f79c..ec1bf1b 100644 --- a/UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/Fog.shader +++ b/UnityProject/Assets/ThirdParty/PostProcessing/Editor Resources/Monitors/WaveformRender.shader.meta @@ -1,9 +1,9 @@ -fileFormatVersion: 2 -guid: 613b4036a9f55c34fb054bde02455e46 -timeCreated: 1462350552 -licenseType: Store -ShaderImporter: - defaultTextures: [] - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 8b3e43c50424ab2428a9c172843bc66d +timeCreated: 1459956391 +licenseType: Pro +ShaderImporter: + defaultTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor Resources/UI.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Editor Resources/UI.meta similarity index 54% rename from UnityProject/Assets/!ext/PostProcessing/Editor Resources/UI.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor Resources/UI.meta index f67ae0d..b0c7e94 100644 --- a/UnityProject/Assets/!ext/PostProcessing/Editor Resources/UI.meta +++ b/UnityProject/Assets/ThirdParty/PostProcessing/Editor Resources/UI.meta @@ -1,9 +1,8 @@ -fileFormatVersion: 2 -guid: e7358848dd8737c459f4636f1c075835 -folderAsset: yes -timeCreated: 1460361782 -licenseType: Store -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: df37d60cc69b7b04d9705a74938179e7 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor Resources/UI/CurveBackground.shader b/UnityProject/Assets/ThirdParty/PostProcessing/Editor Resources/UI/CurveBackground.shader similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor Resources/UI/CurveBackground.shader rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor Resources/UI/CurveBackground.shader diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor Resources/UI/CurveBackground.shader.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Editor Resources/UI/CurveBackground.shader.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor Resources/UI/CurveBackground.shader.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor Resources/UI/CurveBackground.shader.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor Resources/UI/MotionBlendingIcon.png b/UnityProject/Assets/ThirdParty/PostProcessing/Editor Resources/UI/MotionBlendingIcon.png similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor Resources/UI/MotionBlendingIcon.png rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor Resources/UI/MotionBlendingIcon.png diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor Resources/UI/MotionBlendingIcon.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Editor Resources/UI/MotionBlendingIcon.png.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor Resources/UI/MotionBlendingIcon.png.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor Resources/UI/MotionBlendingIcon.png.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor Resources/UI/Trackball.shader b/UnityProject/Assets/ThirdParty/PostProcessing/Editor Resources/UI/Trackball.shader similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor Resources/UI/Trackball.shader rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor Resources/UI/Trackball.shader diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/ScreenSpaceRaytrace.cginc b/UnityProject/Assets/ThirdParty/PostProcessing/Editor Resources/UI/Trackball.shader.meta similarity index 55% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/ScreenSpaceRaytrace.cginc rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor Resources/UI/Trackball.shader.meta index 84ff8a2..d46548a 100644 --- a/UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/ScreenSpaceRaytrace.cginc +++ b/UnityProject/Assets/ThirdParty/PostProcessing/Editor Resources/UI/Trackball.shader.meta @@ -1,9 +1,9 @@ -fileFormatVersion: 2 -guid: a92d6fdbe2c35f94190497c18b88f9af -timeCreated: 1464350148 -licenseType: Store -ShaderImporter: - defaultTextures: [] - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 4bf49309c7ab9eb42a86774d2c09b4fa +timeCreated: 1460627788 +licenseType: Pro +ShaderImporter: + defaultTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Editor.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor/Attributes.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Attributes.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor/Attributes.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor/Attributes.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor/Attributes/PostProcessingModelEditorAttribute.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Attributes/PostProcessingModelEditorAttribute.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor/Attributes/PostProcessingModelEditorAttribute.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor/Attributes/PostProcessingModelEditorAttribute.cs diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor/Attributes/PostProcessingModelEditorAttribute.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Attributes/PostProcessingModelEditorAttribute.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor/Attributes/PostProcessingModelEditorAttribute.cs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor/Attributes/PostProcessingModelEditorAttribute.cs.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor/Models.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor/Models.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor/Models/AmbientOcclusionModelEditor.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models/AmbientOcclusionModelEditor.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor/Models/AmbientOcclusionModelEditor.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models/AmbientOcclusionModelEditor.cs diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor/Models/AmbientOcclusionModelEditor.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models/AmbientOcclusionModelEditor.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor/Models/AmbientOcclusionModelEditor.cs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models/AmbientOcclusionModelEditor.cs.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor/Models/AntialiasingModelEditor.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models/AntialiasingModelEditor.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor/Models/AntialiasingModelEditor.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models/AntialiasingModelEditor.cs diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor/Models/AntialiasingModelEditor.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models/AntialiasingModelEditor.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor/Models/AntialiasingModelEditor.cs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models/AntialiasingModelEditor.cs.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor/Models/BloomModelEditor.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models/BloomModelEditor.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor/Models/BloomModelEditor.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models/BloomModelEditor.cs diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor/Monitors/WaveformMonitor.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models/BloomModelEditor.cs.meta similarity index 65% rename from UnityProject/Assets/!ext/PostProcessing/Editor/Monitors/WaveformMonitor.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models/BloomModelEditor.cs.meta index f8d2fd6..85bad16 100644 --- a/UnityProject/Assets/!ext/PostProcessing/Editor/Monitors/WaveformMonitor.cs +++ b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models/BloomModelEditor.cs.meta @@ -1,12 +1,12 @@ -fileFormatVersion: 2 -guid: 805119df0d94800418006c621cc99cc2 -timeCreated: 1461748750 -licenseType: Store -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: a95f3f10e7e437c49ade656f531b30d2 +timeCreated: 1467190133 +licenseType: Pro +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor/Models/BuiltinDebugViewsEditor.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models/BuiltinDebugViewsEditor.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor/Models/BuiltinDebugViewsEditor.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models/BuiltinDebugViewsEditor.cs diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor/Models/BuiltinDebugViewsEditor.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models/BuiltinDebugViewsEditor.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor/Models/BuiltinDebugViewsEditor.cs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models/BuiltinDebugViewsEditor.cs.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor/Models/ChromaticAberrationEditor.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models/ChromaticAberrationEditor.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor/Models/ChromaticAberrationEditor.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models/ChromaticAberrationEditor.cs diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor/Models/ChromaticAberrationEditor.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models/ChromaticAberrationEditor.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor/Models/ChromaticAberrationEditor.cs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models/ChromaticAberrationEditor.cs.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor/Models/ColorGradingModelEditor.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models/ColorGradingModelEditor.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor/Models/ColorGradingModelEditor.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models/ColorGradingModelEditor.cs diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor/Models/ColorGradingModelEditor.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models/ColorGradingModelEditor.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor/Models/ColorGradingModelEditor.cs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models/ColorGradingModelEditor.cs.meta diff --git a/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models/DefaultPostFxModelEditor.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models/DefaultPostFxModelEditor.cs new file mode 100644 index 0000000..06c1c22 --- /dev/null +++ b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models/DefaultPostFxModelEditor.cs @@ -0,0 +1,22 @@ +using System.Collections.Generic; + +namespace UnityEditor.PostProcessing +{ + public class DefaultPostFxModelEditor : PostProcessingModelEditor + { + List m_Properties = new List(); + + public override void OnEnable() + { + var iter = m_SettingsProperty.Copy().GetEnumerator(); + while (iter.MoveNext()) + m_Properties.Add(((SerializedProperty)iter.Current).Copy()); + } + + public override void OnInspectorGUI() + { + foreach (var property in m_Properties) + EditorGUILayout.PropertyField(property); + } + } +} diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor/PostProcessingInspector.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models/DefaultPostFxModelEditor.cs.meta similarity index 65% rename from UnityProject/Assets/!ext/PostProcessing/Editor/PostProcessingInspector.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models/DefaultPostFxModelEditor.cs.meta index c031010..4f39e17 100644 --- a/UnityProject/Assets/!ext/PostProcessing/Editor/PostProcessingInspector.cs +++ b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models/DefaultPostFxModelEditor.cs.meta @@ -1,12 +1,12 @@ -fileFormatVersion: 2 -guid: 27fa95984763d9d47bbad59e7fdb66fe -timeCreated: 1467188923 -licenseType: Store -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: c15016a7fef58974f91a6a4d6b132d94 +timeCreated: 1467190133 +licenseType: Pro +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor/Models/DepthOfFieldModelEditor.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models/DepthOfFieldModelEditor.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor/Models/DepthOfFieldModelEditor.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models/DepthOfFieldModelEditor.cs diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor/Models/DepthOfFieldModelEditor.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models/DepthOfFieldModelEditor.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor/Models/DepthOfFieldModelEditor.cs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models/DepthOfFieldModelEditor.cs.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor/Models/DitheringModelEditor.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models/DitheringModelEditor.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor/Models/DitheringModelEditor.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models/DitheringModelEditor.cs diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor/Models/DitheringModelEditor.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models/DitheringModelEditor.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor/Models/DitheringModelEditor.cs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models/DitheringModelEditor.cs.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor/Models/EyeAdaptationModelEditor.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models/EyeAdaptationModelEditor.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor/Models/EyeAdaptationModelEditor.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models/EyeAdaptationModelEditor.cs diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor/Models/EyeAdaptationModelEditor.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models/EyeAdaptationModelEditor.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor/Models/EyeAdaptationModelEditor.cs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models/EyeAdaptationModelEditor.cs.meta diff --git a/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models/FogModelEditor.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models/FogModelEditor.cs new file mode 100644 index 0000000..b5b17c4 --- /dev/null +++ b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models/FogModelEditor.cs @@ -0,0 +1,24 @@ +using UnityEngine.PostProcessing; + +namespace UnityEditor.PostProcessing +{ + using Settings = FogModel.Settings; + + [PostProcessingModelEditor(typeof(FogModel))] + public class FogModelEditor : PostProcessingModelEditor + { + SerializedProperty m_ExcludeSkybox; + + public override void OnEnable() + { + m_ExcludeSkybox = FindSetting((Settings x) => x.excludeSkybox); + } + + public override void OnInspectorGUI() + { + EditorGUILayout.HelpBox("This effect adds fog compatibility to the deferred rendering path; enabling it with the forward rendering path won't have any effect. Actual fog settings should be set in the Lighting panel.", MessageType.Info); + EditorGUILayout.PropertyField(m_ExcludeSkybox); + EditorGUI.indentLevel--; + } + } +} diff --git a/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models/FogModelEditor.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models/FogModelEditor.cs.meta new file mode 100644 index 0000000..258489b --- /dev/null +++ b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models/FogModelEditor.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 44a64b44ec891d24b96ed84d958c3d4f +timeCreated: 1487335049 +licenseType: Pro +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models/GrainModelEditor.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models/GrainModelEditor.cs new file mode 100644 index 0000000..9c7d169 --- /dev/null +++ b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models/GrainModelEditor.cs @@ -0,0 +1,31 @@ +using UnityEngine.PostProcessing; + +namespace UnityEditor.PostProcessing +{ + using Settings = GrainModel.Settings; + + [PostProcessingModelEditor(typeof(GrainModel))] + public class GrainModelEditor : PostProcessingModelEditor + { + SerializedProperty m_Colored; + SerializedProperty m_Intensity; + SerializedProperty m_Size; + SerializedProperty m_LuminanceContribution; + + public override void OnEnable() + { + m_Colored = FindSetting((Settings x) => x.colored); + m_Intensity = FindSetting((Settings x) => x.intensity); + m_Size = FindSetting((Settings x) => x.size); + m_LuminanceContribution = FindSetting((Settings x) => x.luminanceContribution); + } + + public override void OnInspectorGUI() + { + EditorGUILayout.PropertyField(m_Intensity); + EditorGUILayout.PropertyField(m_LuminanceContribution); + EditorGUILayout.PropertyField(m_Size); + EditorGUILayout.PropertyField(m_Colored); + } + } +} diff --git a/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models/GrainModelEditor.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models/GrainModelEditor.cs.meta new file mode 100644 index 0000000..46e9de5 --- /dev/null +++ b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models/GrainModelEditor.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 8330694e2c90c284f81153ac83b3cb4a +timeCreated: 1467190133 +licenseType: Pro +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor/Models/MotionBlurModelEditor.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models/MotionBlurModelEditor.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor/Models/MotionBlurModelEditor.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models/MotionBlurModelEditor.cs diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor/Models/MotionBlurModelEditor.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models/MotionBlurModelEditor.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor/Models/MotionBlurModelEditor.cs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models/MotionBlurModelEditor.cs.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor/Models/ScreenSpaceReflectionModelEditor.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models/ScreenSpaceReflectionModelEditor.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor/Models/ScreenSpaceReflectionModelEditor.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models/ScreenSpaceReflectionModelEditor.cs diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor/Models/ScreenSpaceReflectionModelEditor.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models/ScreenSpaceReflectionModelEditor.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor/Models/ScreenSpaceReflectionModelEditor.cs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models/ScreenSpaceReflectionModelEditor.cs.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor/Models/UserLutModelEditor.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models/UserLutModelEditor.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor/Models/UserLutModelEditor.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models/UserLutModelEditor.cs diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor/Models/UserLutModelEditor.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models/UserLutModelEditor.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor/Models/UserLutModelEditor.cs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models/UserLutModelEditor.cs.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor/Models/VignetteModelEditor.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models/VignetteModelEditor.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor/Models/VignetteModelEditor.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models/VignetteModelEditor.cs diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor/Models/VignetteModelEditor.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models/VignetteModelEditor.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor/Models/VignetteModelEditor.cs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor/Models/VignetteModelEditor.cs.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor/Monitors.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Monitors.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor/Monitors.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor/Monitors.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor/Monitors/HistogramMonitor.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Monitors/HistogramMonitor.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor/Monitors/HistogramMonitor.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor/Monitors/HistogramMonitor.cs diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor/Monitors/HistogramMonitor.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Monitors/HistogramMonitor.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor/Monitors/HistogramMonitor.cs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor/Monitors/HistogramMonitor.cs.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor/Monitors/ParadeMonitor.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Monitors/ParadeMonitor.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor/Monitors/ParadeMonitor.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor/Monitors/ParadeMonitor.cs diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor/Monitors/ParadeMonitor.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Monitors/ParadeMonitor.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor/Monitors/ParadeMonitor.cs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor/Monitors/ParadeMonitor.cs.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor/Monitors/VectorscopeMonitor.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Monitors/VectorscopeMonitor.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor/Monitors/VectorscopeMonitor.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor/Monitors/VectorscopeMonitor.cs diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor/Monitors/VectorscopeMonitor.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Monitors/VectorscopeMonitor.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor/Monitors/VectorscopeMonitor.cs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor/Monitors/VectorscopeMonitor.cs.meta diff --git a/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Monitors/WaveformMonitor.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Monitors/WaveformMonitor.cs new file mode 100644 index 0000000..98d3f8e --- /dev/null +++ b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Monitors/WaveformMonitor.cs @@ -0,0 +1,280 @@ +using UnityEditorInternal; +using UnityEngine; +using UnityEngine.PostProcessing; + +namespace UnityEditor.PostProcessing +{ + public class WaveformMonitor : PostProcessingMonitor + { + static GUIContent s_MonitorTitle = new GUIContent("Waveform"); + + ComputeShader m_ComputeShader; + ComputeBuffer m_Buffer; + Material m_Material; + RenderTexture m_WaveformTexture; + Rect m_MonitorAreaRect; + + public WaveformMonitor() + { + m_ComputeShader = EditorResources.Load("Monitors/WaveformCompute.compute"); + } + + public override void Dispose() + { + GraphicsUtils.Destroy(m_Material); + GraphicsUtils.Destroy(m_WaveformTexture); + + if (m_Buffer != null) + m_Buffer.Release(); + + m_Material = null; + m_WaveformTexture = null; + m_Buffer = null; + } + + public override bool IsSupported() + { + return m_ComputeShader != null && GraphicsUtils.supportsDX11; + } + + public override GUIContent GetMonitorTitle() + { + return s_MonitorTitle; + } + + public override void OnMonitorSettings() + { + EditorGUI.BeginChangeCheck(); + + bool refreshOnPlay = m_MonitorSettings.refreshOnPlay; + float exposure = m_MonitorSettings.waveformExposure; + bool Y = m_MonitorSettings.waveformY; + bool R = m_MonitorSettings.waveformR; + bool G = m_MonitorSettings.waveformG; + bool B = m_MonitorSettings.waveformB; + + refreshOnPlay = GUILayout.Toggle(refreshOnPlay, new GUIContent(FxStyles.playIcon, "Keep refreshing the waveform in play mode; this may impact performances."), FxStyles.preButton); + + exposure = GUILayout.HorizontalSlider(exposure, 0.05f, 0.3f, FxStyles.preSlider, FxStyles.preSliderThumb, GUILayout.Width(40f)); + + Y = GUILayout.Toggle(Y, new GUIContent("Y", "Show the luminance waveform only."), FxStyles.preButton); + + if (Y) + { + R = false; + G = false; + B = false; + } + + R = GUILayout.Toggle(R, new GUIContent("R", "Show the red waveform."), FxStyles.preButton); + G = GUILayout.Toggle(G, new GUIContent("G", "Show the green waveform."), FxStyles.preButton); + B = GUILayout.Toggle(B, new GUIContent("B", "Show the blue waveform."), FxStyles.preButton); + + if (R || G || B) + Y = false; + + if (!Y && !R && !G && !B) + { + R = true; + G = true; + B = true; + } + + if (EditorGUI.EndChangeCheck()) + { + Undo.RecordObject(m_BaseEditor.serializedObject.targetObject, "Waveforme Settings Changed"); + m_MonitorSettings.refreshOnPlay = refreshOnPlay; + m_MonitorSettings.waveformExposure = exposure; + m_MonitorSettings.waveformY = Y; + m_MonitorSettings.waveformR = R; + m_MonitorSettings.waveformG = G; + m_MonitorSettings.waveformB = B; + InternalEditorUtility.RepaintAllViews(); + } + } + + public override void OnMonitorGUI(Rect r) + { + if (Event.current.type == EventType.Repaint) + { + // If m_MonitorAreaRect isn't set the preview was just opened so refresh the render to get the waveform data + if (Mathf.Approximately(m_MonitorAreaRect.width, 0) && Mathf.Approximately(m_MonitorAreaRect.height, 0)) + InternalEditorUtility.RepaintAllViews(); + + // Sizing + float width = m_WaveformTexture != null + ? Mathf.Min(m_WaveformTexture.width, r.width - 65f) + : r.width; + float height = m_WaveformTexture != null + ? Mathf.Min(m_WaveformTexture.height, r.height - 45f) + : r.height; + + m_MonitorAreaRect = new Rect( + Mathf.Floor(r.x + r.width / 2f - width / 2f), + Mathf.Floor(r.y + r.height / 2f - height / 2f - 5f), + width, height + ); + + if (m_WaveformTexture != null) + { + m_Material.SetFloat("_Exposure", m_MonitorSettings.waveformExposure); + + var oldActive = RenderTexture.active; + Graphics.Blit(null, m_WaveformTexture, m_Material, 0); + RenderTexture.active = oldActive; + + Graphics.DrawTexture(m_MonitorAreaRect, m_WaveformTexture); + + var color = Color.white; + const float kTickSize = 5f; + + // Rect, lines & ticks points + // A B C D E + // P F + // O G + // N H + // M L K J I + + var A = new Vector3(m_MonitorAreaRect.x, m_MonitorAreaRect.y); + var E = new Vector3(A.x + m_MonitorAreaRect.width + 1f, m_MonitorAreaRect.y); + var I = new Vector3(E.x, E.y + m_MonitorAreaRect.height + 1f); + var M = new Vector3(A.x, I.y); + + var C = new Vector3(A.x + (E.x - A.x) / 2f, A.y); + var G = new Vector3(E.x, E.y + (I.y - E.y) / 2f); + var K = new Vector3(M.x + (I.x - M.x) / 2f, M.y); + var O = new Vector3(A.x, A.y + (M.y - A.y) / 2f); + + var P = new Vector3(A.x, A.y + (O.y - A.y) / 2f); + var F = new Vector3(E.x, E.y + (G.y - E.y) / 2f); + var N = new Vector3(A.x, O.y + (M.y - O.y) / 2f); + var H = new Vector3(E.x, G.y + (I.y - G.y) / 2f); + + var B = new Vector3(A.x + (C.x - A.x) / 2f, A.y); + var L = new Vector3(M.x + (K.x - M.x) / 2f, M.y); + var D = new Vector3(C.x + (E.x - C.x) / 2f, A.y); + var J = new Vector3(K.x + (I.x - K.x) / 2f, M.y); + + // Borders + Handles.color = color; + Handles.DrawLine(A, E); + Handles.DrawLine(E, I); + Handles.DrawLine(I, M); + Handles.DrawLine(M, new Vector3(A.x, A.y - 1f)); + + // Vertical ticks + Handles.DrawLine(A, new Vector3(A.x - kTickSize, A.y)); + Handles.DrawLine(P, new Vector3(P.x - kTickSize, P.y)); + Handles.DrawLine(O, new Vector3(O.x - kTickSize, O.y)); + Handles.DrawLine(N, new Vector3(N.x - kTickSize, N.y)); + Handles.DrawLine(M, new Vector3(M.x - kTickSize, M.y)); + + Handles.DrawLine(E, new Vector3(E.x + kTickSize, E.y)); + Handles.DrawLine(F, new Vector3(F.x + kTickSize, F.y)); + Handles.DrawLine(G, new Vector3(G.x + kTickSize, G.y)); + Handles.DrawLine(H, new Vector3(H.x + kTickSize, H.y)); + Handles.DrawLine(I, new Vector3(I.x + kTickSize, I.y)); + + // Horizontal ticks + Handles.DrawLine(A, new Vector3(A.x, A.y - kTickSize)); + Handles.DrawLine(B, new Vector3(B.x, B.y - kTickSize)); + Handles.DrawLine(C, new Vector3(C.x, C.y - kTickSize)); + Handles.DrawLine(D, new Vector3(D.x, D.y - kTickSize)); + Handles.DrawLine(E, new Vector3(E.x, E.y - kTickSize)); + + Handles.DrawLine(M, new Vector3(M.x, M.y + kTickSize)); + Handles.DrawLine(L, new Vector3(L.x, L.y + kTickSize)); + Handles.DrawLine(K, new Vector3(K.x, K.y + kTickSize)); + Handles.DrawLine(J, new Vector3(J.x, J.y + kTickSize)); + Handles.DrawLine(I, new Vector3(I.x, I.y + kTickSize)); + + // Labels + GUI.color = color; + GUI.Label(new Rect(A.x - kTickSize - 34f, A.y - 15f, 30f, 30f), "1.0", FxStyles.tickStyleRight); + GUI.Label(new Rect(O.x - kTickSize - 34f, O.y - 15f, 30f, 30f), "0.5", FxStyles.tickStyleRight); + GUI.Label(new Rect(M.x - kTickSize - 34f, M.y - 15f, 30f, 30f), "0.0", FxStyles.tickStyleRight); + + GUI.Label(new Rect(E.x + kTickSize + 4f, E.y - 15f, 30f, 30f), "1.0", FxStyles.tickStyleLeft); + GUI.Label(new Rect(G.x + kTickSize + 4f, G.y - 15f, 30f, 30f), "0.5", FxStyles.tickStyleLeft); + GUI.Label(new Rect(I.x + kTickSize + 4f, I.y - 15f, 30f, 30f), "0.0", FxStyles.tickStyleLeft); + + GUI.Label(new Rect(M.x - 15f, M.y + kTickSize - 4f, 30f, 30f), "0.0", FxStyles.tickStyleCenter); + GUI.Label(new Rect(K.x - 15f, K.y + kTickSize - 4f, 30f, 30f), "0.5", FxStyles.tickStyleCenter); + GUI.Label(new Rect(I.x - 15f, I.y + kTickSize - 4f, 30f, 30f), "1.0", FxStyles.tickStyleCenter); + } + } + } + + public override void OnFrameData(RenderTexture source) + { + if (Application.isPlaying && !m_MonitorSettings.refreshOnPlay) + return; + + if (Mathf.Approximately(m_MonitorAreaRect.width, 0) || Mathf.Approximately(m_MonitorAreaRect.height, 0)) + return; + + float ratio = (float)source.width / (float)source.height; + int h = 384; + int w = Mathf.FloorToInt(h * ratio); + + var rt = RenderTexture.GetTemporary(w, h, 0, source.format); + Graphics.Blit(source, rt); + ComputeWaveform(rt); + m_BaseEditor.Repaint(); + RenderTexture.ReleaseTemporary(rt); + } + + void CreateBuffer(int width, int height) + { + m_Buffer = new ComputeBuffer(width * height, sizeof(uint) << 2); + } + + void ComputeWaveform(RenderTexture source) + { + if (m_Buffer == null) + { + CreateBuffer(source.width, source.height); + } + else if (m_Buffer.count != (source.width * source.height)) + { + m_Buffer.Release(); + CreateBuffer(source.width, source.height); + } + + var channels = m_MonitorSettings.waveformY + ? new Vector4(0f, 0f, 0f, 1f) + : new Vector4(m_MonitorSettings.waveformR ? 1f : 0f, m_MonitorSettings.waveformG ? 1f : 0f, m_MonitorSettings.waveformB ? 1f : 0f, 0f); + + var cs = m_ComputeShader; + + int kernel = cs.FindKernel("KWaveformClear"); + cs.SetBuffer(kernel, "_Waveform", m_Buffer); + cs.Dispatch(kernel, source.width, 1, 1); + + kernel = cs.FindKernel("KWaveform"); + cs.SetBuffer(kernel, "_Waveform", m_Buffer); + cs.SetTexture(kernel, "_Source", source); + cs.SetInt("_IsLinear", GraphicsUtils.isLinearColorSpace ? 1 : 0); + cs.SetVector("_Channels", channels); + cs.Dispatch(kernel, source.width, 1, 1); + + if (m_WaveformTexture == null || m_WaveformTexture.width != source.width || m_WaveformTexture.height != source.height) + { + GraphicsUtils.Destroy(m_WaveformTexture); + m_WaveformTexture = new RenderTexture(source.width, source.height, 0, RenderTextureFormat.ARGB32, RenderTextureReadWrite.Linear) + { + hideFlags = HideFlags.DontSave, + wrapMode = TextureWrapMode.Clamp, + filterMode = FilterMode.Bilinear + }; + } + + if (m_Material == null) + m_Material = new Material(Shader.Find("Hidden/Post FX/Monitors/Waveform Render")) { hideFlags = HideFlags.DontSave }; + + m_Material.SetBuffer("_Waveform", m_Buffer); + m_Material.SetVector("_Size", new Vector2(m_WaveformTexture.width, m_WaveformTexture.height)); + m_Material.SetVector("_Channels", channels); + } + } +} diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor/Monitors/WaveformMonitor.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Monitors/WaveformMonitor.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor/Monitors/WaveformMonitor.cs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor/Monitors/WaveformMonitor.cs.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor/PostProcessingBehaviourEditor.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/PostProcessingBehaviourEditor.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor/PostProcessingBehaviourEditor.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor/PostProcessingBehaviourEditor.cs diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor/PostProcessingBehaviourEditor.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/PostProcessingBehaviourEditor.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor/PostProcessingBehaviourEditor.cs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor/PostProcessingBehaviourEditor.cs.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor/PostProcessingFactory.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/PostProcessingFactory.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor/PostProcessingFactory.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor/PostProcessingFactory.cs diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor/PostProcessingFactory.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/PostProcessingFactory.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor/PostProcessingFactory.cs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor/PostProcessingFactory.cs.meta diff --git a/UnityProject/Assets/ThirdParty/PostProcessing/Editor/PostProcessingInspector.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/PostProcessingInspector.cs new file mode 100644 index 0000000..b2baa94 --- /dev/null +++ b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/PostProcessingInspector.cs @@ -0,0 +1,208 @@ +using UnityEngine; +using UnityEngine.PostProcessing; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Reflection; + +namespace UnityEditor.PostProcessing +{ + //[CanEditMultipleObjects] + [CustomEditor(typeof(PostProcessingProfile))] + public class PostProcessingInspector : Editor + { + static GUIContent s_PreviewTitle = new GUIContent("Monitors"); + + PostProcessingProfile m_ConcreteTarget + { + get { return target as PostProcessingProfile; } + } + + int m_CurrentMonitorID + { + get { return m_ConcreteTarget.monitors.currentMonitorID; } + set { m_ConcreteTarget.monitors.currentMonitorID = value; } + } + + List m_Monitors; + GUIContent[] m_MonitorNames; + Dictionary m_CustomEditors = new Dictionary(); + + public bool IsInteractivePreviewOpened { get; private set; } + + void OnEnable() + { + if (target == null) + return; + + // Aggregate custom post-fx editors + var assembly = Assembly.GetAssembly(typeof(PostProcessingInspector)); + + var editorTypes = assembly.GetTypes() + .Where(x => x.IsDefined(typeof(PostProcessingModelEditorAttribute), false)); + + var customEditors = new Dictionary(); + foreach (var editor in editorTypes) + { + var attr = (PostProcessingModelEditorAttribute)editor.GetCustomAttributes(typeof(PostProcessingModelEditorAttribute), false)[0]; + var effectType = attr.type; + var alwaysEnabled = attr.alwaysEnabled; + + var editorInst = (PostProcessingModelEditor)Activator.CreateInstance(editor); + editorInst.alwaysEnabled = alwaysEnabled; + editorInst.profile = target as PostProcessingProfile; + editorInst.inspector = this; + customEditors.Add(effectType, editorInst); + } + + // ... and corresponding models + var baseType = target.GetType(); + var property = serializedObject.GetIterator(); + + while (property.Next(true)) + { + if (!property.hasChildren) + continue; + + var type = baseType; + var srcObject = ReflectionUtils.GetFieldValueFromPath(serializedObject.targetObject, ref type, property.propertyPath); + + if (srcObject == null) + continue; + + PostProcessingModelEditor editor; + if (customEditors.TryGetValue(type, out editor)) + { + var effect = (PostProcessingModel)srcObject; + + if (editor.alwaysEnabled) + effect.enabled = editor.alwaysEnabled; + + m_CustomEditors.Add(editor, effect); + editor.target = effect; + editor.serializedProperty = property.Copy(); + editor.OnPreEnable(); + } + } + + // Prepare monitors + m_Monitors = new List(); + + var monitors = new List + { + new HistogramMonitor(), + new WaveformMonitor(), + new ParadeMonitor(), + new VectorscopeMonitor() + }; + + var monitorNames = new List(); + + foreach (var monitor in monitors) + { + if (monitor.IsSupported()) + { + monitor.Init(m_ConcreteTarget.monitors, this); + m_Monitors.Add(monitor); + monitorNames.Add(monitor.GetMonitorTitle()); + } + } + + m_MonitorNames = monitorNames.ToArray(); + + if (m_Monitors.Count > 0) + m_ConcreteTarget.monitors.onFrameEndEditorOnly = OnFrameEnd; + } + + void OnDisable() + { + if (m_CustomEditors != null) + { + foreach (var editor in m_CustomEditors.Keys) + editor.OnDisable(); + + m_CustomEditors.Clear(); + } + + if (m_Monitors != null) + { + foreach (var monitor in m_Monitors) + monitor.Dispose(); + + m_Monitors.Clear(); + } + + if (m_ConcreteTarget != null) + m_ConcreteTarget.monitors.onFrameEndEditorOnly = null; + } + + void OnFrameEnd(RenderTexture source) + { + if (!IsInteractivePreviewOpened) + return; + + if (m_CurrentMonitorID < m_Monitors.Count) + m_Monitors[m_CurrentMonitorID].OnFrameData(source); + + IsInteractivePreviewOpened = false; + } + + public override void OnInspectorGUI() + { + serializedObject.Update(); + + // Handles undo/redo events first (before they get used by the editors' widgets) + var e = Event.current; + if (e.type == EventType.ValidateCommand && e.commandName == "UndoRedoPerformed") + { + foreach (var editor in m_CustomEditors) + editor.Value.OnValidate(); + } + + if (!m_ConcreteTarget.debugViews.IsModeActive(BuiltinDebugViewsModel.Mode.None)) + EditorGUILayout.HelpBox("A debug view is currently enabled. Changes done to an effect might not be visible.", MessageType.Info); + + foreach (var editor in m_CustomEditors) + { + EditorGUI.BeginChangeCheck(); + + editor.Key.OnGUI(); + + if (EditorGUI.EndChangeCheck()) + editor.Value.OnValidate(); + } + + serializedObject.ApplyModifiedProperties(); + } + + public override GUIContent GetPreviewTitle() + { + return s_PreviewTitle; + } + + public override bool HasPreviewGUI() + { + return GraphicsUtils.supportsDX11 && m_Monitors.Count > 0; + } + + public override void OnPreviewSettings() + { + using (new EditorGUILayout.HorizontalScope()) + { + if (m_CurrentMonitorID < m_Monitors.Count) + m_Monitors[m_CurrentMonitorID].OnMonitorSettings(); + + GUILayout.Space(5); + m_CurrentMonitorID = EditorGUILayout.Popup(m_CurrentMonitorID, m_MonitorNames, FxStyles.preDropdown, GUILayout.MaxWidth(100f)); + } + } + + public override void OnInteractivePreviewGUI(Rect r, GUIStyle background) + { + IsInteractivePreviewOpened = true; + + if (m_CurrentMonitorID < m_Monitors.Count) + m_Monitors[m_CurrentMonitorID].OnMonitorGUI(r); + } + } +} diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor/PostProcessingInspector.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/PostProcessingInspector.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor/PostProcessingInspector.cs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor/PostProcessingInspector.cs.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor/PostProcessingModelEditor.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/PostProcessingModelEditor.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor/PostProcessingModelEditor.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor/PostProcessingModelEditor.cs diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor/PostProcessingModelEditor.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/PostProcessingModelEditor.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor/PostProcessingModelEditor.cs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor/PostProcessingModelEditor.cs.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor/PostProcessingMonitor.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/PostProcessingMonitor.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor/PostProcessingMonitor.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor/PostProcessingMonitor.cs diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor/PostProcessingMonitor.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/PostProcessingMonitor.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor/PostProcessingMonitor.cs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor/PostProcessingMonitor.cs.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor/PropertyDrawers.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/PropertyDrawers.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor/PropertyDrawers.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor/PropertyDrawers.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor/PropertyDrawers/GetSetDrawer.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/PropertyDrawers/GetSetDrawer.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor/PropertyDrawers/GetSetDrawer.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor/PropertyDrawers/GetSetDrawer.cs diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor/PropertyDrawers/GetSetDrawer.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/PropertyDrawers/GetSetDrawer.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor/PropertyDrawers/GetSetDrawer.cs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor/PropertyDrawers/GetSetDrawer.cs.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor/PropertyDrawers/MinDrawer.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/PropertyDrawers/MinDrawer.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor/PropertyDrawers/MinDrawer.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor/PropertyDrawers/MinDrawer.cs diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor/PropertyDrawers/MinDrawer.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/PropertyDrawers/MinDrawer.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor/PropertyDrawers/MinDrawer.cs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor/PropertyDrawers/MinDrawer.cs.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor/PropertyDrawers/TrackballGroupDrawer.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/PropertyDrawers/TrackballGroupDrawer.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor/PropertyDrawers/TrackballGroupDrawer.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor/PropertyDrawers/TrackballGroupDrawer.cs diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor/PropertyDrawers/TrackballGroupDrawer.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/PropertyDrawers/TrackballGroupDrawer.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor/PropertyDrawers/TrackballGroupDrawer.cs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor/PropertyDrawers/TrackballGroupDrawer.cs.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor/Utils.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Utils.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor/Utils.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor/Utils.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor/Utils/CurveEditor.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Utils/CurveEditor.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor/Utils/CurveEditor.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor/Utils/CurveEditor.cs diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor/Utils/CurveEditor.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Utils/CurveEditor.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor/Utils/CurveEditor.cs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor/Utils/CurveEditor.cs.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor/Utils/EditorGUIHelper.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Utils/EditorGUIHelper.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor/Utils/EditorGUIHelper.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor/Utils/EditorGUIHelper.cs diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor/Utils/EditorGUIHelper.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Utils/EditorGUIHelper.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor/Utils/EditorGUIHelper.cs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor/Utils/EditorGUIHelper.cs.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor/Utils/EditorResources.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Utils/EditorResources.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor/Utils/EditorResources.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor/Utils/EditorResources.cs diff --git a/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Utils/EditorResources.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Utils/EditorResources.cs.meta new file mode 100644 index 0000000..cdcbe17 --- /dev/null +++ b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Utils/EditorResources.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: a66d7b0165140a1439be89b5afc000fb +timeCreated: 1476177015 +licenseType: Pro +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor/Utils/FxStyles.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Utils/FxStyles.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor/Utils/FxStyles.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor/Utils/FxStyles.cs diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor/Utils/FxStyles.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Utils/FxStyles.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor/Utils/FxStyles.cs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor/Utils/FxStyles.cs.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor/Utils/ReflectionUtils.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Utils/ReflectionUtils.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor/Utils/ReflectionUtils.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor/Utils/ReflectionUtils.cs diff --git a/UnityProject/Assets/!ext/PostProcessing/Editor/Utils/ReflectionUtils.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Editor/Utils/ReflectionUtils.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Editor/Utils/ReflectionUtils.cs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Editor/Utils/ReflectionUtils.cs.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/COPYING.txt b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/COPYING.txt similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/COPYING.txt rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/COPYING.txt diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/COPYING.txt.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/COPYING.txt.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/COPYING.txt.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/COPYING.txt.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_0.png b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_0.png similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_0.png rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_0.png diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_0.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_0.png.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_0.png.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_0.png.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_1.png b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_1.png similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_1.png rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_1.png diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_1.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_1.png.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_1.png.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_1.png.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_10.png b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_10.png similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_10.png rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_10.png diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_12.png b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_10.png.meta similarity index 92% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_12.png rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_10.png.meta index 5b64e30..b23f52c 100644 --- a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_12.png +++ b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_10.png.meta @@ -1,76 +1,76 @@ -fileFormatVersion: 2 -guid: 980acadb960f8424c94307ec0e585b4e -timeCreated: 1485107928 -licenseType: Store -TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 4 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 0 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - filterMode: 0 - aniso: -1 - mipBias: -1 - wrapMode: 0 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 100 - alphaUsage: 2 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 10 - textureShape: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - buildTarget: DefaultTexturePlatform - maxTextureSize: 64 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - - buildTarget: Standalone - maxTextureSize: 64 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: afe1e502240079342a0a980484b6da8b +timeCreated: 1485107928 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 0 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + filterMode: 0 + aniso: -1 + mipBias: -1 + wrapMode: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 2 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 10 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 64 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Standalone + maxTextureSize: 64 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_11.png b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_11.png similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_11.png rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_11.png diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_11.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_11.png.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_11.png.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_11.png.meta diff --git a/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_12.png b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_12.png new file mode 100644 index 0000000..2077a1a Binary files /dev/null and b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_12.png differ diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_12.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_12.png.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_12.png.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_12.png.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_13.png b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_13.png similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_13.png rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_13.png diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_13.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_13.png.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_13.png.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_13.png.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_14.png b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_14.png similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_14.png rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_14.png diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_14.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_14.png.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_14.png.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_14.png.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_15.png b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_15.png similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_15.png rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_15.png diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_15.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_15.png.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_15.png.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_15.png.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_16.png b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_16.png similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_16.png rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_16.png diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_16.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_16.png.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_16.png.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_16.png.meta diff --git a/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_17.png b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_17.png new file mode 100644 index 0000000..bdee0f8 Binary files /dev/null and b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_17.png differ diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_17.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_17.png.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_17.png.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_17.png.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_18.png b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_18.png similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_18.png rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_18.png diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_18.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_18.png.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_18.png.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_18.png.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_19.png b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_19.png similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_19.png rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_19.png diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_44.png b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_19.png.meta similarity index 92% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_44.png rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_19.png.meta index 7ee26ec..287174f 100644 --- a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_44.png +++ b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_19.png.meta @@ -1,76 +1,76 @@ -fileFormatVersion: 2 -guid: 71bc1b6b66e8b784b972199b7e90204e -timeCreated: 1485107928 -licenseType: Store -TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 4 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 0 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - filterMode: 0 - aniso: -1 - mipBias: -1 - wrapMode: 0 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 100 - alphaUsage: 2 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 10 - textureShape: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - buildTarget: DefaultTexturePlatform - maxTextureSize: 64 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - - buildTarget: Standalone - maxTextureSize: 64 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 729a3ae164bcb3b4380459386adcf331 +timeCreated: 1485107928 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 0 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + filterMode: 0 + aniso: -1 + mipBias: -1 + wrapMode: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 2 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 10 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 64 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Standalone + maxTextureSize: 64 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_2.png b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_2.png new file mode 100644 index 0000000..f5912ee Binary files /dev/null and b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_2.png differ diff --git a/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_2.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_2.png.meta new file mode 100644 index 0000000..cb29983 --- /dev/null +++ b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_2.png.meta @@ -0,0 +1,76 @@ +fileFormatVersion: 2 +guid: a469f920b21fc7c4fb5b950917ce2fb2 +timeCreated: 1485107928 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 0 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + filterMode: 0 + aniso: -1 + mipBias: -1 + wrapMode: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 2 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 10 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 64 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Standalone + maxTextureSize: 64 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_20.png b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_20.png new file mode 100644 index 0000000..1424899 Binary files /dev/null and b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_20.png differ diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_20.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_20.png.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_20.png.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_20.png.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_21.png b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_21.png similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_21.png rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_21.png diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_21.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_21.png.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_21.png.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_21.png.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_22.png b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_22.png similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_22.png rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_22.png diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_22.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_22.png.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_22.png.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_22.png.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_23.png b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_23.png similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_23.png rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_23.png diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_23.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_23.png.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_23.png.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_23.png.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_24.png b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_24.png similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_24.png rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_24.png diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_24.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_24.png.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_24.png.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_24.png.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_25.png b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_25.png similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_25.png rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_25.png diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_25.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_25.png.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_25.png.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_25.png.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_26.png b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_26.png similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_26.png rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_26.png diff --git a/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_26.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_26.png.meta new file mode 100644 index 0000000..331064b --- /dev/null +++ b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_26.png.meta @@ -0,0 +1,76 @@ +fileFormatVersion: 2 +guid: 09f6c01f98a3ded4daf1afc52a3c260f +timeCreated: 1485107928 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 0 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + filterMode: 0 + aniso: -1 + mipBias: -1 + wrapMode: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 2 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 10 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 64 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Standalone + maxTextureSize: 64 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_27.png b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_27.png similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_27.png rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_27.png diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_27.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_27.png.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_27.png.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_27.png.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_28.png b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_28.png similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_28.png rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_28.png diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_28.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_28.png.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_28.png.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_28.png.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_29.png b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_29.png similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_29.png rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_29.png diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_29.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_29.png.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_29.png.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_29.png.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_3.png b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_3.png similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_3.png rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_3.png diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_3.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_3.png.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_3.png.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_3.png.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_30.png b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_30.png similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_30.png rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_30.png diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_30.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_30.png.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_30.png.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_30.png.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_31.png b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_31.png similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_31.png rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_31.png diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_31.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_31.png.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_31.png.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_31.png.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_32.png b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_32.png similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_32.png rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_32.png diff --git a/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_32.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_32.png.meta new file mode 100644 index 0000000..c9e6833 --- /dev/null +++ b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_32.png.meta @@ -0,0 +1,76 @@ +fileFormatVersion: 2 +guid: 87a5e40cc271ea648b583616f6ebe7fe +timeCreated: 1485107928 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 0 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + filterMode: 0 + aniso: -1 + mipBias: -1 + wrapMode: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 2 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 10 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 64 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Standalone + maxTextureSize: 64 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_33.png b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_33.png similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_33.png rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_33.png diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_33.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_33.png.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_33.png.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_33.png.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_34.png b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_34.png similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_34.png rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_34.png diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_34.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_34.png.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_34.png.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_34.png.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_35.png b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_35.png similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_35.png rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_35.png diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_35.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_35.png.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_35.png.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_35.png.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_36.png b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_36.png similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_36.png rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_36.png diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_36.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_36.png.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_36.png.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_36.png.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_37.png b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_37.png similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_37.png rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_37.png diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_37.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_37.png.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_37.png.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_37.png.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_38.png b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_38.png similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_38.png rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_38.png diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_38.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_38.png.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_38.png.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_38.png.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_39.png b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_39.png similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_39.png rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_39.png diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_39.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_39.png.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_39.png.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_39.png.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_4.png b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_4.png similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_4.png rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_4.png diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_4.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_4.png.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_4.png.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_4.png.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_40.png b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_40.png similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_40.png rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_40.png diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_40.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_40.png.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_40.png.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_40.png.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_41.png b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_41.png similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_41.png rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_41.png diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_41.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_41.png.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_41.png.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_41.png.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_42.png b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_42.png similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_42.png rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_42.png diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_42.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_42.png.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_42.png.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_42.png.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_43.png b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_43.png similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_43.png rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_43.png diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_43.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_43.png.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_43.png.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_43.png.meta diff --git a/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_44.png b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_44.png new file mode 100644 index 0000000..765c014 Binary files /dev/null and b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_44.png differ diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_44.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_44.png.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_44.png.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_44.png.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_45.png b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_45.png similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_45.png rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_45.png diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_45.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_45.png.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_45.png.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_45.png.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_46.png b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_46.png similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_46.png rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_46.png diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_46.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_46.png.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_46.png.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_46.png.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_47.png b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_47.png similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_47.png rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_47.png diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_47.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_47.png.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_47.png.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_47.png.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_48.png b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_48.png similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_48.png rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_48.png diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_48.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_48.png.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_48.png.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_48.png.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_49.png b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_49.png similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_49.png rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_49.png diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_49.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_49.png.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_49.png.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_49.png.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_5.png b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_5.png similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_5.png rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_5.png diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_5.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_5.png.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_5.png.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_5.png.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_50.png b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_50.png similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_50.png rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_50.png diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_50.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_50.png.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_50.png.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_50.png.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_51.png b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_51.png similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_51.png rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_51.png diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_51.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_51.png.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_51.png.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_51.png.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_52.png b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_52.png similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_52.png rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_52.png diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_52.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_52.png.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_52.png.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_52.png.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_53.png b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_53.png similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_53.png rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_53.png diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_53.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_53.png.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_53.png.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_53.png.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_54.png b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_54.png similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_54.png rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_54.png diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_54.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_54.png.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_54.png.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_54.png.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_55.png b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_55.png similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_55.png rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_55.png diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_55.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_55.png.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_55.png.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_55.png.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_56.png b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_56.png similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_56.png rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_56.png diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_56.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_56.png.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_56.png.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_56.png.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_57.png b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_57.png similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_57.png rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_57.png diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_57.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_57.png.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_57.png.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_57.png.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_58.png b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_58.png similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_58.png rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_58.png diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_58.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_58.png.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_58.png.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_58.png.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_59.png b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_59.png similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_59.png rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_59.png diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_59.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_59.png.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_59.png.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_59.png.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_6.png b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_6.png similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_6.png rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_6.png diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_6.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_6.png.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_6.png.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_6.png.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_60.png b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_60.png similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_60.png rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_60.png diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_60.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_60.png.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_60.png.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_60.png.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_61.png b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_61.png similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_61.png rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_61.png diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_61.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_61.png.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_61.png.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_61.png.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_62.png b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_62.png similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_62.png rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_62.png diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_62.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_62.png.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_62.png.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_62.png.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_63.png b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_63.png similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_63.png rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_63.png diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_63.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_63.png.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_63.png.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_63.png.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_7.png b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_7.png similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_7.png rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_7.png diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_7.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_7.png.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_7.png.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_7.png.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_8.png b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_8.png similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_8.png rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_8.png diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_8.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_8.png.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_8.png.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_8.png.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_9.png b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_9.png similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_9.png rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_9.png diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_9.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_9.png.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LDR_LLL1_9.png.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LDR_LLL1_9.png.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LICENSE.txt b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LICENSE.txt similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LICENSE.txt rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LICENSE.txt diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LICENSE.txt.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LICENSE.txt.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Bluenoise64/LICENSE.txt.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Bluenoise64/LICENSE.txt.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Shaders.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Shaders.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/ACES.cginc b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/ACES.cginc similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/ACES.cginc rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/ACES.cginc diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/ACES.cginc.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/ACES.cginc.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/ACES.cginc.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/ACES.cginc.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/AmbientOcclusion.cginc b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/AmbientOcclusion.cginc similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/AmbientOcclusion.cginc rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/AmbientOcclusion.cginc diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/AmbientOcclusion.cginc.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/AmbientOcclusion.cginc.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/AmbientOcclusion.cginc.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/AmbientOcclusion.cginc.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/AmbientOcclusion.shader b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/AmbientOcclusion.shader similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/AmbientOcclusion.shader rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/AmbientOcclusion.shader diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/AmbientOcclusion.shader.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/AmbientOcclusion.shader.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/AmbientOcclusion.shader.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/AmbientOcclusion.shader.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/Blit.shader b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/Blit.shader similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/Blit.shader rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/Blit.shader diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/Blit.shader.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/Blit.shader.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/Blit.shader.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/Blit.shader.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/Bloom.cginc b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/Bloom.cginc similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/Bloom.cginc rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/Bloom.cginc diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/Bloom.cginc.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/Bloom.cginc.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/Bloom.cginc.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/Bloom.cginc.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/Bloom.shader b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/Bloom.shader similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/Bloom.shader rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/Bloom.shader diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/Bloom.shader.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/Bloom.shader.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/Bloom.shader.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/Bloom.shader.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/BuiltinDebugViews.shader b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/BuiltinDebugViews.shader similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/BuiltinDebugViews.shader rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/BuiltinDebugViews.shader diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/BuiltinDebugViews.shader.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/BuiltinDebugViews.shader.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/BuiltinDebugViews.shader.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/BuiltinDebugViews.shader.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/ColorGrading.cginc b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/ColorGrading.cginc similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/ColorGrading.cginc rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/ColorGrading.cginc diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/ColorGrading.cginc.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/ColorGrading.cginc.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/ColorGrading.cginc.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/ColorGrading.cginc.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/Common.cginc b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/Common.cginc similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/Common.cginc rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/Common.cginc diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/Common.cginc.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/Common.cginc.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/Common.cginc.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/Common.cginc.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/DepthOfField.cginc b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/DepthOfField.cginc similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/DepthOfField.cginc rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/DepthOfField.cginc diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/FXAA3.cginc b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/DepthOfField.cginc.meta similarity index 55% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/FXAA3.cginc rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/DepthOfField.cginc.meta index 662df55..c5fa7b3 100644 --- a/UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/FXAA3.cginc +++ b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/DepthOfField.cginc.meta @@ -1,9 +1,9 @@ -fileFormatVersion: 2 -guid: 291f0d5b6045f4646847c59b4ce13ac5 -timeCreated: 1462350540 -licenseType: Store -ShaderImporter: - defaultTextures: [] - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: ddc2c19b8a216d748a357ffe32ba4dc1 +timeCreated: 1472211508 +licenseType: Pro +ShaderImporter: + defaultTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/DepthOfField.shader b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/DepthOfField.shader similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/DepthOfField.shader rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/DepthOfField.shader diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/DepthOfField.shader.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/DepthOfField.shader.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/DepthOfField.shader.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/DepthOfField.shader.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/DiskKernels.cginc b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/DiskKernels.cginc similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/DiskKernels.cginc rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/DiskKernels.cginc diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/DiskKernels.cginc.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/DiskKernels.cginc.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/DiskKernels.cginc.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/DiskKernels.cginc.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/EyeAdaptation.cginc b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/EyeAdaptation.cginc similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/EyeAdaptation.cginc rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/EyeAdaptation.cginc diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/EyeAdaptation.cginc.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/EyeAdaptation.cginc.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/EyeAdaptation.cginc.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/EyeAdaptation.cginc.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/EyeAdaptation.shader b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/EyeAdaptation.shader similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/EyeAdaptation.shader rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/EyeAdaptation.shader diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/EyeAdaptation.shader.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/EyeAdaptation.shader.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/EyeAdaptation.shader.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/EyeAdaptation.shader.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/EyeHistogram.compute b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/EyeHistogram.compute similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/EyeHistogram.compute rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/EyeHistogram.compute diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/EyeHistogram.compute.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/EyeHistogram.compute.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/EyeHistogram.compute.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/EyeHistogram.compute.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/FXAA.shader b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/FXAA.shader similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/FXAA.shader rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/FXAA.shader diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/FXAA.shader.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/FXAA.shader.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/FXAA.shader.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/FXAA.shader.meta diff --git a/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/FXAA3.cginc b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/FXAA3.cginc new file mode 100644 index 0000000..8b70f5d --- /dev/null +++ b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/FXAA3.cginc @@ -0,0 +1,2073 @@ +#ifndef __FXAA3_INC__ +#define __FXAA3_INC__ + +/*============================================================================ + + +NVIDIA FXAA 3.11 by TIMOTHY LOTTES + + +------------------------------------------------------------------------------ +COPYRIGHT (C) 2010, 2011 NVIDIA CORPORATION. ALL RIGHTS RESERVED. +------------------------------------------------------------------------------ +TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, THIS SOFTWARE IS PROVIDED +*AS IS* AND NVIDIA AND ITS SUPPLIERS DISCLAIM ALL WARRANTIES, EITHER EXPRESS +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL NVIDIA +OR ITS SUPPLIERS BE LIABLE FOR ANY SPECIAL, INCIDENTAL, INDIRECT, OR +CONSEQUENTIAL DAMAGES WHATSOEVER (INCLUDING, WITHOUT LIMITATION, DAMAGES FOR +LOSS OF BUSINESS PROFITS, BUSINESS INTERRUPTION, LOSS OF BUSINESS INFORMATION, +OR ANY OTHER PECUNIARY LOSS) ARISING OUT OF THE USE OF OR INABILITY TO USE +THIS SOFTWARE, EVEN IF NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + +------------------------------------------------------------------------------ +INTEGRATION CHECKLIST +------------------------------------------------------------------------------ +(1.) +In the shader source, setup defines for the desired configuration. +When providing multiple shaders (for different presets), +simply setup the defines differently in multiple files. +Example, + +#define FXAA_PC 1 +#define FXAA_HLSL_5 1 +#define FXAA_QUALITY__PRESET 12 + +Or, + +#define FXAA_360 1 + +Or, + +#define FXAA_PS3 1 + +Etc. + +(2.) +Then include this file, + +#include "Fxaa3_11.h" + +(3.) +Then call the FXAA pixel shader from within your desired shader. +Look at the FXAA Quality FxaaPixelShader() for docs on inputs. +As for FXAA 3.11 all inputs for all shaders are the same +to enable easy porting between platforms. + +return FxaaPixelShader(...); + +(4.) +Insure pass prior to FXAA outputs RGBL (see next section). +Or use, + +#define FXAA_GREEN_AS_LUMA 1 + +(5.) +Setup engine to provide the following constants +which are used in the FxaaPixelShader() inputs, + +FxaaFloat2 fxaaQualityRcpFrame, +FxaaFloat4 fxaaConsoleRcpFrameOpt, +FxaaFloat4 fxaaConsoleRcpFrameOpt2, +FxaaFloat4 fxaaConsole360RcpFrameOpt2, +FxaaFloat fxaaQualitySubpix, +FxaaFloat fxaaQualityEdgeThreshold, +FxaaFloat fxaaQualityEdgeThresholdMin, +FxaaFloat fxaaConsoleEdgeSharpness, +FxaaFloat fxaaConsoleEdgeThreshold, +FxaaFloat fxaaConsoleEdgeThresholdMin, +FxaaFloat4 fxaaConsole360ConstDir + +Look at the FXAA Quality FxaaPixelShader() for docs on inputs. + +(6.) +Have FXAA vertex shader run as a full screen triangle, +and output "pos" and "fxaaConsolePosPos" +such that inputs in the pixel shader provide, + +// {xy} = center of pixel +FxaaFloat2 pos, + +// {xy__} = upper left of pixel +// {__zw} = lower right of pixel +FxaaFloat4 fxaaConsolePosPos, + +(7.) +Insure the texture sampler(s) used by FXAA are set to bilinear filtering. + + +------------------------------------------------------------------------------ +INTEGRATION - RGBL AND COLORSPACE +------------------------------------------------------------------------------ +FXAA3 requires RGBL as input unless the following is set, + +#define FXAA_GREEN_AS_LUMA 1 + +In which case the engine uses green in place of luma, +and requires RGB input is in a non-linear colorspace. + +RGB should be LDR (low dynamic range). +Specifically do FXAA after tonemapping. + +RGB data as returned by a texture fetch can be non-linear, +or linear when FXAA_GREEN_AS_LUMA is not set. +Note an "sRGB format" texture counts as linear, +because the result of a texture fetch is linear data. +Regular "RGBA8" textures in the sRGB colorspace are non-linear. + +If FXAA_GREEN_AS_LUMA is not set, +luma must be stored in the alpha channel prior to running FXAA. +This luma should be in a perceptual space (could be gamma 2.0). +Example pass before FXAA where output is gamma 2.0 encoded, + +color.rgb = ToneMap(color.rgb); // linear color output +color.rgb = sqrt(color.rgb); // gamma 2.0 color output +return color; + +To use FXAA, + +color.rgb = ToneMap(color.rgb); // linear color output +color.rgb = sqrt(color.rgb); // gamma 2.0 color output +color.a = dot(color.rgb, FxaaFloat3(0.299, 0.587, 0.114)); // compute luma +return color; + +Another example where output is linear encoded, +say for instance writing to an sRGB formated render target, +where the render target does the conversion back to sRGB after blending, + +color.rgb = ToneMap(color.rgb); // linear color output +return color; + +To use FXAA, + +color.rgb = ToneMap(color.rgb); // linear color output +color.a = sqrt(dot(color.rgb, FxaaFloat3(0.299, 0.587, 0.114))); // compute luma +return color; + +Getting luma correct is required for the algorithm to work correctly. + + +------------------------------------------------------------------------------ +BEING LINEARLY CORRECT? +------------------------------------------------------------------------------ +Applying FXAA to a framebuffer with linear RGB color will look worse. +This is very counter intuitive, but happends to be true in this case. +The reason is because dithering artifacts will be more visiable +in a linear colorspace. + + +------------------------------------------------------------------------------ +COMPLEX INTEGRATION +------------------------------------------------------------------------------ +Q. What if the engine is blending into RGB before wanting to run FXAA? + +A. In the last opaque pass prior to FXAA, +have the pass write out luma into alpha. +Then blend into RGB only. +FXAA should be able to run ok +assuming the blending pass did not any add aliasing. +This should be the common case for particles and common blending passes. + +A. Or use FXAA_GREEN_AS_LUMA. + +============================================================================*/ + +/*============================================================================ + +INTEGRATION KNOBS + +============================================================================*/ +// +// FXAA_PS3 and FXAA_360 choose the console algorithm (FXAA3 CONSOLE). +// FXAA_360_OPT is a prototype for the new optimized 360 version. +// +// 1 = Use API. +// 0 = Don't use API. +// +/*--------------------------------------------------------------------------*/ +#ifndef FXAA_PS3 +#define FXAA_PS3 0 +#endif +/*--------------------------------------------------------------------------*/ +#ifndef FXAA_360 +#define FXAA_360 0 +#endif +/*--------------------------------------------------------------------------*/ +#ifndef FXAA_360_OPT +#define FXAA_360_OPT 0 +#endif +/*==========================================================================*/ +#ifndef FXAA_PC +// +// FXAA Quality +// The high quality PC algorithm. +// +#define FXAA_PC 0 +#endif +/*--------------------------------------------------------------------------*/ +#ifndef FXAA_PC_CONSOLE +// +// The console algorithm for PC is included +// for developers targeting really low spec machines. +// Likely better to just run FXAA_PC, and use a really low preset. +// +#define FXAA_PC_CONSOLE 0 +#endif +/*--------------------------------------------------------------------------*/ +#ifndef FXAA_GLSL_120 +#define FXAA_GLSL_120 0 +#endif +/*--------------------------------------------------------------------------*/ +#ifndef FXAA_GLSL_130 +#define FXAA_GLSL_130 0 +#endif +/*--------------------------------------------------------------------------*/ +#ifndef FXAA_HLSL_3 +#define FXAA_HLSL_3 0 +#endif +/*--------------------------------------------------------------------------*/ +#ifndef FXAA_HLSL_4 +#define FXAA_HLSL_4 0 +#endif +/*--------------------------------------------------------------------------*/ +#ifndef FXAA_HLSL_5 +#define FXAA_HLSL_5 0 +#endif +/*==========================================================================*/ +#ifndef FXAA_GREEN_AS_LUMA +// +// For those using non-linear color, +// and either not able to get luma in alpha, or not wanting to, +// this enables FXAA to run using green as a proxy for luma. +// So with this enabled, no need to pack luma in alpha. +// +// This will turn off AA on anything which lacks some amount of green. +// Pure red and blue or combination of only R and B, will get no AA. +// +// Might want to lower the settings for both, +// fxaaConsoleEdgeThresholdMin +// fxaaQualityEdgeThresholdMin +// In order to insure AA does not get turned off on colors +// which contain a minor amount of green. +// +// 1 = On. +// 0 = Off. +// +#define FXAA_GREEN_AS_LUMA 0 +#endif +/*--------------------------------------------------------------------------*/ +#ifndef FXAA_EARLY_EXIT +// +// Controls algorithm's early exit path. +// On PS3 turning this ON adds 2 cycles to the shader. +// On 360 turning this OFF adds 10ths of a millisecond to the shader. +// Turning this off on console will result in a more blurry image. +// So this defaults to on. +// +// 1 = On. +// 0 = Off. +// +#define FXAA_EARLY_EXIT 1 +#endif +/*--------------------------------------------------------------------------*/ +#ifndef FXAA_DISCARD +// +// Only valid for PC OpenGL currently. +// Probably will not work when FXAA_GREEN_AS_LUMA = 1. +// +// 1 = Use discard on pixels which don't need AA. +// For APIs which enable concurrent TEX+ROP from same surface. +// 0 = Return unchanged color on pixels which don't need AA. +// +#define FXAA_DISCARD 0 +#endif +/*--------------------------------------------------------------------------*/ +#ifndef FXAA_FAST_PIXEL_OFFSET +// +// Used for GLSL 120 only. +// +// 1 = GL API supports fast pixel offsets +// 0 = do not use fast pixel offsets +// +#ifdef GL_EXT_gpu_shader4 +#define FXAA_FAST_PIXEL_OFFSET 1 +#endif +#ifdef GL_NV_gpu_shader5 +#define FXAA_FAST_PIXEL_OFFSET 1 +#endif +#ifdef GL_ARB_gpu_shader5 +#define FXAA_FAST_PIXEL_OFFSET 1 +#endif +#ifndef FXAA_FAST_PIXEL_OFFSET +#define FXAA_FAST_PIXEL_OFFSET 0 +#endif +#endif +/*--------------------------------------------------------------------------*/ +#ifndef FXAA_GATHER4_ALPHA +// +// 1 = API supports gather4 on alpha channel. +// 0 = API does not support gather4 on alpha channel. +// +#if (FXAA_HLSL_5 == 1) +#define FXAA_GATHER4_ALPHA 1 +#endif +#ifdef GL_ARB_gpu_shader5 +#define FXAA_GATHER4_ALPHA 1 +#endif +#ifdef GL_NV_gpu_shader5 +#define FXAA_GATHER4_ALPHA 1 +#endif +#ifndef FXAA_GATHER4_ALPHA +#define FXAA_GATHER4_ALPHA 0 +#endif +#endif + +/*============================================================================ +FXAA CONSOLE PS3 - TUNING KNOBS +============================================================================*/ +#ifndef FXAA_CONSOLE__PS3_EDGE_SHARPNESS +// +// Consoles the sharpness of edges on PS3 only. +// Non-PS3 tuning is done with shader input. +// +// Due to the PS3 being ALU bound, +// there are only two safe values here: 4 and 8. +// These options use the shaders ability to a free *|/ by 2|4|8. +// +// 8.0 is sharper +// 4.0 is softer +// 2.0 is really soft (good for vector graphics inputs) +// +#if 1 +#define FXAA_CONSOLE__PS3_EDGE_SHARPNESS 8.0 +#endif +#if 0 +#define FXAA_CONSOLE__PS3_EDGE_SHARPNESS 4.0 +#endif +#if 0 +#define FXAA_CONSOLE__PS3_EDGE_SHARPNESS 2.0 +#endif +#endif +/*--------------------------------------------------------------------------*/ +#ifndef FXAA_CONSOLE__PS3_EDGE_THRESHOLD +// +// Only effects PS3. +// Non-PS3 tuning is done with shader input. +// +// The minimum amount of local contrast required to apply algorithm. +// The console setting has a different mapping than the quality setting. +// +// This only applies when FXAA_EARLY_EXIT is 1. +// +// Due to the PS3 being ALU bound, +// there are only two safe values here: 0.25 and 0.125. +// These options use the shaders ability to a free *|/ by 2|4|8. +// +// 0.125 leaves less aliasing, but is softer +// 0.25 leaves more aliasing, and is sharper +// +#if 1 +#define FXAA_CONSOLE__PS3_EDGE_THRESHOLD 0.125 +#else +#define FXAA_CONSOLE__PS3_EDGE_THRESHOLD 0.25 +#endif +#endif + +/*============================================================================ +FXAA QUALITY - TUNING KNOBS +------------------------------------------------------------------------------ +NOTE the other tuning knobs are now in the shader function inputs! +============================================================================*/ +#ifndef FXAA_QUALITY__PRESET +// +// Choose the quality preset. +// This needs to be compiled into the shader as it effects code. +// Best option to include multiple presets is to +// in each shader define the preset, then include this file. +// +// OPTIONS +// ----------------------------------------------------------------------- +// 10 to 15 - default medium dither (10=fastest, 15=highest quality) +// 20 to 29 - less dither, more expensive (20=fastest, 29=highest quality) +// 39 - no dither, very expensive +// +// NOTES +// ----------------------------------------------------------------------- +// 12 = slightly faster then FXAA 3.9 and higher edge quality (default) +// 13 = about same speed as FXAA 3.9 and better than 12 +// 23 = closest to FXAA 3.9 visually and performance wise +// _ = the lowest digit is directly related to performance +// _ = the highest digit is directly related to style +// +#define FXAA_QUALITY__PRESET 12 +#endif + + +/*============================================================================ + +FXAA QUALITY - PRESETS + +============================================================================*/ + +/*============================================================================ +FXAA QUALITY - MEDIUM DITHER PRESETS +============================================================================*/ +#if (FXAA_QUALITY__PRESET == 10) +#define FXAA_QUALITY__PS 3 +#define FXAA_QUALITY__P0 1.5 +#define FXAA_QUALITY__P1 3.0 +#define FXAA_QUALITY__P2 12.0 +#endif +/*--------------------------------------------------------------------------*/ +#if (FXAA_QUALITY__PRESET == 11) +#define FXAA_QUALITY__PS 4 +#define FXAA_QUALITY__P0 1.0 +#define FXAA_QUALITY__P1 1.5 +#define FXAA_QUALITY__P2 3.0 +#define FXAA_QUALITY__P3 12.0 +#endif +/*--------------------------------------------------------------------------*/ +#if (FXAA_QUALITY__PRESET == 12) +#define FXAA_QUALITY__PS 5 +#define FXAA_QUALITY__P0 1.0 +#define FXAA_QUALITY__P1 1.5 +#define FXAA_QUALITY__P2 2.0 +#define FXAA_QUALITY__P3 4.0 +#define FXAA_QUALITY__P4 12.0 +#endif +/*--------------------------------------------------------------------------*/ +#if (FXAA_QUALITY__PRESET == 13) +#define FXAA_QUALITY__PS 6 +#define FXAA_QUALITY__P0 1.0 +#define FXAA_QUALITY__P1 1.5 +#define FXAA_QUALITY__P2 2.0 +#define FXAA_QUALITY__P3 2.0 +#define FXAA_QUALITY__P4 4.0 +#define FXAA_QUALITY__P5 12.0 +#endif +/*--------------------------------------------------------------------------*/ +#if (FXAA_QUALITY__PRESET == 14) +#define FXAA_QUALITY__PS 7 +#define FXAA_QUALITY__P0 1.0 +#define FXAA_QUALITY__P1 1.5 +#define FXAA_QUALITY__P2 2.0 +#define FXAA_QUALITY__P3 2.0 +#define FXAA_QUALITY__P4 2.0 +#define FXAA_QUALITY__P5 4.0 +#define FXAA_QUALITY__P6 12.0 +#endif +/*--------------------------------------------------------------------------*/ +#if (FXAA_QUALITY__PRESET == 15) +#define FXAA_QUALITY__PS 8 +#define FXAA_QUALITY__P0 1.0 +#define FXAA_QUALITY__P1 1.5 +#define FXAA_QUALITY__P2 2.0 +#define FXAA_QUALITY__P3 2.0 +#define FXAA_QUALITY__P4 2.0 +#define FXAA_QUALITY__P5 2.0 +#define FXAA_QUALITY__P6 4.0 +#define FXAA_QUALITY__P7 12.0 +#endif + +/*============================================================================ +FXAA QUALITY - LOW DITHER PRESETS +============================================================================*/ +#if (FXAA_QUALITY__PRESET == 20) +#define FXAA_QUALITY__PS 3 +#define FXAA_QUALITY__P0 1.5 +#define FXAA_QUALITY__P1 2.0 +#define FXAA_QUALITY__P2 8.0 +#endif +/*--------------------------------------------------------------------------*/ +#if (FXAA_QUALITY__PRESET == 21) +#define FXAA_QUALITY__PS 4 +#define FXAA_QUALITY__P0 1.0 +#define FXAA_QUALITY__P1 1.5 +#define FXAA_QUALITY__P2 2.0 +#define FXAA_QUALITY__P3 8.0 +#endif +/*--------------------------------------------------------------------------*/ +#if (FXAA_QUALITY__PRESET == 22) +#define FXAA_QUALITY__PS 5 +#define FXAA_QUALITY__P0 1.0 +#define FXAA_QUALITY__P1 1.5 +#define FXAA_QUALITY__P2 2.0 +#define FXAA_QUALITY__P3 2.0 +#define FXAA_QUALITY__P4 8.0 +#endif +/*--------------------------------------------------------------------------*/ +#if (FXAA_QUALITY__PRESET == 23) +#define FXAA_QUALITY__PS 6 +#define FXAA_QUALITY__P0 1.0 +#define FXAA_QUALITY__P1 1.5 +#define FXAA_QUALITY__P2 2.0 +#define FXAA_QUALITY__P3 2.0 +#define FXAA_QUALITY__P4 2.0 +#define FXAA_QUALITY__P5 8.0 +#endif +/*--------------------------------------------------------------------------*/ +#if (FXAA_QUALITY__PRESET == 24) +#define FXAA_QUALITY__PS 7 +#define FXAA_QUALITY__P0 1.0 +#define FXAA_QUALITY__P1 1.5 +#define FXAA_QUALITY__P2 2.0 +#define FXAA_QUALITY__P3 2.0 +#define FXAA_QUALITY__P4 2.0 +#define FXAA_QUALITY__P5 3.0 +#define FXAA_QUALITY__P6 8.0 +#endif +/*--------------------------------------------------------------------------*/ +#if (FXAA_QUALITY__PRESET == 25) +#define FXAA_QUALITY__PS 8 +#define FXAA_QUALITY__P0 1.0 +#define FXAA_QUALITY__P1 1.5 +#define FXAA_QUALITY__P2 2.0 +#define FXAA_QUALITY__P3 2.0 +#define FXAA_QUALITY__P4 2.0 +#define FXAA_QUALITY__P5 2.0 +#define FXAA_QUALITY__P6 4.0 +#define FXAA_QUALITY__P7 8.0 +#endif +/*--------------------------------------------------------------------------*/ +#if (FXAA_QUALITY__PRESET == 26) +#define FXAA_QUALITY__PS 9 +#define FXAA_QUALITY__P0 1.0 +#define FXAA_QUALITY__P1 1.5 +#define FXAA_QUALITY__P2 2.0 +#define FXAA_QUALITY__P3 2.0 +#define FXAA_QUALITY__P4 2.0 +#define FXAA_QUALITY__P5 2.0 +#define FXAA_QUALITY__P6 2.0 +#define FXAA_QUALITY__P7 4.0 +#define FXAA_QUALITY__P8 8.0 +#endif +/*--------------------------------------------------------------------------*/ +#if (FXAA_QUALITY__PRESET == 27) +#define FXAA_QUALITY__PS 10 +#define FXAA_QUALITY__P0 1.0 +#define FXAA_QUALITY__P1 1.5 +#define FXAA_QUALITY__P2 2.0 +#define FXAA_QUALITY__P3 2.0 +#define FXAA_QUALITY__P4 2.0 +#define FXAA_QUALITY__P5 2.0 +#define FXAA_QUALITY__P6 2.0 +#define FXAA_QUALITY__P7 2.0 +#define FXAA_QUALITY__P8 4.0 +#define FXAA_QUALITY__P9 8.0 +#endif +/*--------------------------------------------------------------------------*/ +#if (FXAA_QUALITY__PRESET == 28) +#define FXAA_QUALITY__PS 11 +#define FXAA_QUALITY__P0 1.0 +#define FXAA_QUALITY__P1 1.5 +#define FXAA_QUALITY__P2 2.0 +#define FXAA_QUALITY__P3 2.0 +#define FXAA_QUALITY__P4 2.0 +#define FXAA_QUALITY__P5 2.0 +#define FXAA_QUALITY__P6 2.0 +#define FXAA_QUALITY__P7 2.0 +#define FXAA_QUALITY__P8 2.0 +#define FXAA_QUALITY__P9 4.0 +#define FXAA_QUALITY__P10 8.0 +#endif +/*--------------------------------------------------------------------------*/ +#if (FXAA_QUALITY__PRESET == 29) +#define FXAA_QUALITY__PS 12 +#define FXAA_QUALITY__P0 1.0 +#define FXAA_QUALITY__P1 1.5 +#define FXAA_QUALITY__P2 2.0 +#define FXAA_QUALITY__P3 2.0 +#define FXAA_QUALITY__P4 2.0 +#define FXAA_QUALITY__P5 2.0 +#define FXAA_QUALITY__P6 2.0 +#define FXAA_QUALITY__P7 2.0 +#define FXAA_QUALITY__P8 2.0 +#define FXAA_QUALITY__P9 2.0 +#define FXAA_QUALITY__P10 4.0 +#define FXAA_QUALITY__P11 8.0 +#endif + +/*============================================================================ +FXAA QUALITY - EXTREME QUALITY +============================================================================*/ +#if (FXAA_QUALITY__PRESET == 39) +#define FXAA_QUALITY__PS 12 +#define FXAA_QUALITY__P0 1.0 +#define FXAA_QUALITY__P1 1.0 +#define FXAA_QUALITY__P2 1.0 +#define FXAA_QUALITY__P3 1.0 +#define FXAA_QUALITY__P4 1.0 +#define FXAA_QUALITY__P5 1.5 +#define FXAA_QUALITY__P6 2.0 +#define FXAA_QUALITY__P7 2.0 +#define FXAA_QUALITY__P8 2.0 +#define FXAA_QUALITY__P9 2.0 +#define FXAA_QUALITY__P10 4.0 +#define FXAA_QUALITY__P11 8.0 +#endif + + + +/*============================================================================ + +API PORTING + +============================================================================*/ +#if (FXAA_GLSL_120 == 1) || (FXAA_GLSL_130 == 1) +#define FxaaBool bool +#define FxaaDiscard discard +#define FxaaFloat float +#define FxaaFloat2 vec2 +#define FxaaFloat3 vec3 +#define FxaaFloat4 vec4 +#define FxaaHalf float +#define FxaaHalf2 vec2 +#define FxaaHalf3 vec3 +#define FxaaHalf4 vec4 +#define FxaaInt2 ivec2 +#define FxaaSat(x) clamp(x, 0.0, 1.0) +#define FxaaTex sampler2D +#else +#define FxaaBool bool +#define FxaaDiscard clip(-1) +#define FxaaFloat float +#define FxaaFloat2 float2 +#define FxaaFloat3 float3 +#define FxaaFloat4 float4 +#define FxaaHalf half +#define FxaaHalf2 half2 +#define FxaaHalf3 half3 +#define FxaaHalf4 half4 +#define FxaaSat(x) saturate(x) +#endif +/*--------------------------------------------------------------------------*/ +#if (FXAA_GLSL_120 == 1) +// Requires, +// #version 120 +// And at least, +// #extension GL_EXT_gpu_shader4 : enable +// (or set FXAA_FAST_PIXEL_OFFSET 1 to work like DX9) +#define FxaaTexTop(t, p) texture2DLod(t, p, 0.0) +#if (FXAA_FAST_PIXEL_OFFSET == 1) +#define FxaaTexOff(t, p, o, r) texture2DLodOffset(t, p, 0.0, o) +#else +#define FxaaTexOff(t, p, o, r) texture2DLod(t, p + (o * r), 0.0) +#endif +#if (FXAA_GATHER4_ALPHA == 1) +// use #extension GL_ARB_gpu_shader5 : enable +#define FxaaTexAlpha4(t, p) textureGather(t, p, 3) +#define FxaaTexOffAlpha4(t, p, o) textureGatherOffset(t, p, o, 3) +#define FxaaTexGreen4(t, p) textureGather(t, p, 1) +#define FxaaTexOffGreen4(t, p, o) textureGatherOffset(t, p, o, 1) +#endif +#endif +/*--------------------------------------------------------------------------*/ +#if (FXAA_GLSL_130 == 1) +// Requires "#version 130" or better +#define FxaaTexTop(t, p) textureLod(t, p, 0.0) +#define FxaaTexOff(t, p, o, r) textureLodOffset(t, p, 0.0, o) +#if (FXAA_GATHER4_ALPHA == 1) +// use #extension GL_ARB_gpu_shader5 : enable +#define FxaaTexAlpha4(t, p) textureGather(t, p, 3) +#define FxaaTexOffAlpha4(t, p, o) textureGatherOffset(t, p, o, 3) +#define FxaaTexGreen4(t, p) textureGather(t, p, 1) +#define FxaaTexOffGreen4(t, p, o) textureGatherOffset(t, p, o, 1) +#endif +#endif +/*--------------------------------------------------------------------------*/ +#if (FXAA_HLSL_3 == 1) || (FXAA_360 == 1) || (FXAA_PS3 == 1) +#define FxaaInt2 float2 +#define FxaaTex sampler2D +#define FxaaTexTop(t, p) tex2Dlod(t, float4(p, 0.0, 0.0)) +#define FxaaTexOff(t, p, o, r) tex2Dlod(t, float4(p + (o * r), 0, 0)) +#endif +/*--------------------------------------------------------------------------*/ +#if (FXAA_HLSL_4 == 1) +#define FxaaInt2 int2 +struct FxaaTex { SamplerState smpl; Texture2D tex; }; +#define FxaaTexTop(t, p) t.tex.SampleLevel(t.smpl, p, 0.0) +#define FxaaTexOff(t, p, o, r) t.tex.SampleLevel(t.smpl, p, 0.0, o) +#endif +/*--------------------------------------------------------------------------*/ +#if (FXAA_HLSL_5 == 1) +#define FxaaInt2 int2 +struct FxaaTex { SamplerState smpl; Texture2D tex; }; +#define FxaaTexTop(t, p) t.tex.SampleLevel(t.smpl, p, 0.0) +#define FxaaTexOff(t, p, o, r) t.tex.SampleLevel(t.smpl, p, 0.0, o) +#define FxaaTexAlpha4(t, p) t.tex.GatherAlpha(t.smpl, p) +#define FxaaTexOffAlpha4(t, p, o) t.tex.GatherAlpha(t.smpl, p, o) +#define FxaaTexGreen4(t, p) t.tex.GatherGreen(t.smpl, p) +#define FxaaTexOffGreen4(t, p, o) t.tex.GatherGreen(t.smpl, p, o) +#endif + + +/*============================================================================ +GREEN AS LUMA OPTION SUPPORT FUNCTION +============================================================================*/ +#if (FXAA_GREEN_AS_LUMA == 0) +FxaaFloat FxaaLuma(FxaaFloat4 rgba) { return rgba.w; } +#else +FxaaFloat FxaaLuma(FxaaFloat4 rgba) { return rgba.y; } +#endif + + + + +/*============================================================================ + +FXAA3 QUALITY - PC + +============================================================================*/ +#if (FXAA_PC == 1) +/*--------------------------------------------------------------------------*/ +FxaaFloat4 FxaaPixelShader( + // + // Use noperspective interpolation here (turn off perspective interpolation). + // {xy} = center of pixel + FxaaFloat2 pos, + // + // Used only for FXAA Console, and not used on the 360 version. + // Use noperspective interpolation here (turn off perspective interpolation). + // {xy__} = upper left of pixel + // {__zw} = lower right of pixel + FxaaFloat4 fxaaConsolePosPos, + // + // Input color texture. + // {rgb_} = color in linear or perceptual color space + // if (FXAA_GREEN_AS_LUMA == 0) + // {___a} = luma in perceptual color space (not linear) + FxaaTex tex, + // + // Only used on the optimized 360 version of FXAA Console. + // For everything but 360, just use the same input here as for "tex". + // For 360, same texture, just alias with a 2nd sampler. + // This sampler needs to have an exponent bias of -1. + FxaaTex fxaaConsole360TexExpBiasNegOne, + // + // Only used on the optimized 360 version of FXAA Console. + // For everything but 360, just use the same input here as for "tex". + // For 360, same texture, just alias with a 3nd sampler. + // This sampler needs to have an exponent bias of -2. + FxaaTex fxaaConsole360TexExpBiasNegTwo, + // + // Only used on FXAA Quality. + // This must be from a constant/uniform. + // {x_} = 1.0/screenWidthInPixels + // {_y} = 1.0/screenHeightInPixels + FxaaFloat2 fxaaQualityRcpFrame, + // + // Only used on FXAA Console. + // This must be from a constant/uniform. + // This effects sub-pixel AA quality and inversely sharpness. + // Where N ranges between, + // N = 0.50 (default) + // N = 0.33 (sharper) + // {x___} = -N/screenWidthInPixels + // {_y__} = -N/screenHeightInPixels + // {__z_} = N/screenWidthInPixels + // {___w} = N/screenHeightInPixels + FxaaFloat4 fxaaConsoleRcpFrameOpt, + // + // Only used on FXAA Console. + // Not used on 360, but used on PS3 and PC. + // This must be from a constant/uniform. + // {x___} = -2.0/screenWidthInPixels + // {_y__} = -2.0/screenHeightInPixels + // {__z_} = 2.0/screenWidthInPixels + // {___w} = 2.0/screenHeightInPixels + FxaaFloat4 fxaaConsoleRcpFrameOpt2, + // + // Only used on FXAA Console. + // Only used on 360 in place of fxaaConsoleRcpFrameOpt2. + // This must be from a constant/uniform. + // {x___} = 8.0/screenWidthInPixels + // {_y__} = 8.0/screenHeightInPixels + // {__z_} = -4.0/screenWidthInPixels + // {___w} = -4.0/screenHeightInPixels + FxaaFloat4 fxaaConsole360RcpFrameOpt2, + // + // Only used on FXAA Quality. + // This used to be the FXAA_QUALITY__SUBPIX define. + // It is here now to allow easier tuning. + // Choose the amount of sub-pixel aliasing removal. + // This can effect sharpness. + // 1.00 - upper limit (softer) + // 0.75 - default amount of filtering + // 0.50 - lower limit (sharper, less sub-pixel aliasing removal) + // 0.25 - almost off + // 0.00 - completely off + FxaaFloat fxaaQualitySubpix, + // + // Only used on FXAA Quality. + // This used to be the FXAA_QUALITY__EDGE_THRESHOLD define. + // It is here now to allow easier tuning. + // The minimum amount of local contrast required to apply algorithm. + // 0.333 - too little (faster) + // 0.250 - low quality + // 0.166 - default + // 0.125 - high quality + // 0.063 - overkill (slower) + FxaaFloat fxaaQualityEdgeThreshold, + // + // Only used on FXAA Quality. + // This used to be the FXAA_QUALITY__EDGE_THRESHOLD_MIN define. + // It is here now to allow easier tuning. + // Trims the algorithm from processing darks. + // 0.0833 - upper limit (default, the start of visible unfiltered edges) + // 0.0625 - high quality (faster) + // 0.0312 - visible limit (slower) + // Special notes when using FXAA_GREEN_AS_LUMA, + // Likely want to set this to zero. + // As colors that are mostly not-green + // will appear very dark in the green channel! + // Tune by looking at mostly non-green content, + // then start at zero and increase until aliasing is a problem. + FxaaFloat fxaaQualityEdgeThresholdMin, + // + // Only used on FXAA Console. + // This used to be the FXAA_CONSOLE__EDGE_SHARPNESS define. + // It is here now to allow easier tuning. + // This does not effect PS3, as this needs to be compiled in. + // Use FXAA_CONSOLE__PS3_EDGE_SHARPNESS for PS3. + // Due to the PS3 being ALU bound, + // there are only three safe values here: 2 and 4 and 8. + // These options use the shaders ability to a free *|/ by 2|4|8. + // For all other platforms can be a non-power of two. + // 8.0 is sharper (default!!!) + // 4.0 is softer + // 2.0 is really soft (good only for vector graphics inputs) + FxaaFloat fxaaConsoleEdgeSharpness, + // + // Only used on FXAA Console. + // This used to be the FXAA_CONSOLE__EDGE_THRESHOLD define. + // It is here now to allow easier tuning. + // This does not effect PS3, as this needs to be compiled in. + // Use FXAA_CONSOLE__PS3_EDGE_THRESHOLD for PS3. + // Due to the PS3 being ALU bound, + // there are only two safe values here: 1/4 and 1/8. + // These options use the shaders ability to a free *|/ by 2|4|8. + // The console setting has a different mapping than the quality setting. + // Other platforms can use other values. + // 0.125 leaves less aliasing, but is softer (default!!!) + // 0.25 leaves more aliasing, and is sharper + FxaaFloat fxaaConsoleEdgeThreshold, + // + // Only used on FXAA Console. + // This used to be the FXAA_CONSOLE__EDGE_THRESHOLD_MIN define. + // It is here now to allow easier tuning. + // Trims the algorithm from processing darks. + // The console setting has a different mapping than the quality setting. + // This only applies when FXAA_EARLY_EXIT is 1. + // This does not apply to PS3, + // PS3 was simplified to avoid more shader instructions. + // 0.06 - faster but more aliasing in darks + // 0.05 - default + // 0.04 - slower and less aliasing in darks + // Special notes when using FXAA_GREEN_AS_LUMA, + // Likely want to set this to zero. + // As colors that are mostly not-green + // will appear very dark in the green channel! + // Tune by looking at mostly non-green content, + // then start at zero and increase until aliasing is a problem. + FxaaFloat fxaaConsoleEdgeThresholdMin, + // + // Extra constants for 360 FXAA Console only. + // Use zeros or anything else for other platforms. + // These must be in physical constant registers and NOT immedates. + // Immedates will result in compiler un-optimizing. + // {xyzw} = float4(1.0, -1.0, 0.25, -0.25) + FxaaFloat4 fxaaConsole360ConstDir +) { + /*--------------------------------------------------------------------------*/ + FxaaFloat2 posM; + posM.x = pos.x; + posM.y = pos.y; +#if (FXAA_GATHER4_ALPHA == 1) +#if (FXAA_DISCARD == 0) + FxaaFloat4 rgbyM = FxaaTexTop(tex, posM); +#if (FXAA_GREEN_AS_LUMA == 0) +#define lumaM rgbyM.w +#else +#define lumaM rgbyM.y +#endif +#endif +#if (FXAA_GREEN_AS_LUMA == 0) + FxaaFloat4 luma4A = FxaaTexAlpha4(tex, posM); + FxaaFloat4 luma4B = FxaaTexOffAlpha4(tex, posM, FxaaInt2(-1, -1)); +#else + FxaaFloat4 luma4A = FxaaTexGreen4(tex, posM); + FxaaFloat4 luma4B = FxaaTexOffGreen4(tex, posM, FxaaInt2(-1, -1)); +#endif +#if (FXAA_DISCARD == 1) +#define lumaM luma4A.w +#endif +#define lumaE luma4A.z +#define lumaS luma4A.x +#define lumaSE luma4A.y +#define lumaNW luma4B.w +#define lumaN luma4B.z +#define lumaW luma4B.x +#else + FxaaFloat4 rgbyM = FxaaTexTop(tex, posM); +#if (FXAA_GREEN_AS_LUMA == 0) +#define lumaM rgbyM.w +#else +#define lumaM rgbyM.y +#endif + FxaaFloat lumaS = FxaaLuma(FxaaTexOff(tex, posM, FxaaInt2(0, 1), fxaaQualityRcpFrame.xy)); + FxaaFloat lumaE = FxaaLuma(FxaaTexOff(tex, posM, FxaaInt2(1, 0), fxaaQualityRcpFrame.xy)); + FxaaFloat lumaN = FxaaLuma(FxaaTexOff(tex, posM, FxaaInt2(0, -1), fxaaQualityRcpFrame.xy)); + FxaaFloat lumaW = FxaaLuma(FxaaTexOff(tex, posM, FxaaInt2(-1, 0), fxaaQualityRcpFrame.xy)); +#endif + /*--------------------------------------------------------------------------*/ + FxaaFloat maxSM = max(lumaS, lumaM); + FxaaFloat minSM = min(lumaS, lumaM); + FxaaFloat maxESM = max(lumaE, maxSM); + FxaaFloat minESM = min(lumaE, minSM); + FxaaFloat maxWN = max(lumaN, lumaW); + FxaaFloat minWN = min(lumaN, lumaW); + FxaaFloat rangeMax = max(maxWN, maxESM); + FxaaFloat rangeMin = min(minWN, minESM); + FxaaFloat rangeMaxScaled = rangeMax * fxaaQualityEdgeThreshold; + FxaaFloat range = rangeMax - rangeMin; + FxaaFloat rangeMaxClamped = max(fxaaQualityEdgeThresholdMin, rangeMaxScaled); + FxaaBool earlyExit = range < rangeMaxClamped; + /*--------------------------------------------------------------------------*/ + if (earlyExit) +#if (FXAA_DISCARD == 1) + FxaaDiscard; +#else + return rgbyM; +#endif + /*--------------------------------------------------------------------------*/ +#if (FXAA_GATHER4_ALPHA == 0) + FxaaFloat lumaNW = FxaaLuma(FxaaTexOff(tex, posM, FxaaInt2(-1, -1), fxaaQualityRcpFrame.xy)); + FxaaFloat lumaSE = FxaaLuma(FxaaTexOff(tex, posM, FxaaInt2(1, 1), fxaaQualityRcpFrame.xy)); + FxaaFloat lumaNE = FxaaLuma(FxaaTexOff(tex, posM, FxaaInt2(1, -1), fxaaQualityRcpFrame.xy)); + FxaaFloat lumaSW = FxaaLuma(FxaaTexOff(tex, posM, FxaaInt2(-1, 1), fxaaQualityRcpFrame.xy)); +#else + FxaaFloat lumaNE = FxaaLuma(FxaaTexOff(tex, posM, FxaaInt2(1, -1), fxaaQualityRcpFrame.xy)); + FxaaFloat lumaSW = FxaaLuma(FxaaTexOff(tex, posM, FxaaInt2(-1, 1), fxaaQualityRcpFrame.xy)); +#endif + /*--------------------------------------------------------------------------*/ + FxaaFloat lumaNS = lumaN + lumaS; + FxaaFloat lumaWE = lumaW + lumaE; + FxaaFloat subpixRcpRange = 1.0 / range; + FxaaFloat subpixNSWE = lumaNS + lumaWE; + FxaaFloat edgeHorz1 = (-2.0 * lumaM) + lumaNS; + FxaaFloat edgeVert1 = (-2.0 * lumaM) + lumaWE; + /*--------------------------------------------------------------------------*/ + FxaaFloat lumaNESE = lumaNE + lumaSE; + FxaaFloat lumaNWNE = lumaNW + lumaNE; + FxaaFloat edgeHorz2 = (-2.0 * lumaE) + lumaNESE; + FxaaFloat edgeVert2 = (-2.0 * lumaN) + lumaNWNE; + /*--------------------------------------------------------------------------*/ + FxaaFloat lumaNWSW = lumaNW + lumaSW; + FxaaFloat lumaSWSE = lumaSW + lumaSE; + FxaaFloat edgeHorz4 = (abs(edgeHorz1) * 2.0) + abs(edgeHorz2); + FxaaFloat edgeVert4 = (abs(edgeVert1) * 2.0) + abs(edgeVert2); + FxaaFloat edgeHorz3 = (-2.0 * lumaW) + lumaNWSW; + FxaaFloat edgeVert3 = (-2.0 * lumaS) + lumaSWSE; + FxaaFloat edgeHorz = abs(edgeHorz3) + edgeHorz4; + FxaaFloat edgeVert = abs(edgeVert3) + edgeVert4; + /*--------------------------------------------------------------------------*/ + FxaaFloat subpixNWSWNESE = lumaNWSW + lumaNESE; + FxaaFloat lengthSign = fxaaQualityRcpFrame.x; + FxaaBool horzSpan = edgeHorz >= edgeVert; + FxaaFloat subpixA = subpixNSWE * 2.0 + subpixNWSWNESE; + /*--------------------------------------------------------------------------*/ + if (!horzSpan) lumaN = lumaW; + if (!horzSpan) lumaS = lumaE; + if (horzSpan) lengthSign = fxaaQualityRcpFrame.y; + FxaaFloat subpixB = (subpixA * (1.0 / 12.0)) - lumaM; + /*--------------------------------------------------------------------------*/ + FxaaFloat gradientN = lumaN - lumaM; + FxaaFloat gradientS = lumaS - lumaM; + FxaaFloat lumaNN = lumaN + lumaM; + FxaaFloat lumaSS = lumaS + lumaM; + FxaaBool pairN = abs(gradientN) >= abs(gradientS); + FxaaFloat gradient = max(abs(gradientN), abs(gradientS)); + if (pairN) lengthSign = -lengthSign; + FxaaFloat subpixC = FxaaSat(abs(subpixB) * subpixRcpRange); + /*--------------------------------------------------------------------------*/ + FxaaFloat2 posB; + posB.x = posM.x; + posB.y = posM.y; + FxaaFloat2 offNP; + offNP.x = (!horzSpan) ? 0.0 : fxaaQualityRcpFrame.x; + offNP.y = (horzSpan) ? 0.0 : fxaaQualityRcpFrame.y; + if (!horzSpan) posB.x += lengthSign * 0.5; + if (horzSpan) posB.y += lengthSign * 0.5; + /*--------------------------------------------------------------------------*/ + FxaaFloat2 posN; + posN.x = posB.x - offNP.x * FXAA_QUALITY__P0; + posN.y = posB.y - offNP.y * FXAA_QUALITY__P0; + FxaaFloat2 posP; + posP.x = posB.x + offNP.x * FXAA_QUALITY__P0; + posP.y = posB.y + offNP.y * FXAA_QUALITY__P0; + FxaaFloat subpixD = ((-2.0)*subpixC) + 3.0; + FxaaFloat lumaEndN = FxaaLuma(FxaaTexTop(tex, posN)); + FxaaFloat subpixE = subpixC * subpixC; + FxaaFloat lumaEndP = FxaaLuma(FxaaTexTop(tex, posP)); + /*--------------------------------------------------------------------------*/ + if (!pairN) lumaNN = lumaSS; + FxaaFloat gradientScaled = gradient * 1.0 / 4.0; + FxaaFloat lumaMM = lumaM - lumaNN * 0.5; + FxaaFloat subpixF = subpixD * subpixE; + FxaaBool lumaMLTZero = lumaMM < 0.0; + /*--------------------------------------------------------------------------*/ + lumaEndN -= lumaNN * 0.5; + lumaEndP -= lumaNN * 0.5; + FxaaBool doneN = abs(lumaEndN) >= gradientScaled; + FxaaBool doneP = abs(lumaEndP) >= gradientScaled; + if (!doneN) posN.x -= offNP.x * FXAA_QUALITY__P1; + if (!doneN) posN.y -= offNP.y * FXAA_QUALITY__P1; + FxaaBool doneNP = (!doneN) || (!doneP); + if (!doneP) posP.x += offNP.x * FXAA_QUALITY__P1; + if (!doneP) posP.y += offNP.y * FXAA_QUALITY__P1; + /*--------------------------------------------------------------------------*/ + if (doneNP) + { + if (!doneN) lumaEndN = FxaaLuma(FxaaTexTop(tex, posN.xy)); + if (!doneP) lumaEndP = FxaaLuma(FxaaTexTop(tex, posP.xy)); + if (!doneN) lumaEndN = lumaEndN - lumaNN * 0.5; + if (!doneP) lumaEndP = lumaEndP - lumaNN * 0.5; + doneN = abs(lumaEndN) >= gradientScaled; + doneP = abs(lumaEndP) >= gradientScaled; + if (!doneN) posN.x -= offNP.x * FXAA_QUALITY__P2; + if (!doneN) posN.y -= offNP.y * FXAA_QUALITY__P2; + doneNP = (!doneN) || (!doneP); + if (!doneP) posP.x += offNP.x * FXAA_QUALITY__P2; + if (!doneP) posP.y += offNP.y * FXAA_QUALITY__P2; + /*--------------------------------------------------------------------------*/ +#if (FXAA_QUALITY__PS > 3) + if (doneNP) + { + if (!doneN) lumaEndN = FxaaLuma(FxaaTexTop(tex, posN.xy)); + if (!doneP) lumaEndP = FxaaLuma(FxaaTexTop(tex, posP.xy)); + if (!doneN) lumaEndN = lumaEndN - lumaNN * 0.5; + if (!doneP) lumaEndP = lumaEndP - lumaNN * 0.5; + doneN = abs(lumaEndN) >= gradientScaled; + doneP = abs(lumaEndP) >= gradientScaled; + if (!doneN) posN.x -= offNP.x * FXAA_QUALITY__P3; + if (!doneN) posN.y -= offNP.y * FXAA_QUALITY__P3; + doneNP = (!doneN) || (!doneP); + if (!doneP) posP.x += offNP.x * FXAA_QUALITY__P3; + if (!doneP) posP.y += offNP.y * FXAA_QUALITY__P3; + /*--------------------------------------------------------------------------*/ +#if (FXAA_QUALITY__PS > 4) + if (doneNP) + { + if (!doneN) lumaEndN = FxaaLuma(FxaaTexTop(tex, posN.xy)); + if (!doneP) lumaEndP = FxaaLuma(FxaaTexTop(tex, posP.xy)); + if (!doneN) lumaEndN = lumaEndN - lumaNN * 0.5; + if (!doneP) lumaEndP = lumaEndP - lumaNN * 0.5; + doneN = abs(lumaEndN) >= gradientScaled; + doneP = abs(lumaEndP) >= gradientScaled; + if (!doneN) posN.x -= offNP.x * FXAA_QUALITY__P4; + if (!doneN) posN.y -= offNP.y * FXAA_QUALITY__P4; + doneNP = (!doneN) || (!doneP); + if (!doneP) posP.x += offNP.x * FXAA_QUALITY__P4; + if (!doneP) posP.y += offNP.y * FXAA_QUALITY__P4; + /*--------------------------------------------------------------------------*/ +#if (FXAA_QUALITY__PS > 5) + if (doneNP) + { + if (!doneN) lumaEndN = FxaaLuma(FxaaTexTop(tex, posN.xy)); + if (!doneP) lumaEndP = FxaaLuma(FxaaTexTop(tex, posP.xy)); + if (!doneN) lumaEndN = lumaEndN - lumaNN * 0.5; + if (!doneP) lumaEndP = lumaEndP - lumaNN * 0.5; + doneN = abs(lumaEndN) >= gradientScaled; + doneP = abs(lumaEndP) >= gradientScaled; + if (!doneN) posN.x -= offNP.x * FXAA_QUALITY__P5; + if (!doneN) posN.y -= offNP.y * FXAA_QUALITY__P5; + doneNP = (!doneN) || (!doneP); + if (!doneP) posP.x += offNP.x * FXAA_QUALITY__P5; + if (!doneP) posP.y += offNP.y * FXAA_QUALITY__P5; + /*--------------------------------------------------------------------------*/ +#if (FXAA_QUALITY__PS > 6) + if (doneNP) + { + if (!doneN) lumaEndN = FxaaLuma(FxaaTexTop(tex, posN.xy)); + if (!doneP) lumaEndP = FxaaLuma(FxaaTexTop(tex, posP.xy)); + if (!doneN) lumaEndN = lumaEndN - lumaNN * 0.5; + if (!doneP) lumaEndP = lumaEndP - lumaNN * 0.5; + doneN = abs(lumaEndN) >= gradientScaled; + doneP = abs(lumaEndP) >= gradientScaled; + if (!doneN) posN.x -= offNP.x * FXAA_QUALITY__P6; + if (!doneN) posN.y -= offNP.y * FXAA_QUALITY__P6; + doneNP = (!doneN) || (!doneP); + if (!doneP) posP.x += offNP.x * FXAA_QUALITY__P6; + if (!doneP) posP.y += offNP.y * FXAA_QUALITY__P6; + /*--------------------------------------------------------------------------*/ +#if (FXAA_QUALITY__PS > 7) + if (doneNP) + { + if (!doneN) lumaEndN = FxaaLuma(FxaaTexTop(tex, posN.xy)); + if (!doneP) lumaEndP = FxaaLuma(FxaaTexTop(tex, posP.xy)); + if (!doneN) lumaEndN = lumaEndN - lumaNN * 0.5; + if (!doneP) lumaEndP = lumaEndP - lumaNN * 0.5; + doneN = abs(lumaEndN) >= gradientScaled; + doneP = abs(lumaEndP) >= gradientScaled; + if (!doneN) posN.x -= offNP.x * FXAA_QUALITY__P7; + if (!doneN) posN.y -= offNP.y * FXAA_QUALITY__P7; + doneNP = (!doneN) || (!doneP); + if (!doneP) posP.x += offNP.x * FXAA_QUALITY__P7; + if (!doneP) posP.y += offNP.y * FXAA_QUALITY__P7; + /*--------------------------------------------------------------------------*/ +#if (FXAA_QUALITY__PS > 8) + if (doneNP) + { + if (!doneN) lumaEndN = FxaaLuma(FxaaTexTop(tex, posN.xy)); + if (!doneP) lumaEndP = FxaaLuma(FxaaTexTop(tex, posP.xy)); + if (!doneN) lumaEndN = lumaEndN - lumaNN * 0.5; + if (!doneP) lumaEndP = lumaEndP - lumaNN * 0.5; + doneN = abs(lumaEndN) >= gradientScaled; + doneP = abs(lumaEndP) >= gradientScaled; + if (!doneN) posN.x -= offNP.x * FXAA_QUALITY__P8; + if (!doneN) posN.y -= offNP.y * FXAA_QUALITY__P8; + doneNP = (!doneN) || (!doneP); + if (!doneP) posP.x += offNP.x * FXAA_QUALITY__P8; + if (!doneP) posP.y += offNP.y * FXAA_QUALITY__P8; + /*--------------------------------------------------------------------------*/ +#if (FXAA_QUALITY__PS > 9) + if (doneNP) + { + if (!doneN) lumaEndN = FxaaLuma(FxaaTexTop(tex, posN.xy)); + if (!doneP) lumaEndP = FxaaLuma(FxaaTexTop(tex, posP.xy)); + if (!doneN) lumaEndN = lumaEndN - lumaNN * 0.5; + if (!doneP) lumaEndP = lumaEndP - lumaNN * 0.5; + doneN = abs(lumaEndN) >= gradientScaled; + doneP = abs(lumaEndP) >= gradientScaled; + if (!doneN) posN.x -= offNP.x * FXAA_QUALITY__P9; + if (!doneN) posN.y -= offNP.y * FXAA_QUALITY__P9; + doneNP = (!doneN) || (!doneP); + if (!doneP) posP.x += offNP.x * FXAA_QUALITY__P9; + if (!doneP) posP.y += offNP.y * FXAA_QUALITY__P9; + /*--------------------------------------------------------------------------*/ +#if (FXAA_QUALITY__PS > 10) + if (doneNP) + { + if (!doneN) lumaEndN = FxaaLuma(FxaaTexTop(tex, posN.xy)); + if (!doneP) lumaEndP = FxaaLuma(FxaaTexTop(tex, posP.xy)); + if (!doneN) lumaEndN = lumaEndN - lumaNN * 0.5; + if (!doneP) lumaEndP = lumaEndP - lumaNN * 0.5; + doneN = abs(lumaEndN) >= gradientScaled; + doneP = abs(lumaEndP) >= gradientScaled; + if (!doneN) posN.x -= offNP.x * FXAA_QUALITY__P10; + if (!doneN) posN.y -= offNP.y * FXAA_QUALITY__P10; + doneNP = (!doneN) || (!doneP); + if (!doneP) posP.x += offNP.x * FXAA_QUALITY__P10; + if (!doneP) posP.y += offNP.y * FXAA_QUALITY__P10; + /*--------------------------------------------------------------------------*/ +#if (FXAA_QUALITY__PS > 11) + if (doneNP) + { + if (!doneN) lumaEndN = FxaaLuma(FxaaTexTop(tex, posN.xy)); + if (!doneP) lumaEndP = FxaaLuma(FxaaTexTop(tex, posP.xy)); + if (!doneN) lumaEndN = lumaEndN - lumaNN * 0.5; + if (!doneP) lumaEndP = lumaEndP - lumaNN * 0.5; + doneN = abs(lumaEndN) >= gradientScaled; + doneP = abs(lumaEndP) >= gradientScaled; + if (!doneN) posN.x -= offNP.x * FXAA_QUALITY__P11; + if (!doneN) posN.y -= offNP.y * FXAA_QUALITY__P11; + doneNP = (!doneN) || (!doneP); + if (!doneP) posP.x += offNP.x * FXAA_QUALITY__P11; + if (!doneP) posP.y += offNP.y * FXAA_QUALITY__P11; + /*--------------------------------------------------------------------------*/ +#if (FXAA_QUALITY__PS > 12) + if (doneNP) + { + if (!doneN) lumaEndN = FxaaLuma(FxaaTexTop(tex, posN.xy)); + if (!doneP) lumaEndP = FxaaLuma(FxaaTexTop(tex, posP.xy)); + if (!doneN) lumaEndN = lumaEndN - lumaNN * 0.5; + if (!doneP) lumaEndP = lumaEndP - lumaNN * 0.5; + doneN = abs(lumaEndN) >= gradientScaled; + doneP = abs(lumaEndP) >= gradientScaled; + if (!doneN) posN.x -= offNP.x * FXAA_QUALITY__P12; + if (!doneN) posN.y -= offNP.y * FXAA_QUALITY__P12; + doneNP = (!doneN) || (!doneP); + if (!doneP) posP.x += offNP.x * FXAA_QUALITY__P12; + if (!doneP) posP.y += offNP.y * FXAA_QUALITY__P12; + /*--------------------------------------------------------------------------*/ + } +#endif + /*--------------------------------------------------------------------------*/ + } +#endif + /*--------------------------------------------------------------------------*/ + } +#endif + /*--------------------------------------------------------------------------*/ + } +#endif + /*--------------------------------------------------------------------------*/ + } +#endif + /*--------------------------------------------------------------------------*/ + } +#endif + /*--------------------------------------------------------------------------*/ + } +#endif + /*--------------------------------------------------------------------------*/ + } +#endif + /*--------------------------------------------------------------------------*/ + } +#endif + /*--------------------------------------------------------------------------*/ + } +#endif + /*--------------------------------------------------------------------------*/ + } + /*--------------------------------------------------------------------------*/ + FxaaFloat dstN = posM.x - posN.x; + FxaaFloat dstP = posP.x - posM.x; + if (!horzSpan) dstN = posM.y - posN.y; + if (!horzSpan) dstP = posP.y - posM.y; + /*--------------------------------------------------------------------------*/ + FxaaBool goodSpanN = (lumaEndN < 0.0) != lumaMLTZero; + FxaaFloat spanLength = (dstP + dstN); + FxaaBool goodSpanP = (lumaEndP < 0.0) != lumaMLTZero; + FxaaFloat spanLengthRcp = 1.0 / spanLength; + /*--------------------------------------------------------------------------*/ + FxaaBool directionN = dstN < dstP; + FxaaFloat dst = min(dstN, dstP); + FxaaBool goodSpan = directionN ? goodSpanN : goodSpanP; + FxaaFloat subpixG = subpixF * subpixF; + FxaaFloat pixelOffset = (dst * (-spanLengthRcp)) + 0.5; + FxaaFloat subpixH = subpixG * fxaaQualitySubpix; + /*--------------------------------------------------------------------------*/ + FxaaFloat pixelOffsetGood = goodSpan ? pixelOffset : 0.0; + FxaaFloat pixelOffsetSubpix = max(pixelOffsetGood, subpixH); + if (!horzSpan) posM.x += pixelOffsetSubpix * lengthSign; + if (horzSpan) posM.y += pixelOffsetSubpix * lengthSign; +#if (FXAA_DISCARD == 1) + return FxaaTexTop(tex, posM); +#else + return FxaaFloat4(FxaaTexTop(tex, posM).xyz, lumaM); +#endif +} +/*==========================================================================*/ +#endif + + + + +/*============================================================================ + +FXAA3 CONSOLE - PC VERSION + +------------------------------------------------------------------------------ +Instead of using this on PC, I'd suggest just using FXAA Quality with +#define FXAA_QUALITY__PRESET 10 +Or +#define FXAA_QUALITY__PRESET 20 +Either are higher qualilty and almost as fast as this on modern PC GPUs. +============================================================================*/ +#if (FXAA_PC_CONSOLE == 1) +/*--------------------------------------------------------------------------*/ +FxaaFloat4 FxaaPixelShader( + // See FXAA Quality FxaaPixelShader() source for docs on Inputs! + FxaaFloat2 pos, + FxaaFloat4 fxaaConsolePosPos, + FxaaTex tex, + FxaaTex fxaaConsole360TexExpBiasNegOne, + FxaaTex fxaaConsole360TexExpBiasNegTwo, + FxaaFloat2 fxaaQualityRcpFrame, + FxaaFloat4 fxaaConsoleRcpFrameOpt, + FxaaFloat4 fxaaConsoleRcpFrameOpt2, + FxaaFloat4 fxaaConsole360RcpFrameOpt2, + FxaaFloat fxaaQualitySubpix, + FxaaFloat fxaaQualityEdgeThreshold, + FxaaFloat fxaaQualityEdgeThresholdMin, + FxaaFloat fxaaConsoleEdgeSharpness, + FxaaFloat fxaaConsoleEdgeThreshold, + FxaaFloat fxaaConsoleEdgeThresholdMin, + FxaaFloat4 fxaaConsole360ConstDir +) +{ + /*--------------------------------------------------------------------------*/ + FxaaFloat lumaNw = FxaaLuma(FxaaTexTop(tex, fxaaConsolePosPos.xy)); + FxaaFloat lumaSw = FxaaLuma(FxaaTexTop(tex, fxaaConsolePosPos.xw)); + FxaaFloat lumaNe = FxaaLuma(FxaaTexTop(tex, fxaaConsolePosPos.zy)); + FxaaFloat lumaSe = FxaaLuma(FxaaTexTop(tex, fxaaConsolePosPos.zw)); + /*--------------------------------------------------------------------------*/ + FxaaFloat4 rgbyM = FxaaTexTop(tex, pos.xy); +#if (FXAA_GREEN_AS_LUMA == 0) + FxaaFloat lumaM = rgbyM.w; +#else + FxaaFloat lumaM = rgbyM.y; +#endif + /*--------------------------------------------------------------------------*/ + FxaaFloat lumaMaxNwSw = max(lumaNw, lumaSw); + lumaNe += 1.0 / 384.0; + FxaaFloat lumaMinNwSw = min(lumaNw, lumaSw); + /*--------------------------------------------------------------------------*/ + FxaaFloat lumaMaxNeSe = max(lumaNe, lumaSe); + FxaaFloat lumaMinNeSe = min(lumaNe, lumaSe); + /*--------------------------------------------------------------------------*/ + FxaaFloat lumaMax = max(lumaMaxNeSe, lumaMaxNwSw); + FxaaFloat lumaMin = min(lumaMinNeSe, lumaMinNwSw); + /*--------------------------------------------------------------------------*/ + FxaaFloat lumaMaxScaled = lumaMax * fxaaConsoleEdgeThreshold; + /*--------------------------------------------------------------------------*/ + FxaaFloat lumaMinM = min(lumaMin, lumaM); + FxaaFloat lumaMaxScaledClamped = max(fxaaConsoleEdgeThresholdMin, lumaMaxScaled); + FxaaFloat lumaMaxM = max(lumaMax, lumaM); + FxaaFloat dirSwMinusNe = lumaSw - lumaNe; + FxaaFloat lumaMaxSubMinM = lumaMaxM - lumaMinM; + FxaaFloat dirSeMinusNw = lumaSe - lumaNw; + if (lumaMaxSubMinM < lumaMaxScaledClamped) return rgbyM; + /*--------------------------------------------------------------------------*/ + FxaaFloat2 dir; + dir.x = dirSwMinusNe + dirSeMinusNw; + dir.y = dirSwMinusNe - dirSeMinusNw; + /*--------------------------------------------------------------------------*/ + FxaaFloat2 dir1 = normalize(dir.xy); + FxaaFloat4 rgbyN1 = FxaaTexTop(tex, pos.xy - dir1 * fxaaConsoleRcpFrameOpt.zw); + FxaaFloat4 rgbyP1 = FxaaTexTop(tex, pos.xy + dir1 * fxaaConsoleRcpFrameOpt.zw); + /*--------------------------------------------------------------------------*/ + FxaaFloat dirAbsMinTimesC = min(abs(dir1.x), abs(dir1.y)) * fxaaConsoleEdgeSharpness; + FxaaFloat2 dir2 = clamp(dir1.xy / dirAbsMinTimesC, -2.0, 2.0); + /*--------------------------------------------------------------------------*/ + FxaaFloat4 rgbyN2 = FxaaTexTop(tex, pos.xy - dir2 * fxaaConsoleRcpFrameOpt2.zw); + FxaaFloat4 rgbyP2 = FxaaTexTop(tex, pos.xy + dir2 * fxaaConsoleRcpFrameOpt2.zw); + /*--------------------------------------------------------------------------*/ + FxaaFloat4 rgbyA = rgbyN1 + rgbyP1; + FxaaFloat4 rgbyB = ((rgbyN2 + rgbyP2) * 0.25) + (rgbyA * 0.25); + /*--------------------------------------------------------------------------*/ +#if (FXAA_GREEN_AS_LUMA == 0) + FxaaBool twoTap = (rgbyB.w < lumaMin) || (rgbyB.w > lumaMax); +#else + FxaaBool twoTap = (rgbyB.y < lumaMin) || (rgbyB.y > lumaMax); +#endif + if (twoTap) rgbyB.xyz = rgbyA.xyz * 0.5; + return rgbyB; +} +/*==========================================================================*/ +#endif + + + +/*============================================================================ + +FXAA3 CONSOLE - 360 PIXEL SHADER + +------------------------------------------------------------------------------ +This optimized version thanks to suggestions from Andy Luedke. +Should be fully tex bound in all cases. +As of the FXAA 3.11 release, I have still not tested this code, +however I fixed a bug which was in both FXAA 3.9 and FXAA 3.10. +And note this is replacing the old unoptimized version. +If it does not work, please let me know so I can fix it. +============================================================================*/ +#if (FXAA_360 == 1) +/*--------------------------------------------------------------------------*/ +[reduceTempRegUsage(4)] +float4 FxaaPixelShader( + // See FXAA Quality FxaaPixelShader() source for docs on Inputs! + FxaaFloat2 pos, + FxaaFloat4 fxaaConsolePosPos, + FxaaTex tex, + FxaaTex fxaaConsole360TexExpBiasNegOne, + FxaaTex fxaaConsole360TexExpBiasNegTwo, + FxaaFloat2 fxaaQualityRcpFrame, + FxaaFloat4 fxaaConsoleRcpFrameOpt, + FxaaFloat4 fxaaConsoleRcpFrameOpt2, + FxaaFloat4 fxaaConsole360RcpFrameOpt2, + FxaaFloat fxaaQualitySubpix, + FxaaFloat fxaaQualityEdgeThreshold, + FxaaFloat fxaaQualityEdgeThresholdMin, + FxaaFloat fxaaConsoleEdgeSharpness, + FxaaFloat fxaaConsoleEdgeThreshold, + FxaaFloat fxaaConsoleEdgeThresholdMin, + FxaaFloat4 fxaaConsole360ConstDir +) +{ + /*--------------------------------------------------------------------------*/ + float4 lumaNwNeSwSe; +#if (FXAA_GREEN_AS_LUMA == 0) + asm + { + tfetch2D lumaNwNeSwSe.w___, tex, pos.xy, OffsetX = -0.5, OffsetY = -0.5, UseComputedLOD = false + tfetch2D lumaNwNeSwSe._w__, tex, pos.xy, OffsetX = 0.5, OffsetY = -0.5, UseComputedLOD = false + tfetch2D lumaNwNeSwSe.__w_, tex, pos.xy, OffsetX = -0.5, OffsetY = 0.5, UseComputedLOD = false + tfetch2D lumaNwNeSwSe.___w, tex, pos.xy, OffsetX = 0.5, OffsetY = 0.5, UseComputedLOD = false + }; +#else + asm + { + tfetch2D lumaNwNeSwSe.y___, tex, pos.xy, OffsetX = -0.5, OffsetY = -0.5, UseComputedLOD = false + tfetch2D lumaNwNeSwSe._y__, tex, pos.xy, OffsetX = 0.5, OffsetY = -0.5, UseComputedLOD = false + tfetch2D lumaNwNeSwSe.__y_, tex, pos.xy, OffsetX = -0.5, OffsetY = 0.5, UseComputedLOD = false + tfetch2D lumaNwNeSwSe.___y, tex, pos.xy, OffsetX = 0.5, OffsetY = 0.5, UseComputedLOD = false + }; +#endif + /*--------------------------------------------------------------------------*/ + lumaNwNeSwSe.y += 1.0 / 384.0; + float2 lumaMinTemp = min(lumaNwNeSwSe.xy, lumaNwNeSwSe.zw); + float2 lumaMaxTemp = max(lumaNwNeSwSe.xy, lumaNwNeSwSe.zw); + float lumaMin = min(lumaMinTemp.x, lumaMinTemp.y); + float lumaMax = max(lumaMaxTemp.x, lumaMaxTemp.y); + /*--------------------------------------------------------------------------*/ + float4 rgbyM = tex2Dlod(tex, float4(pos.xy, 0.0, 0.0)); +#if (FXAA_GREEN_AS_LUMA == 0) + float lumaMinM = min(lumaMin, rgbyM.w); + float lumaMaxM = max(lumaMax, rgbyM.w); +#else + float lumaMinM = min(lumaMin, rgbyM.y); + float lumaMaxM = max(lumaMax, rgbyM.y); +#endif + if ((lumaMaxM - lumaMinM) < max(fxaaConsoleEdgeThresholdMin, lumaMax * fxaaConsoleEdgeThreshold)) return rgbyM; + /*--------------------------------------------------------------------------*/ + float2 dir; + dir.x = dot(lumaNwNeSwSe, fxaaConsole360ConstDir.yyxx); + dir.y = dot(lumaNwNeSwSe, fxaaConsole360ConstDir.xyxy); + dir = normalize(dir); + /*--------------------------------------------------------------------------*/ + float4 dir1 = dir.xyxy * fxaaConsoleRcpFrameOpt.xyzw; + /*--------------------------------------------------------------------------*/ + float4 dir2; + float dirAbsMinTimesC = min(abs(dir.x), abs(dir.y)) * fxaaConsoleEdgeSharpness; + dir2 = saturate(fxaaConsole360ConstDir.zzww * dir.xyxy / dirAbsMinTimesC + 0.5); + dir2 = dir2 * fxaaConsole360RcpFrameOpt2.xyxy + fxaaConsole360RcpFrameOpt2.zwzw; + /*--------------------------------------------------------------------------*/ + float4 rgbyN1 = tex2Dlod(fxaaConsole360TexExpBiasNegOne, float4(pos.xy + dir1.xy, 0.0, 0.0)); + float4 rgbyP1 = tex2Dlod(fxaaConsole360TexExpBiasNegOne, float4(pos.xy + dir1.zw, 0.0, 0.0)); + float4 rgbyN2 = tex2Dlod(fxaaConsole360TexExpBiasNegTwo, float4(pos.xy + dir2.xy, 0.0, 0.0)); + float4 rgbyP2 = tex2Dlod(fxaaConsole360TexExpBiasNegTwo, float4(pos.xy + dir2.zw, 0.0, 0.0)); + /*--------------------------------------------------------------------------*/ + float4 rgbyA = rgbyN1 + rgbyP1; + float4 rgbyB = rgbyN2 + rgbyP2 + rgbyA * 0.5; + /*--------------------------------------------------------------------------*/ + float4 rgbyR = ((FxaaLuma(rgbyB) - lumaMax) > 0.0) ? rgbyA : rgbyB; + rgbyR = ((FxaaLuma(rgbyB) - lumaMin) > 0.0) ? rgbyR : rgbyA; + return rgbyR; +} +/*==========================================================================*/ +#endif + + + +/*============================================================================ + +FXAA3 CONSOLE - OPTIMIZED PS3 PIXEL SHADER (NO EARLY EXIT) + +============================================================================== +The code below does not exactly match the assembly. +I have a feeling that 12 cycles is possible, but was not able to get there. +Might have to increase register count to get full performance. +Note this shader does not use perspective interpolation. + +Use the following cgc options, + +--fenable-bx2 --fastmath --fastprecision --nofloatbindings + +------------------------------------------------------------------------------ +NVSHADERPERF OUTPUT +------------------------------------------------------------------------------ +For reference and to aid in debug, output of NVShaderPerf should match this, + +Shader to schedule: +0: texpkb h0.w(TRUE), v5.zyxx, #0 +2: addh h2.z(TRUE), h0.w, constant(0.001953, 0.000000, 0.000000, 0.000000).x +4: texpkb h0.w(TRUE), v5.xwxx, #0 +6: addh h0.z(TRUE), -h2, h0.w +7: texpkb h1.w(TRUE), v5, #0 +9: addh h0.x(TRUE), h0.z, -h1.w +10: addh h3.w(TRUE), h0.z, h1 +11: texpkb h2.w(TRUE), v5.zwzz, #0 +13: addh h0.z(TRUE), h3.w, -h2.w +14: addh h0.x(TRUE), h2.w, h0 +15: nrmh h1.xz(TRUE), h0_n +16: minh_m8 h0.x(TRUE), |h1|, |h1.z| +17: maxh h4.w(TRUE), h0, h1 +18: divx h2.xy(TRUE), h1_n.xzzw, h0_n +19: movr r1.zw(TRUE), v4.xxxy +20: madr r2.xz(TRUE), -h1, constant(cConst5.x, cConst5.y, cConst5.z, cConst5.w).zzww, r1.zzww +22: minh h5.w(TRUE), h0, h1 +23: texpkb h0(TRUE), r2.xzxx, #0 +25: madr r0.zw(TRUE), h1.xzxz, constant(cConst5.x, cConst5.y, cConst5.z, cConst5.w), r1 +27: maxh h4.x(TRUE), h2.z, h2.w +28: texpkb h1(TRUE), r0.zwzz, #0 +30: addh_d2 h1(TRUE), h0, h1 +31: madr r0.xy(TRUE), -h2, constant(cConst5.x, cConst5.y, cConst5.z, cConst5.w).xyxx, r1.zwzz +33: texpkb h0(TRUE), r0, #0 +35: minh h4.z(TRUE), h2, h2.w +36: fenct TRUE +37: madr r1.xy(TRUE), h2, constant(cConst5.x, cConst5.y, cConst5.z, cConst5.w).xyxx, r1.zwzz +39: texpkb h2(TRUE), r1, #0 +41: addh_d2 h0(TRUE), h0, h2 +42: maxh h2.w(TRUE), h4, h4.x +43: minh h2.x(TRUE), h5.w, h4.z +44: addh_d2 h0(TRUE), h0, h1 +45: slth h2.x(TRUE), h0.w, h2 +46: sgth h2.w(TRUE), h0, h2 +47: movh h0(TRUE), h0 +48: addx.c0 rc(TRUE), h2, h2.w +49: movh h0(c0.NE.x), h1 + +IPU0 ------ Simplified schedule: -------- +Pass | Unit | uOp | PC: Op +-----+--------+------+------------------------- +1 | SCT0/1 | mov | 0: TXLr h0.w, g[TEX1].zyxx, const.xxxx, TEX0; +| TEX | txl | 0: TXLr h0.w, g[TEX1].zyxx, const.xxxx, TEX0; +| SCB1 | add | 2: ADDh h2.z, h0.--w-, const.--x-; +| | | +2 | SCT0/1 | mov | 4: TXLr h0.w, g[TEX1].xwxx, const.xxxx, TEX0; +| TEX | txl | 4: TXLr h0.w, g[TEX1].xwxx, const.xxxx, TEX0; +| SCB1 | add | 6: ADDh h0.z,-h2, h0.--w-; +| | | +3 | SCT0/1 | mov | 7: TXLr h1.w, g[TEX1], const.xxxx, TEX0; +| TEX | txl | 7: TXLr h1.w, g[TEX1], const.xxxx, TEX0; +| SCB0 | add | 9: ADDh h0.x, h0.z---,-h1.w---; +| SCB1 | add | 10: ADDh h3.w, h0.---z, h1; +| | | +4 | SCT0/1 | mov | 11: TXLr h2.w, g[TEX1].zwzz, const.xxxx, TEX0; +| TEX | txl | 11: TXLr h2.w, g[TEX1].zwzz, const.xxxx, TEX0; +| SCB0 | add | 14: ADDh h0.x, h2.w---, h0; +| SCB1 | add | 13: ADDh h0.z, h3.--w-,-h2.--w-; +| | | +5 | SCT1 | mov | 15: NRMh h1.xz, h0; +| SRB | nrm | 15: NRMh h1.xz, h0; +| SCB0 | min | 16: MINh*8 h0.x, |h1|, |h1.z---|; +| SCB1 | max | 17: MAXh h4.w, h0, h1; +| | | +6 | SCT0 | div | 18: DIVx h2.xy, h1.xz--, h0; +| SCT1 | mov | 19: MOVr r1.zw, g[TEX0].--xy; +| SCB0 | mad | 20: MADr r2.xz,-h1, const.z-w-, r1.z-w-; +| SCB1 | min | 22: MINh h5.w, h0, h1; +| | | +7 | SCT0/1 | mov | 23: TXLr h0, r2.xzxx, const.xxxx, TEX0; +| TEX | txl | 23: TXLr h0, r2.xzxx, const.xxxx, TEX0; +| SCB0 | max | 27: MAXh h4.x, h2.z---, h2.w---; +| SCB1 | mad | 25: MADr r0.zw, h1.--xz, const, r1; +| | | +8 | SCT0/1 | mov | 28: TXLr h1, r0.zwzz, const.xxxx, TEX0; +| TEX | txl | 28: TXLr h1, r0.zwzz, const.xxxx, TEX0; +| SCB0/1 | add | 30: ADDh/2 h1, h0, h1; +| | | +9 | SCT0 | mad | 31: MADr r0.xy,-h2, const.xy--, r1.zw--; +| SCT1 | mov | 33: TXLr h0, r0, const.zzzz, TEX0; +| TEX | txl | 33: TXLr h0, r0, const.zzzz, TEX0; +| SCB1 | min | 35: MINh h4.z, h2, h2.--w-; +| | | +10 | SCT0 | mad | 37: MADr r1.xy, h2, const.xy--, r1.zw--; +| SCT1 | mov | 39: TXLr h2, r1, const.zzzz, TEX0; +| TEX | txl | 39: TXLr h2, r1, const.zzzz, TEX0; +| SCB0/1 | add | 41: ADDh/2 h0, h0, h2; +| | | +11 | SCT0 | min | 43: MINh h2.x, h5.w---, h4.z---; +| SCT1 | max | 42: MAXh h2.w, h4, h4.---x; +| SCB0/1 | add | 44: ADDh/2 h0, h0, h1; +| | | +12 | SCT0 | set | 45: SLTh h2.x, h0.w---, h2; +| SCT1 | set | 46: SGTh h2.w, h0, h2; +| SCB0/1 | mul | 47: MOVh h0, h0; +| | | +13 | SCT0 | mad | 48: ADDxc0_s rc, h2, h2.w---; +| SCB0/1 | mul | 49: MOVh h0(NE0.xxxx), h1; + +Pass SCT TEX SCB +1: 0% 100% 25% +2: 0% 100% 25% +3: 0% 100% 50% +4: 0% 100% 50% +5: 0% 0% 50% +6: 100% 0% 75% +7: 0% 100% 75% +8: 0% 100% 100% +9: 0% 100% 25% +10: 0% 100% 100% +11: 50% 0% 100% +12: 50% 0% 100% +13: 25% 0% 100% + +MEAN: 17% 61% 67% + +Pass SCT0 SCT1 TEX SCB0 SCB1 +1: 0% 0% 100% 0% 100% +2: 0% 0% 100% 0% 100% +3: 0% 0% 100% 100% 100% +4: 0% 0% 100% 100% 100% +5: 0% 0% 0% 100% 100% +6: 100% 100% 0% 100% 100% +7: 0% 0% 100% 100% 100% +8: 0% 0% 100% 100% 100% +9: 0% 0% 100% 0% 100% +10: 0% 0% 100% 100% 100% +11: 100% 100% 0% 100% 100% +12: 100% 100% 0% 100% 100% +13: 100% 0% 0% 100% 100% + +MEAN: 30% 23% 61% 76% 100% +Fragment Performance Setup: Driver RSX Compiler, GPU RSX, Flags 0x5 +Results 13 cycles, 3 r regs, 923,076,923 pixels/s +============================================================================*/ +#if (FXAA_PS3 == 1) && (FXAA_EARLY_EXIT == 0) +/*--------------------------------------------------------------------------*/ +#pragma regcount 7 +#pragma disablepc all +#pragma option O3 +#pragma option OutColorPrec=fp16 +#pragma texformat default RGBA8 +/*==========================================================================*/ +half4 FxaaPixelShader( + // See FXAA Quality FxaaPixelShader() source for docs on Inputs! + FxaaFloat2 pos, + FxaaFloat4 fxaaConsolePosPos, + FxaaTex tex, + FxaaTex fxaaConsole360TexExpBiasNegOne, + FxaaTex fxaaConsole360TexExpBiasNegTwo, + FxaaFloat2 fxaaQualityRcpFrame, + FxaaFloat4 fxaaConsoleRcpFrameOpt, + FxaaFloat4 fxaaConsoleRcpFrameOpt2, + FxaaFloat4 fxaaConsole360RcpFrameOpt2, + FxaaFloat fxaaQualitySubpix, + FxaaFloat fxaaQualityEdgeThreshold, + FxaaFloat fxaaQualityEdgeThresholdMin, + FxaaFloat fxaaConsoleEdgeSharpness, + FxaaFloat fxaaConsoleEdgeThreshold, + FxaaFloat fxaaConsoleEdgeThresholdMin, + FxaaFloat4 fxaaConsole360ConstDir +) +{ + /*--------------------------------------------------------------------------*/ + // (1) + half4 dir; + half4 lumaNe = h4tex2Dlod(tex, half4(fxaaConsolePosPos.zy, 0, 0)); +#if (FXAA_GREEN_AS_LUMA == 0) + lumaNe.w += half(1.0 / 512.0); + dir.x = -lumaNe.w; + dir.z = -lumaNe.w; +#else + lumaNe.y += half(1.0 / 512.0); + dir.x = -lumaNe.y; + dir.z = -lumaNe.y; +#endif + /*--------------------------------------------------------------------------*/ + // (2) + half4 lumaSw = h4tex2Dlod(tex, half4(fxaaConsolePosPos.xw, 0, 0)); +#if (FXAA_GREEN_AS_LUMA == 0) + dir.x += lumaSw.w; + dir.z += lumaSw.w; +#else + dir.x += lumaSw.y; + dir.z += lumaSw.y; +#endif + /*--------------------------------------------------------------------------*/ + // (3) + half4 lumaNw = h4tex2Dlod(tex, half4(fxaaConsolePosPos.xy, 0, 0)); +#if (FXAA_GREEN_AS_LUMA == 0) + dir.x -= lumaNw.w; + dir.z += lumaNw.w; +#else + dir.x -= lumaNw.y; + dir.z += lumaNw.y; +#endif + /*--------------------------------------------------------------------------*/ + // (4) + half4 lumaSe = h4tex2Dlod(tex, half4(fxaaConsolePosPos.zw, 0, 0)); +#if (FXAA_GREEN_AS_LUMA == 0) + dir.x += lumaSe.w; + dir.z -= lumaSe.w; +#else + dir.x += lumaSe.y; + dir.z -= lumaSe.y; +#endif + /*--------------------------------------------------------------------------*/ + // (5) + half4 dir1_pos; + dir1_pos.xy = normalize(dir.xyz).xz; + half dirAbsMinTimesC = min(abs(dir1_pos.x), abs(dir1_pos.y)) * half(FXAA_CONSOLE__PS3_EDGE_SHARPNESS); + /*--------------------------------------------------------------------------*/ + // (6) + half4 dir2_pos; + dir2_pos.xy = clamp(dir1_pos.xy / dirAbsMinTimesC, half(-2.0), half(2.0)); + dir1_pos.zw = pos.xy; + dir2_pos.zw = pos.xy; + half4 temp1N; + temp1N.xy = dir1_pos.zw - dir1_pos.xy * fxaaConsoleRcpFrameOpt.zw; + /*--------------------------------------------------------------------------*/ + // (7) + temp1N = h4tex2Dlod(tex, half4(temp1N.xy, 0.0, 0.0)); + half4 rgby1; + rgby1.xy = dir1_pos.zw + dir1_pos.xy * fxaaConsoleRcpFrameOpt.zw; + /*--------------------------------------------------------------------------*/ + // (8) + rgby1 = h4tex2Dlod(tex, half4(rgby1.xy, 0.0, 0.0)); + rgby1 = (temp1N + rgby1) * 0.5; + /*--------------------------------------------------------------------------*/ + // (9) + half4 temp2N; + temp2N.xy = dir2_pos.zw - dir2_pos.xy * fxaaConsoleRcpFrameOpt2.zw; + temp2N = h4tex2Dlod(tex, half4(temp2N.xy, 0.0, 0.0)); + /*--------------------------------------------------------------------------*/ + // (10) + half4 rgby2; + rgby2.xy = dir2_pos.zw + dir2_pos.xy * fxaaConsoleRcpFrameOpt2.zw; + rgby2 = h4tex2Dlod(tex, half4(rgby2.xy, 0.0, 0.0)); + rgby2 = (temp2N + rgby2) * 0.5; + /*--------------------------------------------------------------------------*/ + // (11) + // compilier moves these scalar ops up to other cycles +#if (FXAA_GREEN_AS_LUMA == 0) + half lumaMin = min(min(lumaNw.w, lumaSw.w), min(lumaNe.w, lumaSe.w)); + half lumaMax = max(max(lumaNw.w, lumaSw.w), max(lumaNe.w, lumaSe.w)); +#else + half lumaMin = min(min(lumaNw.y, lumaSw.y), min(lumaNe.y, lumaSe.y)); + half lumaMax = max(max(lumaNw.y, lumaSw.y), max(lumaNe.y, lumaSe.y)); +#endif + rgby2 = (rgby2 + rgby1) * 0.5; + /*--------------------------------------------------------------------------*/ + // (12) +#if (FXAA_GREEN_AS_LUMA == 0) + bool twoTapLt = rgby2.w < lumaMin; + bool twoTapGt = rgby2.w > lumaMax; +#else + bool twoTapLt = rgby2.y < lumaMin; + bool twoTapGt = rgby2.y > lumaMax; +#endif + /*--------------------------------------------------------------------------*/ + // (13) + if (twoTapLt || twoTapGt) rgby2 = rgby1; + /*--------------------------------------------------------------------------*/ + return rgby2; +} +/*==========================================================================*/ +#endif + + + +/*============================================================================ + +FXAA3 CONSOLE - OPTIMIZED PS3 PIXEL SHADER (WITH EARLY EXIT) + +============================================================================== +The code mostly matches the assembly. +I have a feeling that 14 cycles is possible, but was not able to get there. +Might have to increase register count to get full performance. +Note this shader does not use perspective interpolation. + +Use the following cgc options, + +--fenable-bx2 --fastmath --fastprecision --nofloatbindings + +Use of FXAA_GREEN_AS_LUMA currently adds a cycle (16 clks). +Will look at fixing this for FXAA 3.12. +------------------------------------------------------------------------------ +NVSHADERPERF OUTPUT +------------------------------------------------------------------------------ +For reference and to aid in debug, output of NVShaderPerf should match this, + +Shader to schedule: +0: texpkb h0.w(TRUE), v5.zyxx, #0 +2: addh h2.y(TRUE), h0.w, constant(0.001953, 0.000000, 0.000000, 0.000000).x +4: texpkb h1.w(TRUE), v5.xwxx, #0 +6: addh h0.x(TRUE), h1.w, -h2.y +7: texpkb h2.w(TRUE), v5.zwzz, #0 +9: minh h4.w(TRUE), h2.y, h2 +10: maxh h5.x(TRUE), h2.y, h2.w +11: texpkb h0.w(TRUE), v5, #0 +13: addh h3.w(TRUE), -h0, h0.x +14: addh h0.x(TRUE), h0.w, h0 +15: addh h0.z(TRUE), -h2.w, h0.x +16: addh h0.x(TRUE), h2.w, h3.w +17: minh h5.y(TRUE), h0.w, h1.w +18: nrmh h2.xz(TRUE), h0_n +19: minh_m8 h2.w(TRUE), |h2.x|, |h2.z| +20: divx h4.xy(TRUE), h2_n.xzzw, h2_n.w +21: movr r1.zw(TRUE), v4.xxxy +22: maxh h2.w(TRUE), h0, h1 +23: fenct TRUE +24: madr r0.xy(TRUE), -h2.xzzw, constant(cConst5.x, cConst5.y, cConst5.z, cConst5.w).zwzz, r1.zwzz +26: texpkb h0(TRUE), r0, #0 +28: maxh h5.x(TRUE), h2.w, h5 +29: minh h5.w(TRUE), h5.y, h4 +30: madr r1.xy(TRUE), h2.xzzw, constant(cConst5.x, cConst5.y, cConst5.z, cConst5.w).zwzz, r1.zwzz +32: texpkb h2(TRUE), r1, #0 +34: addh_d2 h2(TRUE), h0, h2 +35: texpkb h1(TRUE), v4, #0 +37: maxh h5.y(TRUE), h5.x, h1.w +38: minh h4.w(TRUE), h1, h5 +39: madr r0.xy(TRUE), -h4, constant(cConst5.x, cConst5.y, cConst5.z, cConst5.w).xyxx, r1.zwzz +41: texpkb h0(TRUE), r0, #0 +43: addh_m8 h5.z(TRUE), h5.y, -h4.w +44: madr r2.xy(TRUE), h4, constant(cConst5.x, cConst5.y, cConst5.z, cConst5.w).xyxx, r1.zwzz +46: texpkb h3(TRUE), r2, #0 +48: addh_d2 h0(TRUE), h0, h3 +49: addh_d2 h3(TRUE), h0, h2 +50: movh h0(TRUE), h3 +51: slth h3.x(TRUE), h3.w, h5.w +52: sgth h3.w(TRUE), h3, h5.x +53: addx.c0 rc(TRUE), h3.x, h3 +54: slth.c0 rc(TRUE), h5.z, h5 +55: movh h0(c0.NE.w), h2 +56: movh h0(c0.NE.x), h1 + +IPU0 ------ Simplified schedule: -------- +Pass | Unit | uOp | PC: Op +-----+--------+------+------------------------- +1 | SCT0/1 | mov | 0: TXLr h0.w, g[TEX1].zyxx, const.xxxx, TEX0; +| TEX | txl | 0: TXLr h0.w, g[TEX1].zyxx, const.xxxx, TEX0; +| SCB0 | add | 2: ADDh h2.y, h0.-w--, const.-x--; +| | | +2 | SCT0/1 | mov | 4: TXLr h1.w, g[TEX1].xwxx, const.xxxx, TEX0; +| TEX | txl | 4: TXLr h1.w, g[TEX1].xwxx, const.xxxx, TEX0; +| SCB0 | add | 6: ADDh h0.x, h1.w---,-h2.y---; +| | | +3 | SCT0/1 | mov | 7: TXLr h2.w, g[TEX1].zwzz, const.xxxx, TEX0; +| TEX | txl | 7: TXLr h2.w, g[TEX1].zwzz, const.xxxx, TEX0; +| SCB0 | max | 10: MAXh h5.x, h2.y---, h2.w---; +| SCB1 | min | 9: MINh h4.w, h2.---y, h2; +| | | +4 | SCT0/1 | mov | 11: TXLr h0.w, g[TEX1], const.xxxx, TEX0; +| TEX | txl | 11: TXLr h0.w, g[TEX1], const.xxxx, TEX0; +| SCB0 | add | 14: ADDh h0.x, h0.w---, h0; +| SCB1 | add | 13: ADDh h3.w,-h0, h0.---x; +| | | +5 | SCT0 | mad | 16: ADDh h0.x, h2.w---, h3.w---; +| SCT1 | mad | 15: ADDh h0.z,-h2.--w-, h0.--x-; +| SCB0 | min | 17: MINh h5.y, h0.-w--, h1.-w--; +| | | +6 | SCT1 | mov | 18: NRMh h2.xz, h0; +| SRB | nrm | 18: NRMh h2.xz, h0; +| SCB1 | min | 19: MINh*8 h2.w, |h2.---x|, |h2.---z|; +| | | +7 | SCT0 | div | 20: DIVx h4.xy, h2.xz--, h2.ww--; +| SCT1 | mov | 21: MOVr r1.zw, g[TEX0].--xy; +| SCB1 | max | 22: MAXh h2.w, h0, h1; +| | | +8 | SCT0 | mad | 24: MADr r0.xy,-h2.xz--, const.zw--, r1.zw--; +| SCT1 | mov | 26: TXLr h0, r0, const.xxxx, TEX0; +| TEX | txl | 26: TXLr h0, r0, const.xxxx, TEX0; +| SCB0 | max | 28: MAXh h5.x, h2.w---, h5; +| SCB1 | min | 29: MINh h5.w, h5.---y, h4; +| | | +9 | SCT0 | mad | 30: MADr r1.xy, h2.xz--, const.zw--, r1.zw--; +| SCT1 | mov | 32: TXLr h2, r1, const.xxxx, TEX0; +| TEX | txl | 32: TXLr h2, r1, const.xxxx, TEX0; +| SCB0/1 | add | 34: ADDh/2 h2, h0, h2; +| | | +10 | SCT0/1 | mov | 35: TXLr h1, g[TEX0], const.xxxx, TEX0; +| TEX | txl | 35: TXLr h1, g[TEX0], const.xxxx, TEX0; +| SCB0 | max | 37: MAXh h5.y, h5.-x--, h1.-w--; +| SCB1 | min | 38: MINh h4.w, h1, h5; +| | | +11 | SCT0 | mad | 39: MADr r0.xy,-h4, const.xy--, r1.zw--; +| SCT1 | mov | 41: TXLr h0, r0, const.zzzz, TEX0; +| TEX | txl | 41: TXLr h0, r0, const.zzzz, TEX0; +| SCB0 | mad | 44: MADr r2.xy, h4, const.xy--, r1.zw--; +| SCB1 | add | 43: ADDh*8 h5.z, h5.--y-,-h4.--w-; +| | | +12 | SCT0/1 | mov | 46: TXLr h3, r2, const.xxxx, TEX0; +| TEX | txl | 46: TXLr h3, r2, const.xxxx, TEX0; +| SCB0/1 | add | 48: ADDh/2 h0, h0, h3; +| | | +13 | SCT0/1 | mad | 49: ADDh/2 h3, h0, h2; +| SCB0/1 | mul | 50: MOVh h0, h3; +| | | +14 | SCT0 | set | 51: SLTh h3.x, h3.w---, h5.w---; +| SCT1 | set | 52: SGTh h3.w, h3, h5.---x; +| SCB0 | set | 54: SLThc0 rc, h5.z---, h5; +| SCB1 | add | 53: ADDxc0_s rc, h3.---x, h3; +| | | +15 | SCT0/1 | mul | 55: MOVh h0(NE0.wwww), h2; +| SCB0/1 | mul | 56: MOVh h0(NE0.xxxx), h1; + +Pass SCT TEX SCB +1: 0% 100% 25% +2: 0% 100% 25% +3: 0% 100% 50% +4: 0% 100% 50% +5: 50% 0% 25% +6: 0% 0% 25% +7: 100% 0% 25% +8: 0% 100% 50% +9: 0% 100% 100% +10: 0% 100% 50% +11: 0% 100% 75% +12: 0% 100% 100% +13: 100% 0% 100% +14: 50% 0% 50% +15: 100% 0% 100% + +MEAN: 26% 60% 56% + +Pass SCT0 SCT1 TEX SCB0 SCB1 +1: 0% 0% 100% 100% 0% +2: 0% 0% 100% 100% 0% +3: 0% 0% 100% 100% 100% +4: 0% 0% 100% 100% 100% +5: 100% 100% 0% 100% 0% +6: 0% 0% 0% 0% 100% +7: 100% 100% 0% 0% 100% +8: 0% 0% 100% 100% 100% +9: 0% 0% 100% 100% 100% +10: 0% 0% 100% 100% 100% +11: 0% 0% 100% 100% 100% +12: 0% 0% 100% 100% 100% +13: 100% 100% 0% 100% 100% +14: 100% 100% 0% 100% 100% +15: 100% 100% 0% 100% 100% + +MEAN: 33% 33% 60% 86% 80% +Fragment Performance Setup: Driver RSX Compiler, GPU RSX, Flags 0x5 +Results 15 cycles, 3 r regs, 800,000,000 pixels/s +============================================================================*/ +#if (FXAA_PS3 == 1) && (FXAA_EARLY_EXIT == 1) +/*--------------------------------------------------------------------------*/ +#pragma regcount 7 +#pragma disablepc all +#pragma option O2 +#pragma option OutColorPrec=fp16 +#pragma texformat default RGBA8 +/*==========================================================================*/ +half4 FxaaPixelShader( + // See FXAA Quality FxaaPixelShader() source for docs on Inputs! + FxaaFloat2 pos, + FxaaFloat4 fxaaConsolePosPos, + FxaaTex tex, + FxaaTex fxaaConsole360TexExpBiasNegOne, + FxaaTex fxaaConsole360TexExpBiasNegTwo, + FxaaFloat2 fxaaQualityRcpFrame, + FxaaFloat4 fxaaConsoleRcpFrameOpt, + FxaaFloat4 fxaaConsoleRcpFrameOpt2, + FxaaFloat4 fxaaConsole360RcpFrameOpt2, + FxaaFloat fxaaQualitySubpix, + FxaaFloat fxaaQualityEdgeThreshold, + FxaaFloat fxaaQualityEdgeThresholdMin, + FxaaFloat fxaaConsoleEdgeSharpness, + FxaaFloat fxaaConsoleEdgeThreshold, + FxaaFloat fxaaConsoleEdgeThresholdMin, + FxaaFloat4 fxaaConsole360ConstDir +) +{ + /*--------------------------------------------------------------------------*/ + // (1) + half4 rgbyNe = h4tex2Dlod(tex, half4(fxaaConsolePosPos.zy, 0, 0)); +#if (FXAA_GREEN_AS_LUMA == 0) + half lumaNe = rgbyNe.w + half(1.0 / 512.0); +#else + half lumaNe = rgbyNe.y + half(1.0 / 512.0); +#endif + /*--------------------------------------------------------------------------*/ + // (2) + half4 lumaSw = h4tex2Dlod(tex, half4(fxaaConsolePosPos.xw, 0, 0)); +#if (FXAA_GREEN_AS_LUMA == 0) + half lumaSwNegNe = lumaSw.w - lumaNe; +#else + half lumaSwNegNe = lumaSw.y - lumaNe; +#endif + /*--------------------------------------------------------------------------*/ + // (3) + half4 lumaNw = h4tex2Dlod(tex, half4(fxaaConsolePosPos.xy, 0, 0)); +#if (FXAA_GREEN_AS_LUMA == 0) + half lumaMaxNwSw = max(lumaNw.w, lumaSw.w); + half lumaMinNwSw = min(lumaNw.w, lumaSw.w); +#else + half lumaMaxNwSw = max(lumaNw.y, lumaSw.y); + half lumaMinNwSw = min(lumaNw.y, lumaSw.y); +#endif + /*--------------------------------------------------------------------------*/ + // (4) + half4 lumaSe = h4tex2Dlod(tex, half4(fxaaConsolePosPos.zw, 0, 0)); +#if (FXAA_GREEN_AS_LUMA == 0) + half dirZ = lumaNw.w + lumaSwNegNe; + half dirX = -lumaNw.w + lumaSwNegNe; +#else + half dirZ = lumaNw.y + lumaSwNegNe; + half dirX = -lumaNw.y + lumaSwNegNe; +#endif + /*--------------------------------------------------------------------------*/ + // (5) + half3 dir; + dir.y = 0.0; +#if (FXAA_GREEN_AS_LUMA == 0) + dir.x = lumaSe.w + dirX; + dir.z = -lumaSe.w + dirZ; + half lumaMinNeSe = min(lumaNe, lumaSe.w); +#else + dir.x = lumaSe.y + dirX; + dir.z = -lumaSe.y + dirZ; + half lumaMinNeSe = min(lumaNe, lumaSe.y); +#endif + /*--------------------------------------------------------------------------*/ + // (6) + half4 dir1_pos; + dir1_pos.xy = normalize(dir).xz; + half dirAbsMinTimes8 = min(abs(dir1_pos.x), abs(dir1_pos.y)) * half(FXAA_CONSOLE__PS3_EDGE_SHARPNESS); + /*--------------------------------------------------------------------------*/ + // (7) + half4 dir2_pos; + dir2_pos.xy = clamp(dir1_pos.xy / dirAbsMinTimes8, half(-2.0), half(2.0)); + dir1_pos.zw = pos.xy; + dir2_pos.zw = pos.xy; +#if (FXAA_GREEN_AS_LUMA == 0) + half lumaMaxNeSe = max(lumaNe, lumaSe.w); +#else + half lumaMaxNeSe = max(lumaNe, lumaSe.y); +#endif + /*--------------------------------------------------------------------------*/ + // (8) + half4 temp1N; + temp1N.xy = dir1_pos.zw - dir1_pos.xy * fxaaConsoleRcpFrameOpt.zw; + temp1N = h4tex2Dlod(tex, half4(temp1N.xy, 0.0, 0.0)); + half lumaMax = max(lumaMaxNwSw, lumaMaxNeSe); + half lumaMin = min(lumaMinNwSw, lumaMinNeSe); + /*--------------------------------------------------------------------------*/ + // (9) + half4 rgby1; + rgby1.xy = dir1_pos.zw + dir1_pos.xy * fxaaConsoleRcpFrameOpt.zw; + rgby1 = h4tex2Dlod(tex, half4(rgby1.xy, 0.0, 0.0)); + rgby1 = (temp1N + rgby1) * 0.5; + /*--------------------------------------------------------------------------*/ + // (10) + half4 rgbyM = h4tex2Dlod(tex, half4(pos.xy, 0.0, 0.0)); +#if (FXAA_GREEN_AS_LUMA == 0) + half lumaMaxM = max(lumaMax, rgbyM.w); + half lumaMinM = min(lumaMin, rgbyM.w); +#else + half lumaMaxM = max(lumaMax, rgbyM.y); + half lumaMinM = min(lumaMin, rgbyM.y); +#endif + /*--------------------------------------------------------------------------*/ + // (11) + half4 temp2N; + temp2N.xy = dir2_pos.zw - dir2_pos.xy * fxaaConsoleRcpFrameOpt2.zw; + temp2N = h4tex2Dlod(tex, half4(temp2N.xy, 0.0, 0.0)); + half4 rgby2; + rgby2.xy = dir2_pos.zw + dir2_pos.xy * fxaaConsoleRcpFrameOpt2.zw; + half lumaRangeM = (lumaMaxM - lumaMinM) / FXAA_CONSOLE__PS3_EDGE_THRESHOLD; + /*--------------------------------------------------------------------------*/ + // (12) + rgby2 = h4tex2Dlod(tex, half4(rgby2.xy, 0.0, 0.0)); + rgby2 = (temp2N + rgby2) * 0.5; + /*--------------------------------------------------------------------------*/ + // (13) + rgby2 = (rgby2 + rgby1) * 0.5; + /*--------------------------------------------------------------------------*/ + // (14) +#if (FXAA_GREEN_AS_LUMA == 0) + bool twoTapLt = rgby2.w < lumaMin; + bool twoTapGt = rgby2.w > lumaMax; +#else + bool twoTapLt = rgby2.y < lumaMin; + bool twoTapGt = rgby2.y > lumaMax; +#endif + bool earlyExit = lumaRangeM < lumaMax; + bool twoTap = twoTapLt || twoTapGt; + /*--------------------------------------------------------------------------*/ + // (15) + if (twoTap) rgby2 = rgby1; + if (earlyExit) rgby2 = rgbyM; + /*--------------------------------------------------------------------------*/ + return rgby2; +} +/*==========================================================================*/ +#endif + +#endif // __FXAA3_INC__ diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/FXAA3.cginc.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/FXAA3.cginc.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/FXAA3.cginc.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/FXAA3.cginc.meta diff --git a/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/Fog.shader b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/Fog.shader new file mode 100644 index 0000000..b607a64 --- /dev/null +++ b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/Fog.shader @@ -0,0 +1,109 @@ +Shader "Hidden/Post FX/Fog" +{ + Properties + { + _MainTex("Main Texture", 2D) = "white" {} + } + + CGINCLUDE + + #pragma multi_compile __ FOG_LINEAR FOG_EXP FOG_EXP2 + #include "UnityCG.cginc" + #include "Common.cginc" + + #define SKYBOX_THREASHOLD_VALUE 0.9999 + + struct Varyings + { + float2 uv : TEXCOORD0; + float4 vertex : SV_POSITION; + }; + + Varyings VertFog(AttributesDefault v) + { + Varyings o; + o.vertex = UnityObjectToClipPos(v.vertex); + o.uv = UnityStereoScreenSpaceUVAdjust(v.texcoord, _MainTex_ST); + return o; + } + + sampler2D _CameraDepthTexture; + + half4 _FogColor; + float _Density; + float _Start; + float _End; + + half ComputeFog(float z) + { + half fog = 0.0; + #if FOG_LINEAR + fog = (_End - z) / (_End - _Start); + #elif FOG_EXP + fog = exp2(-_Density * z); + #else // FOG_EXP2 + fog = _Density * z; + fog = exp2(-fog * fog); + #endif + return saturate(fog); + } + + float ComputeDistance(float depth) + { + float dist = depth * _ProjectionParams.z; + dist -= _ProjectionParams.y; + return dist; + } + + half4 FragFog(Varyings i) : SV_Target + { + half4 color = tex2D(_MainTex, i.uv); + + float depth = SAMPLE_DEPTH_TEXTURE(_CameraDepthTexture, i.uv); + depth = Linear01Depth(depth); + float dist = ComputeDistance(depth); + half fog = 1.0 - ComputeFog(dist); + + return lerp(color, _FogColor, fog); + } + + half4 FragFogExcludeSkybox(Varyings i) : SV_Target + { + half4 color = tex2D(_MainTex, i.uv); + + float depth = SAMPLE_DEPTH_TEXTURE(_CameraDepthTexture, i.uv); + depth = Linear01Depth(depth); + float skybox = depth < SKYBOX_THREASHOLD_VALUE; + float dist = ComputeDistance(depth); + half fog = 1.0 - ComputeFog(dist); + + return lerp(color, _FogColor, fog * skybox); + } + + ENDCG + + SubShader + { + Cull Off ZWrite Off ZTest Always + + Pass + { + CGPROGRAM + + #pragma vertex VertFog + #pragma fragment FragFog + + ENDCG + } + + Pass + { + CGPROGRAM + + #pragma vertex VertFog + #pragma fragment FragFogExcludeSkybox + + ENDCG + } + } +} diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/Fog.shader.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/Fog.shader.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/Fog.shader.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/Fog.shader.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/GrainGen.shader b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/GrainGen.shader similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/GrainGen.shader rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/GrainGen.shader diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/GrainGen.shader.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/GrainGen.shader.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/GrainGen.shader.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/GrainGen.shader.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/LutGen.shader b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/LutGen.shader similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/LutGen.shader rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/LutGen.shader diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/LutGen.shader.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/LutGen.shader.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/LutGen.shader.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/LutGen.shader.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/MotionBlur.cginc b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/MotionBlur.cginc similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/MotionBlur.cginc rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/MotionBlur.cginc diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/MotionBlur.cginc.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/MotionBlur.cginc.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/MotionBlur.cginc.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/MotionBlur.cginc.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/MotionBlur.shader b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/MotionBlur.shader similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/MotionBlur.shader rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/MotionBlur.shader diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/MotionBlur.shader.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/MotionBlur.shader.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/MotionBlur.shader.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/MotionBlur.shader.meta diff --git a/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/ScreenSpaceRaytrace.cginc b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/ScreenSpaceRaytrace.cginc new file mode 100644 index 0000000..0a8def0 --- /dev/null +++ b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/ScreenSpaceRaytrace.cginc @@ -0,0 +1,238 @@ +/** +\author Michael Mara and Morgan McGuire, Casual Effects. 2015. +*/ + +#ifndef __SCREEN_SPACE_RAYTRACE__ +#define __SCREEN_SPACE_RAYTRACE__ + +sampler2D_float _CameraDepthTexture; + +float distanceSquared(float2 A, float2 B) +{ + A -= B; + return dot(A, A); +} + +float distanceSquared(float3 A, float3 B) +{ + A -= B; + return dot(A, A); +} + +void swap(inout float v0, inout float v1) +{ + float temp = v0; + v0 = v1; + v1 = temp; +} + +bool isIntersecting(float rayZMin, float rayZMax, float sceneZ, float layerThickness) +{ + return (rayZMax >= sceneZ - layerThickness) && (rayZMin <= sceneZ); +} + +void rayIterations(in bool traceBehindObjects, inout float2 P, inout float stepDirection, inout float end, inout int stepCount, inout int maxSteps, inout bool intersecting, + inout float sceneZ, inout float2 dP, inout float3 Q, inout float3 dQ, inout float k, inout float dk, + inout float rayZMin, inout float rayZMax, inout float prevZMaxEstimate, inout bool permute, inout float2 hitPixel, + inout float2 invSize, inout float layerThickness) +{ + bool stop = intersecting; + + UNITY_LOOP + for (; (P.x * stepDirection) <= end && stepCount < maxSteps && !stop; P += dP, Q.z += dQ.z, k += dk, stepCount += 1) + { + // The depth range that the ray covers within this loop iteration. + // Assume that the ray is moving in increasing z and swap if backwards. + rayZMin = prevZMaxEstimate; + //rayZMin = (dQ.z * -0.5 + Q.z) / (dk * -0.5 + k); + // Compute the value at 1/2 pixel into the future + rayZMax = (dQ.z * 0.5 + Q.z) / (dk * 0.5 + k); + prevZMaxEstimate = rayZMax; + + if (rayZMin > rayZMax) + { + swap(rayZMin, rayZMax); + } + + // Undo the homogeneous operation to obtain the camera-space + // Q at each point + hitPixel = permute ? P.yx : P; + + sceneZ = SAMPLE_DEPTH_TEXTURE_LOD(_CameraDepthTexture, float4(hitPixel * invSize,0,0)).r; + sceneZ = -LinearEyeDepth(sceneZ); + + bool isBehind = (rayZMin <= sceneZ); + intersecting = isBehind && (rayZMax >= sceneZ - layerThickness); + stop = traceBehindObjects ? intersecting : isBehind; + + } // pixel on ray + + P -= dP, Q.z -= dQ.z, k -= dk; +} + +/** + \param csOrigin must have z < -0.01, and project within the valid screen rectangle + \param stepRate Set to 1.0 by default, higher to step faster + */ +bool castDenseScreenSpaceRay + (float3 csOrigin, + float3 csDirection, + float4x4 projectToPixelMatrix, + float2 csZBufferSize, + float3 clipInfo, + float jitterFraction, + int maxSteps, + float layerThickness, + float maxRayTraceDistance, + out float2 hitPixel, + int stepRate, + bool traceBehindObjects, + out float3 csHitPoint, + out float stepCount) { + + float2 invSize = float2(1.0 / csZBufferSize.x, 1.0 / csZBufferSize.y); + + // Initialize to off screen + hitPixel = float2(-1, -1); + + float nearPlaneZ = -0.01; + // Clip ray to a near plane in 3D (doesn't have to be *the* near plane, although that would be a good idea) + float rayLength = ((csOrigin.z + csDirection.z * maxRayTraceDistance) > nearPlaneZ) ? + ((nearPlaneZ - csOrigin.z) / csDirection.z) : + maxRayTraceDistance; + + float3 csEndPoint = csDirection * rayLength + csOrigin; + + // Project into screen space + // This matrix has a lot of zeroes in it. We could expand + // out these multiplies to avoid multiplying by zero + // ...but 16 MADDs are not a big deal compared to what's ahead + float4 H0 = mul(projectToPixelMatrix, float4(csOrigin, 1.0)); + float4 H1 = mul(projectToPixelMatrix, float4(csEndPoint, 1.0)); + + // There are a lot of divisions by w that can be turned into multiplications + // at some minor precision loss...and we need to interpolate these 1/w values + // anyway. + // + // Because the caller was required to clip to the near plane, + // this homogeneous division (projecting from 4D to 2D) is guaranteed + // to succeed. + float k0 = 1.0 / H0.w; + float k1 = 1.0 / H1.w; + + // Screen-space endpoints + float2 P0 = H0.xy * k0; + float2 P1 = H1.xy * k1; + + // Switch the original points to values that interpolate linearly in 2D: + float3 Q0 = csOrigin * k0; + float3 Q1 = csEndPoint * k1; + +#if 1 // Clipping to the screen coordinates. We could simply modify maxSteps instead + float yMax = csZBufferSize.y - 0.5; + float yMin = 0.5; + float xMax = csZBufferSize.x - 0.5; + float xMin = 0.5; + + // 2D interpolation parameter + float alpha = 0.0; + // P0 must be in bounds + if (P1.y > yMax || P1.y < yMin) { + float yClip = (P1.y > yMax) ? yMax : yMin; + float yAlpha = (P1.y - yClip) / (P1.y - P0.y); // Denominator is not zero, since P0 != P1 (or P0 would have been clipped!) + alpha = yAlpha; + } + + // P0 must be in bounds + if (P1.x > xMax || P1.x < xMin) { + float xClip = (P1.x > xMax) ? xMax : xMin; + float xAlpha = (P1.x - xClip) / (P1.x - P0.x); // Denominator is not zero, since P0 != P1 (or P0 would have been clipped!) + alpha = max(alpha, xAlpha); + } + + // These are all in homogeneous space, so they interpolate linearly + P1 = lerp(P1, P0, alpha); + k1 = lerp(k1, k0, alpha); + Q1 = lerp(Q1, Q0, alpha); +#endif + + // We're doing this to avoid divide by zero (rays exactly parallel to an eye ray) + P1 = (distanceSquared(P0, P1) < 0.0001) ? P0 + float2(0.01, 0.01) : P1; + + float2 delta = P1 - P0; + + // Assume horizontal + bool permute = false; + if (abs(delta.x) < abs(delta.y)) { + // More-vertical line. Create a permutation that swaps x and y in the output + permute = true; + + // Directly swizzle the inputs + delta = delta.yx; + P1 = P1.yx; + P0 = P0.yx; + } + + // From now on, "x" is the primary iteration direction and "y" is the secondary one + + float stepDirection = sign(delta.x); + float invdx = stepDirection / delta.x; + float2 dP = float2(stepDirection, invdx * delta.y); + + // Track the derivatives of Q and k + float3 dQ = (Q1 - Q0) * invdx; + float dk = (k1 - k0) * invdx; + + dP *= stepRate; + dQ *= stepRate; + dk *= stepRate; + + P0 += dP * jitterFraction; + Q0 += dQ * jitterFraction; + k0 += dk * jitterFraction; + + // Slide P from P0 to P1, (now-homogeneous) Q from Q0 to Q1, and k from k0 to k1 + float3 Q = Q0; + float k = k0; + + // We track the ray depth at +/- 1/2 pixel to treat pixels as clip-space solid + // voxels. Because the depth at -1/2 for a given pixel will be the same as at + // +1/2 for the previous iteration, we actually only have to compute one value + // per iteration. + float prevZMaxEstimate = csOrigin.z; + stepCount = 0.0; + float rayZMax = prevZMaxEstimate, rayZMin = prevZMaxEstimate; + float sceneZ = 100000; + + // P1.x is never modified after this point, so pre-scale it by + // the step direction for a signed comparison + float end = P1.x * stepDirection; + + bool intersecting = isIntersecting(rayZMin, rayZMax, sceneZ, layerThickness); + // We only advance the z field of Q in the inner loop, since + // Q.xy is never used until after the loop terminates + + //int rayIterations = min(maxSteps, stepsToGetOffscreen); + + + float2 P = P0; + + int originalStepCount = 0; + rayIterations(traceBehindObjects, P, stepDirection, end, originalStepCount, maxSteps, intersecting, + sceneZ, dP, Q, dQ, k, dk, + rayZMin, rayZMax, prevZMaxEstimate, permute, hitPixel, + invSize, layerThickness); + + + stepCount = originalStepCount; + + // Loop only advanced the Z component. Now that we know where we are going + // update xy + Q.xy += dQ.xy * stepCount; + // Q is a vector, so we are trying to get by with 1 division instead of 3. + csHitPoint = Q * (1.0 / k); + + return intersecting; +} + +#endif // __SCREEN_SPACE_RAYTRACE__ diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/ScreenSpaceRaytrace.cginc.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/ScreenSpaceRaytrace.cginc.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/ScreenSpaceRaytrace.cginc.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/ScreenSpaceRaytrace.cginc.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/ScreenSpaceReflection.shader b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/ScreenSpaceReflection.shader similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/ScreenSpaceReflection.shader rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/ScreenSpaceReflection.shader diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/ScreenSpaceReflection.shader.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/ScreenSpaceReflection.shader.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/ScreenSpaceReflection.shader.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/ScreenSpaceReflection.shader.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/TAA.cginc b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/TAA.cginc similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/TAA.cginc rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/TAA.cginc diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/TAA.cginc.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/TAA.cginc.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/TAA.cginc.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/TAA.cginc.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/TAA.shader b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/TAA.shader similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/TAA.shader rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/TAA.shader diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/TAA.shader.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/TAA.shader.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/TAA.shader.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/TAA.shader.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/Tonemapping.cginc b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/Tonemapping.cginc similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/Tonemapping.cginc rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/Tonemapping.cginc diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/Tonemapping.cginc.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/Tonemapping.cginc.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/Tonemapping.cginc.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/Tonemapping.cginc.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/Uber.shader b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/Uber.shader similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/Uber.shader rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/Uber.shader diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/Uber.shader.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/Uber.shader.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/Uber.shader.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/Uber.shader.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/UberSecondPass.cginc b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/UberSecondPass.cginc similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/UberSecondPass.cginc rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/UberSecondPass.cginc diff --git a/UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/UberSecondPass.cginc.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/UberSecondPass.cginc.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Resources/Shaders/UberSecondPass.cginc.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Resources/Shaders/UberSecondPass.cginc.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Attributes.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Attributes.meta similarity index 54% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Attributes.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Attributes.meta index 81ba76d..ace1c2f 100644 --- a/UnityProject/Assets/!ext/PostProcessing/Runtime/Attributes.meta +++ b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Attributes.meta @@ -1,9 +1,8 @@ -fileFormatVersion: 2 -guid: c1f765b2bd3d2ad49b2677f6478a9ba3 -folderAsset: yes -timeCreated: 1466585494 -licenseType: Store -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 68327f748e8ffd94889a47317b7d327b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Attributes/GetSetAttribute.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Attributes/GetSetAttribute.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Attributes/GetSetAttribute.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Attributes/GetSetAttribute.cs diff --git a/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Attributes/GetSetAttribute.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Attributes/GetSetAttribute.cs.meta new file mode 100644 index 0000000..301aa33 --- /dev/null +++ b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Attributes/GetSetAttribute.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: f17e8602928ea02419dae051ec79c5a2 +timeCreated: 1460383955 +licenseType: Pro +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Attributes/MinAttribute.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Attributes/MinAttribute.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Attributes/MinAttribute.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Attributes/MinAttribute.cs diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Attributes/MinAttribute.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Attributes/MinAttribute.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Attributes/MinAttribute.cs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Attributes/MinAttribute.cs.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Attributes/TrackballAttribute.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Attributes/TrackballAttribute.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Attributes/TrackballAttribute.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Attributes/TrackballAttribute.cs diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Attributes/TrackballAttribute.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Attributes/TrackballAttribute.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Attributes/TrackballAttribute.cs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Attributes/TrackballAttribute.cs.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Attributes/TrackballGroupAttribute.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Attributes/TrackballGroupAttribute.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Attributes/TrackballGroupAttribute.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Attributes/TrackballGroupAttribute.cs diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Attributes/TrackballGroupAttribute.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Attributes/TrackballGroupAttribute.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Attributes/TrackballGroupAttribute.cs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Attributes/TrackballGroupAttribute.cs.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Components.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Components.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Components.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Components.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Components/AmbientOcclusionComponent.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Components/AmbientOcclusionComponent.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Components/AmbientOcclusionComponent.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Components/AmbientOcclusionComponent.cs diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Components/AmbientOcclusionComponent.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Components/AmbientOcclusionComponent.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Components/AmbientOcclusionComponent.cs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Components/AmbientOcclusionComponent.cs.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Components/BloomComponent.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Components/BloomComponent.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Components/BloomComponent.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Components/BloomComponent.cs diff --git a/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Components/BloomComponent.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Components/BloomComponent.cs.meta new file mode 100644 index 0000000..63a6432 --- /dev/null +++ b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Components/BloomComponent.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: acd4204a794b09048b928b1e987500c5 +timeCreated: 1473089954 +licenseType: Pro +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Components/BuiltinDebugViewsComponent.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Components/BuiltinDebugViewsComponent.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Components/BuiltinDebugViewsComponent.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Components/BuiltinDebugViewsComponent.cs diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Components/BuiltinDebugViewsComponent.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Components/BuiltinDebugViewsComponent.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Components/BuiltinDebugViewsComponent.cs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Components/BuiltinDebugViewsComponent.cs.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Components/ChromaticAberrationComponent.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Components/ChromaticAberrationComponent.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Components/ChromaticAberrationComponent.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Components/ChromaticAberrationComponent.cs diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Components/ChromaticAberrationComponent.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Components/ChromaticAberrationComponent.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Components/ChromaticAberrationComponent.cs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Components/ChromaticAberrationComponent.cs.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Components/ColorGradingComponent.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Components/ColorGradingComponent.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Components/ColorGradingComponent.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Components/ColorGradingComponent.cs diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Components/ColorGradingComponent.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Components/ColorGradingComponent.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Components/ColorGradingComponent.cs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Components/ColorGradingComponent.cs.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Components/DepthOfFieldComponent.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Components/DepthOfFieldComponent.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Components/DepthOfFieldComponent.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Components/DepthOfFieldComponent.cs diff --git a/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Components/DepthOfFieldComponent.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Components/DepthOfFieldComponent.cs.meta new file mode 100644 index 0000000..0af0d38 --- /dev/null +++ b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Components/DepthOfFieldComponent.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: d862c8701bf34c342b95cf9058d0b70c +timeCreated: 1468410915 +licenseType: Pro +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Components/DitheringComponent.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Components/DitheringComponent.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Components/DitheringComponent.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Components/DitheringComponent.cs diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Components/DitheringComponent.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Components/DitheringComponent.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Components/DitheringComponent.cs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Components/DitheringComponent.cs.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Components/EyeAdaptationComponent.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Components/EyeAdaptationComponent.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Components/EyeAdaptationComponent.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Components/EyeAdaptationComponent.cs diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Components/EyeAdaptationComponent.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Components/EyeAdaptationComponent.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Components/EyeAdaptationComponent.cs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Components/EyeAdaptationComponent.cs.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Components/FogComponent.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Components/FogComponent.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Components/FogComponent.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Components/FogComponent.cs diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Components/FogComponent.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Components/FogComponent.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Components/FogComponent.cs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Components/FogComponent.cs.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Components/FxaaComponent.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Components/FxaaComponent.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Components/FxaaComponent.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Components/FxaaComponent.cs diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Components/FxaaComponent.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Components/FxaaComponent.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Components/FxaaComponent.cs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Components/FxaaComponent.cs.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Components/GrainComponent.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Components/GrainComponent.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Components/GrainComponent.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Components/GrainComponent.cs diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Components/GrainComponent.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Components/GrainComponent.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Components/GrainComponent.cs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Components/GrainComponent.cs.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Components/MotionBlurComponent.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Components/MotionBlurComponent.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Components/MotionBlurComponent.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Components/MotionBlurComponent.cs diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Components/MotionBlurComponent.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Components/MotionBlurComponent.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Components/MotionBlurComponent.cs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Components/MotionBlurComponent.cs.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Components/ScreenSpaceReflectionComponent.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Components/ScreenSpaceReflectionComponent.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Components/ScreenSpaceReflectionComponent.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Components/ScreenSpaceReflectionComponent.cs diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Components/ScreenSpaceReflectionComponent.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Components/ScreenSpaceReflectionComponent.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Components/ScreenSpaceReflectionComponent.cs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Components/ScreenSpaceReflectionComponent.cs.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Components/TaaComponent.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Components/TaaComponent.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Components/TaaComponent.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Components/TaaComponent.cs diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Components/TaaComponent.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Components/TaaComponent.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Components/TaaComponent.cs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Components/TaaComponent.cs.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Components/UserLutComponent.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Components/UserLutComponent.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Components/UserLutComponent.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Components/UserLutComponent.cs diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Components/UserLutComponent.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Components/UserLutComponent.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Components/UserLutComponent.cs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Components/UserLutComponent.cs.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Components/VignetteComponent.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Components/VignetteComponent.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Components/VignetteComponent.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Components/VignetteComponent.cs diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Components/VignetteComponent.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Components/VignetteComponent.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Components/VignetteComponent.cs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Components/VignetteComponent.cs.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Models.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Models.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Models.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Models.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Models/AmbientOcclusionModel.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Models/AmbientOcclusionModel.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Models/AmbientOcclusionModel.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Models/AmbientOcclusionModel.cs diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Models/AmbientOcclusionModel.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Models/AmbientOcclusionModel.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Models/AmbientOcclusionModel.cs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Models/AmbientOcclusionModel.cs.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Models/AntialiasingModel.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Models/AntialiasingModel.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Models/AntialiasingModel.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Models/AntialiasingModel.cs diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Models/AntialiasingModel.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Models/AntialiasingModel.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Models/AntialiasingModel.cs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Models/AntialiasingModel.cs.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Models/BloomModel.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Models/BloomModel.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Models/BloomModel.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Models/BloomModel.cs diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Models/BloomModel.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Models/BloomModel.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Models/BloomModel.cs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Models/BloomModel.cs.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Models/BuiltinDebugViewsModel.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Models/BuiltinDebugViewsModel.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Models/BuiltinDebugViewsModel.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Models/BuiltinDebugViewsModel.cs diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Models/BuiltinDebugViewsModel.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Models/BuiltinDebugViewsModel.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Models/BuiltinDebugViewsModel.cs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Models/BuiltinDebugViewsModel.cs.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Models/ChromaticAberrationModel.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Models/ChromaticAberrationModel.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Models/ChromaticAberrationModel.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Models/ChromaticAberrationModel.cs diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Models/ChromaticAberrationModel.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Models/ChromaticAberrationModel.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Models/ChromaticAberrationModel.cs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Models/ChromaticAberrationModel.cs.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Models/ColorGradingModel.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Models/ColorGradingModel.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Models/ColorGradingModel.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Models/ColorGradingModel.cs diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Models/ColorGradingModel.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Models/ColorGradingModel.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Models/ColorGradingModel.cs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Models/ColorGradingModel.cs.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Models/DepthOfFieldModel.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Models/DepthOfFieldModel.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Models/DepthOfFieldModel.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Models/DepthOfFieldModel.cs diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Models/DepthOfFieldModel.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Models/DepthOfFieldModel.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Models/DepthOfFieldModel.cs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Models/DepthOfFieldModel.cs.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Models/DitheringModel.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Models/DitheringModel.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Models/DitheringModel.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Models/DitheringModel.cs diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Models/DitheringModel.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Models/DitheringModel.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Models/DitheringModel.cs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Models/DitheringModel.cs.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Models/EyeAdaptationModel.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Models/EyeAdaptationModel.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Models/EyeAdaptationModel.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Models/EyeAdaptationModel.cs diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Models/EyeAdaptationModel.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Models/EyeAdaptationModel.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Models/EyeAdaptationModel.cs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Models/EyeAdaptationModel.cs.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Models/FogModel.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Models/FogModel.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Models/FogModel.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Models/FogModel.cs diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Models/FogModel.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Models/FogModel.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Models/FogModel.cs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Models/FogModel.cs.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Models/GrainModel.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Models/GrainModel.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Models/GrainModel.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Models/GrainModel.cs diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Models/GrainModel.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Models/GrainModel.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Models/GrainModel.cs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Models/GrainModel.cs.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Models/MotionBlurModel.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Models/MotionBlurModel.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Models/MotionBlurModel.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Models/MotionBlurModel.cs diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Models/MotionBlurModel.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Models/MotionBlurModel.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Models/MotionBlurModel.cs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Models/MotionBlurModel.cs.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Models/ScreenSpaceReflectionModel.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Models/ScreenSpaceReflectionModel.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Models/ScreenSpaceReflectionModel.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Models/ScreenSpaceReflectionModel.cs diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Models/ScreenSpaceReflectionModel.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Models/ScreenSpaceReflectionModel.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Models/ScreenSpaceReflectionModel.cs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Models/ScreenSpaceReflectionModel.cs.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Models/UserLutModel.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Models/UserLutModel.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Models/UserLutModel.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Models/UserLutModel.cs diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Models/UserLutModel.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Models/UserLutModel.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Models/UserLutModel.cs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Models/UserLutModel.cs.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Models/VignetteModel.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Models/VignetteModel.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Models/VignetteModel.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Models/VignetteModel.cs diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Models/VignetteModel.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Models/VignetteModel.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Models/VignetteModel.cs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Models/VignetteModel.cs.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/PostProcessingBehaviour.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/PostProcessingBehaviour.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/PostProcessingBehaviour.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/PostProcessingBehaviour.cs diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/PostProcessingBehaviour.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/PostProcessingBehaviour.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/PostProcessingBehaviour.cs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/PostProcessingBehaviour.cs.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/PostProcessingComponent.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/PostProcessingComponent.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/PostProcessingComponent.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/PostProcessingComponent.cs diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/PostProcessingComponent.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/PostProcessingComponent.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/PostProcessingComponent.cs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/PostProcessingComponent.cs.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/PostProcessingContext.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/PostProcessingContext.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/PostProcessingContext.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/PostProcessingContext.cs diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/PostProcessingContext.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/PostProcessingContext.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/PostProcessingContext.cs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/PostProcessingContext.cs.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/PostProcessingModel.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/PostProcessingModel.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/PostProcessingModel.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/PostProcessingModel.cs diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/PostProcessingModel.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/PostProcessingModel.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/PostProcessingModel.cs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/PostProcessingModel.cs.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/PostProcessingProfile.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/PostProcessingProfile.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/PostProcessingProfile.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/PostProcessingProfile.cs diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/PostProcessingProfile.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/PostProcessingProfile.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/PostProcessingProfile.cs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/PostProcessingProfile.cs.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Utils.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Utils.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Utils.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Utils.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Utils/ColorGradingCurve.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Utils/ColorGradingCurve.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Utils/ColorGradingCurve.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Utils/ColorGradingCurve.cs diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Utils/ColorGradingCurve.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Utils/ColorGradingCurve.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Utils/ColorGradingCurve.cs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Utils/ColorGradingCurve.cs.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Utils/GraphicsUtils.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Utils/GraphicsUtils.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Utils/GraphicsUtils.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Utils/GraphicsUtils.cs diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Utils/GraphicsUtils.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Utils/GraphicsUtils.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Utils/GraphicsUtils.cs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Utils/GraphicsUtils.cs.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Utils/MaterialFactory.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Utils/MaterialFactory.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Utils/MaterialFactory.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Utils/MaterialFactory.cs diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Utils/MaterialFactory.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Utils/MaterialFactory.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Utils/MaterialFactory.cs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Utils/MaterialFactory.cs.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Utils/RenderTextureFactory.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Utils/RenderTextureFactory.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Utils/RenderTextureFactory.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Utils/RenderTextureFactory.cs diff --git a/UnityProject/Assets/!ext/PostProcessing/Runtime/Utils/RenderTextureFactory.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Utils/RenderTextureFactory.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Runtime/Utils/RenderTextureFactory.cs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Runtime/Utils/RenderTextureFactory.cs.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Textures.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Textures.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Textures.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Textures.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Textures/LUTs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Textures/LUTs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Textures/LUTs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Textures/LUTs.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Textures/LUTs/NeutralLUT_16.png b/UnityProject/Assets/ThirdParty/PostProcessing/Textures/LUTs/NeutralLUT_16.png similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Textures/LUTs/NeutralLUT_16.png rename to UnityProject/Assets/ThirdParty/PostProcessing/Textures/LUTs/NeutralLUT_16.png diff --git a/UnityProject/Assets/!ext/PostProcessing/Textures/LUTs/NeutralLUT_16.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Textures/LUTs/NeutralLUT_16.png.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Textures/LUTs/NeutralLUT_16.png.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Textures/LUTs/NeutralLUT_16.png.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Textures/LUTs/NeutralLUT_32.png b/UnityProject/Assets/ThirdParty/PostProcessing/Textures/LUTs/NeutralLUT_32.png similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Textures/LUTs/NeutralLUT_32.png rename to UnityProject/Assets/ThirdParty/PostProcessing/Textures/LUTs/NeutralLUT_32.png diff --git a/UnityProject/Assets/!ext/PostProcessing/Textures/LUTs/NeutralLUT_32.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Textures/LUTs/NeutralLUT_32.png.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Textures/LUTs/NeutralLUT_32.png.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Textures/LUTs/NeutralLUT_32.png.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Textures/Lens Dirt.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Textures/Lens Dirt.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Textures/Lens Dirt.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Textures/Lens Dirt.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Textures/Lens Dirt/LensDirt00.png b/UnityProject/Assets/ThirdParty/PostProcessing/Textures/Lens Dirt/LensDirt00.png similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Textures/Lens Dirt/LensDirt00.png rename to UnityProject/Assets/ThirdParty/PostProcessing/Textures/Lens Dirt/LensDirt00.png diff --git a/UnityProject/Assets/!ext/PostProcessing/Textures/Lens Dirt/LensDirt00.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Textures/Lens Dirt/LensDirt00.png.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Textures/Lens Dirt/LensDirt00.png.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Textures/Lens Dirt/LensDirt00.png.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Textures/Lens Dirt/LensDirt01.png b/UnityProject/Assets/ThirdParty/PostProcessing/Textures/Lens Dirt/LensDirt01.png similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Textures/Lens Dirt/LensDirt01.png rename to UnityProject/Assets/ThirdParty/PostProcessing/Textures/Lens Dirt/LensDirt01.png diff --git a/UnityProject/Assets/!ext/PostProcessing/Textures/Lens Dirt/LensDirt01.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Textures/Lens Dirt/LensDirt01.png.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Textures/Lens Dirt/LensDirt01.png.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Textures/Lens Dirt/LensDirt01.png.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Textures/Lens Dirt/LensDirt02.png b/UnityProject/Assets/ThirdParty/PostProcessing/Textures/Lens Dirt/LensDirt02.png similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Textures/Lens Dirt/LensDirt02.png rename to UnityProject/Assets/ThirdParty/PostProcessing/Textures/Lens Dirt/LensDirt02.png diff --git a/UnityProject/Assets/!ext/PostProcessing/Textures/Lens Dirt/LensDirt02.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Textures/Lens Dirt/LensDirt02.png.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Textures/Lens Dirt/LensDirt02.png.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Textures/Lens Dirt/LensDirt02.png.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Textures/Lens Dirt/LensDirt03.png b/UnityProject/Assets/ThirdParty/PostProcessing/Textures/Lens Dirt/LensDirt03.png similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Textures/Lens Dirt/LensDirt03.png rename to UnityProject/Assets/ThirdParty/PostProcessing/Textures/Lens Dirt/LensDirt03.png diff --git a/UnityProject/Assets/!ext/PostProcessing/Textures/Lens Dirt/LensDirt03.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Textures/Lens Dirt/LensDirt03.png.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Textures/Lens Dirt/LensDirt03.png.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Textures/Lens Dirt/LensDirt03.png.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Textures/Spectral LUTs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Textures/Spectral LUTs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Textures/Spectral LUTs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Textures/Spectral LUTs.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Textures/Spectral LUTs/SpectralLut_BlueRed.tga b/UnityProject/Assets/ThirdParty/PostProcessing/Textures/Spectral LUTs/SpectralLut_BlueRed.tga similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Textures/Spectral LUTs/SpectralLut_BlueRed.tga rename to UnityProject/Assets/ThirdParty/PostProcessing/Textures/Spectral LUTs/SpectralLut_BlueRed.tga diff --git a/UnityProject/Assets/!ext/PostProcessing/Textures/Spectral LUTs/SpectralLut_BlueRed.tga.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Textures/Spectral LUTs/SpectralLut_BlueRed.tga.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Textures/Spectral LUTs/SpectralLut_BlueRed.tga.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Textures/Spectral LUTs/SpectralLut_BlueRed.tga.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Textures/Spectral LUTs/SpectralLut_GreenPurple.tga b/UnityProject/Assets/ThirdParty/PostProcessing/Textures/Spectral LUTs/SpectralLut_GreenPurple.tga similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Textures/Spectral LUTs/SpectralLut_GreenPurple.tga rename to UnityProject/Assets/ThirdParty/PostProcessing/Textures/Spectral LUTs/SpectralLut_GreenPurple.tga diff --git a/UnityProject/Assets/!ext/PostProcessing/Textures/Spectral LUTs/SpectralLut_GreenPurple.tga.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Textures/Spectral LUTs/SpectralLut_GreenPurple.tga.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Textures/Spectral LUTs/SpectralLut_GreenPurple.tga.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Textures/Spectral LUTs/SpectralLut_GreenPurple.tga.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Textures/Spectral LUTs/SpectralLut_PurpleGreen.tga b/UnityProject/Assets/ThirdParty/PostProcessing/Textures/Spectral LUTs/SpectralLut_PurpleGreen.tga similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Textures/Spectral LUTs/SpectralLut_PurpleGreen.tga rename to UnityProject/Assets/ThirdParty/PostProcessing/Textures/Spectral LUTs/SpectralLut_PurpleGreen.tga diff --git a/UnityProject/Assets/!ext/PostProcessing/Textures/Spectral LUTs/SpectralLut_PurpleGreen.tga.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Textures/Spectral LUTs/SpectralLut_PurpleGreen.tga.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Textures/Spectral LUTs/SpectralLut_PurpleGreen.tga.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Textures/Spectral LUTs/SpectralLut_PurpleGreen.tga.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Textures/Spectral LUTs/SpectralLut_RedBlue.tga b/UnityProject/Assets/ThirdParty/PostProcessing/Textures/Spectral LUTs/SpectralLut_RedBlue.tga similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Textures/Spectral LUTs/SpectralLut_RedBlue.tga rename to UnityProject/Assets/ThirdParty/PostProcessing/Textures/Spectral LUTs/SpectralLut_RedBlue.tga diff --git a/UnityProject/Assets/!ext/PostProcessing/Textures/Spectral LUTs/SpectralLut_RedBlue.tga.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Textures/Spectral LUTs/SpectralLut_RedBlue.tga.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Textures/Spectral LUTs/SpectralLut_RedBlue.tga.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Textures/Spectral LUTs/SpectralLut_RedBlue.tga.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Utilities.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Utilities.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Utilities.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Utilities.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Utilities/CustomMotionTexture.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Utilities/CustomMotionTexture.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Utilities/CustomMotionTexture.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Utilities/CustomMotionTexture.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Utilities/CustomMotionTexture/CustomMotionVectorDebugProfile.asset b/UnityProject/Assets/ThirdParty/PostProcessing/Utilities/CustomMotionTexture/CustomMotionVectorDebugProfile.asset similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Utilities/CustomMotionTexture/CustomMotionVectorDebugProfile.asset rename to UnityProject/Assets/ThirdParty/PostProcessing/Utilities/CustomMotionTexture/CustomMotionVectorDebugProfile.asset diff --git a/UnityProject/Assets/!ext/PostProcessing/Utilities/CustomMotionTexture/CustomMotionVectorDebugProfile.asset.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Utilities/CustomMotionTexture/CustomMotionVectorDebugProfile.asset.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Utilities/CustomMotionTexture/CustomMotionVectorDebugProfile.asset.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Utilities/CustomMotionTexture/CustomMotionVectorDebugProfile.asset.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Utilities/CustomMotionTexture/ExampleScene.unity b/UnityProject/Assets/ThirdParty/PostProcessing/Utilities/CustomMotionTexture/ExampleScene.unity similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Utilities/CustomMotionTexture/ExampleScene.unity rename to UnityProject/Assets/ThirdParty/PostProcessing/Utilities/CustomMotionTexture/ExampleScene.unity diff --git a/UnityProject/Assets/!ext/PostProcessing/Utilities/CustomMotionTexture/ExampleScene.unity.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Utilities/CustomMotionTexture/ExampleScene.unity.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Utilities/CustomMotionTexture/ExampleScene.unity.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Utilities/CustomMotionTexture/ExampleScene.unity.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Utilities/CustomMotionTexture/ExampleWheelController.cs b/UnityProject/Assets/ThirdParty/PostProcessing/Utilities/CustomMotionTexture/ExampleWheelController.cs similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Utilities/CustomMotionTexture/ExampleWheelController.cs rename to UnityProject/Assets/ThirdParty/PostProcessing/Utilities/CustomMotionTexture/ExampleWheelController.cs diff --git a/UnityProject/Assets/!ext/PostProcessing/Utilities/CustomMotionTexture/ExampleWheelController.cs.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Utilities/CustomMotionTexture/ExampleWheelController.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Utilities/CustomMotionTexture/ExampleWheelController.cs.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Utilities/CustomMotionTexture/ExampleWheelController.cs.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Utilities/CustomMotionTexture/Materials.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Utilities/CustomMotionTexture/Materials.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Utilities/CustomMotionTexture/Materials.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Utilities/CustomMotionTexture/Materials.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Utilities/CustomMotionTexture/Materials/DebugMotionVectors.mat b/UnityProject/Assets/ThirdParty/PostProcessing/Utilities/CustomMotionTexture/Materials/DebugMotionVectors.mat similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Utilities/CustomMotionTexture/Materials/DebugMotionVectors.mat rename to UnityProject/Assets/ThirdParty/PostProcessing/Utilities/CustomMotionTexture/Materials/DebugMotionVectors.mat diff --git a/UnityProject/Assets/!ext/PostProcessing/Utilities/CustomMotionTexture/Materials/DebugMotionVectors.mat.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Utilities/CustomMotionTexture/Materials/DebugMotionVectors.mat.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Utilities/CustomMotionTexture/Materials/DebugMotionVectors.mat.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Utilities/CustomMotionTexture/Materials/DebugMotionVectors.mat.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Utilities/CustomMotionTexture/Materials/DebugQuad.mat b/UnityProject/Assets/ThirdParty/PostProcessing/Utilities/CustomMotionTexture/Materials/DebugQuad.mat similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Utilities/CustomMotionTexture/Materials/DebugQuad.mat rename to UnityProject/Assets/ThirdParty/PostProcessing/Utilities/CustomMotionTexture/Materials/DebugQuad.mat diff --git a/UnityProject/Assets/!ext/PostProcessing/Utilities/CustomMotionTexture/Materials/DebugQuad.mat.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Utilities/CustomMotionTexture/Materials/DebugQuad.mat.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Utilities/CustomMotionTexture/Materials/DebugQuad.mat.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Utilities/CustomMotionTexture/Materials/DebugQuad.mat.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Utilities/CustomMotionTexture/Materials/UVChecker.mat b/UnityProject/Assets/ThirdParty/PostProcessing/Utilities/CustomMotionTexture/Materials/UVChecker.mat similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Utilities/CustomMotionTexture/Materials/UVChecker.mat rename to UnityProject/Assets/ThirdParty/PostProcessing/Utilities/CustomMotionTexture/Materials/UVChecker.mat diff --git a/UnityProject/Assets/!ext/PostProcessing/Utilities/CustomMotionTexture/Materials/UVChecker.mat.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Utilities/CustomMotionTexture/Materials/UVChecker.mat.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Utilities/CustomMotionTexture/Materials/UVChecker.mat.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Utilities/CustomMotionTexture/Materials/UVChecker.mat.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Utilities/CustomMotionTexture/Materials/WheelMotionVectors.mat b/UnityProject/Assets/ThirdParty/PostProcessing/Utilities/CustomMotionTexture/Materials/WheelMotionVectors.mat similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Utilities/CustomMotionTexture/Materials/WheelMotionVectors.mat rename to UnityProject/Assets/ThirdParty/PostProcessing/Utilities/CustomMotionTexture/Materials/WheelMotionVectors.mat diff --git a/UnityProject/Assets/!ext/PostProcessing/Utilities/CustomMotionTexture/Materials/WheelMotionVectors.mat.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Utilities/CustomMotionTexture/Materials/WheelMotionVectors.mat.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Utilities/CustomMotionTexture/Materials/WheelMotionVectors.mat.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Utilities/CustomMotionTexture/Materials/WheelMotionVectors.mat.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Utilities/CustomMotionTexture/Models.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Utilities/CustomMotionTexture/Models.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Utilities/CustomMotionTexture/Models.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Utilities/CustomMotionTexture/Models.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Utilities/CustomMotionTexture/Models/WheelMovecs.FBX b/UnityProject/Assets/ThirdParty/PostProcessing/Utilities/CustomMotionTexture/Models/WheelMovecs.FBX similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Utilities/CustomMotionTexture/Models/WheelMovecs.FBX rename to UnityProject/Assets/ThirdParty/PostProcessing/Utilities/CustomMotionTexture/Models/WheelMovecs.FBX diff --git a/UnityProject/Assets/!ext/PostProcessing/Utilities/CustomMotionTexture/Models/WheelMovecs.FBX.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Utilities/CustomMotionTexture/Models/WheelMovecs.FBX.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Utilities/CustomMotionTexture/Models/WheelMovecs.FBX.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Utilities/CustomMotionTexture/Models/WheelMovecs.FBX.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Utilities/CustomMotionTexture/Shaders.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Utilities/CustomMotionTexture/Shaders.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Utilities/CustomMotionTexture/Shaders.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Utilities/CustomMotionTexture/Shaders.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Utilities/CustomMotionTexture/Shaders/CustomMotionVectorTexture.shader b/UnityProject/Assets/ThirdParty/PostProcessing/Utilities/CustomMotionTexture/Shaders/CustomMotionVectorTexture.shader similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Utilities/CustomMotionTexture/Shaders/CustomMotionVectorTexture.shader rename to UnityProject/Assets/ThirdParty/PostProcessing/Utilities/CustomMotionTexture/Shaders/CustomMotionVectorTexture.shader diff --git a/UnityProject/Assets/!ext/PostProcessing/Utilities/CustomMotionTexture/Shaders/CustomMotionVectorTexture.shader.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Utilities/CustomMotionTexture/Shaders/CustomMotionVectorTexture.shader.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Utilities/CustomMotionTexture/Shaders/CustomMotionVectorTexture.shader.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Utilities/CustomMotionTexture/Shaders/CustomMotionVectorTexture.shader.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Utilities/CustomMotionTexture/Textures.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Utilities/CustomMotionTexture/Textures.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Utilities/CustomMotionTexture/Textures.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Utilities/CustomMotionTexture/Textures.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Utilities/CustomMotionTexture/Textures/DebugMotionVectors.png b/UnityProject/Assets/ThirdParty/PostProcessing/Utilities/CustomMotionTexture/Textures/DebugMotionVectors.png similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Utilities/CustomMotionTexture/Textures/DebugMotionVectors.png rename to UnityProject/Assets/ThirdParty/PostProcessing/Utilities/CustomMotionTexture/Textures/DebugMotionVectors.png diff --git a/UnityProject/Assets/!ext/PostProcessing/Utilities/CustomMotionTexture/Textures/DebugMotionVectors.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Utilities/CustomMotionTexture/Textures/DebugMotionVectors.png.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Utilities/CustomMotionTexture/Textures/DebugMotionVectors.png.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Utilities/CustomMotionTexture/Textures/DebugMotionVectors.png.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Utilities/CustomMotionTexture/Textures/UVChecker.png b/UnityProject/Assets/ThirdParty/PostProcessing/Utilities/CustomMotionTexture/Textures/UVChecker.png similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Utilities/CustomMotionTexture/Textures/UVChecker.png rename to UnityProject/Assets/ThirdParty/PostProcessing/Utilities/CustomMotionTexture/Textures/UVChecker.png diff --git a/UnityProject/Assets/!ext/PostProcessing/Utilities/CustomMotionTexture/Textures/UVChecker.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Utilities/CustomMotionTexture/Textures/UVChecker.png.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Utilities/CustomMotionTexture/Textures/UVChecker.png.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Utilities/CustomMotionTexture/Textures/UVChecker.png.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/Utilities/CustomMotionTexture/Textures/WheelMotionVectors.png b/UnityProject/Assets/ThirdParty/PostProcessing/Utilities/CustomMotionTexture/Textures/WheelMotionVectors.png similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Utilities/CustomMotionTexture/Textures/WheelMotionVectors.png rename to UnityProject/Assets/ThirdParty/PostProcessing/Utilities/CustomMotionTexture/Textures/WheelMotionVectors.png diff --git a/UnityProject/Assets/!ext/PostProcessing/Utilities/CustomMotionTexture/Textures/WheelMotionVectors.png.meta b/UnityProject/Assets/ThirdParty/PostProcessing/Utilities/CustomMotionTexture/Textures/WheelMotionVectors.png.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/Utilities/CustomMotionTexture/Textures/WheelMotionVectors.png.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/Utilities/CustomMotionTexture/Textures/WheelMotionVectors.png.meta diff --git a/UnityProject/Assets/!ext/PostProcessing/post-processing.asset b/UnityProject/Assets/ThirdParty/PostProcessing/post-processing.asset similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/post-processing.asset rename to UnityProject/Assets/ThirdParty/PostProcessing/post-processing.asset diff --git a/UnityProject/Assets/!ext/PostProcessing/post-processing.asset.meta b/UnityProject/Assets/ThirdParty/PostProcessing/post-processing.asset.meta similarity index 100% rename from UnityProject/Assets/!ext/PostProcessing/post-processing.asset.meta rename to UnityProject/Assets/ThirdParty/PostProcessing/post-processing.asset.meta diff --git a/UnityProject/Assets/!ext/Standard Assets.meta b/UnityProject/Assets/ThirdParty/Standard Assets.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets.meta rename to UnityProject/Assets/ThirdParty/Standard Assets.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems.meta b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials.meta b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleAfterburner.mat b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleAfterburner.mat similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleAfterburner.mat rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleAfterburner.mat diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleAfterburner.mat.meta b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleAfterburner.mat.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleAfterburner.mat.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleAfterburner.mat.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleDuststorm.mat b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleDuststorm.mat similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleDuststorm.mat rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleDuststorm.mat diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleDuststorm.mat.meta b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleDuststorm.mat.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleDuststorm.mat.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleDuststorm.mat.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleFireball.mat b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleFireball.mat similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleFireball.mat rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleFireball.mat diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleFireball.mat.meta b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleFireball.mat.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleFireball.mat.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleFireball.mat.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleFirecloud.mat b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleFirecloud.mat similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleFirecloud.mat rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleFirecloud.mat diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleFirecloud.mat.meta b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleFirecloud.mat.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleFirecloud.mat.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleFirecloud.mat.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleFirework.mat b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleFirework.mat similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleFirework.mat rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleFirework.mat diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleFirework.mat.meta b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleFirework.mat.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleFirework.mat.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleFirework.mat.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleFlameLicks.mat b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleFlameLicks.mat similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleFlameLicks.mat rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleFlameLicks.mat diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleFlameLicks.mat.meta b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleFlameLicks.mat.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleFlameLicks.mat.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleFlameLicks.mat.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleFlames.mat b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleFlames.mat similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleFlames.mat rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleFlames.mat diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleFlames.mat.meta b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleFlames.mat.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleFlames.mat.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleFlames.mat.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleGlow.mat b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleGlow.mat similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleGlow.mat rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleGlow.mat diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleGlow.mat.meta b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleGlow.mat.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleGlow.mat.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleGlow.mat.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleSmokeBlack.mat b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleSmokeBlack.mat similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleSmokeBlack.mat rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleSmokeBlack.mat diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleSmokeBlack.mat.meta b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleSmokeBlack.mat.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleSmokeBlack.mat.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleSmokeBlack.mat.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleSmokeMobile.mat b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleSmokeMobile.mat similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleSmokeMobile.mat rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleSmokeMobile.mat diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleSmokeMobile.mat.meta b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleSmokeMobile.mat.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleSmokeMobile.mat.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleSmokeMobile.mat.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleSmokeVertlit.mat b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleSmokeVertlit.mat similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleSmokeVertlit.mat rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleSmokeVertlit.mat diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleSmokeVertlit.mat.meta b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleSmokeVertlit.mat.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleSmokeVertlit.mat.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleSmokeVertlit.mat.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleSmokeWhite.mat b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleSmokeWhite.mat similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleSmokeWhite.mat rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleSmokeWhite.mat diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleSmokeWhite.mat.meta b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleSmokeWhite.mat.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleSmokeWhite.mat.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleSmokeWhite.mat.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleSpark.mat b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleSpark.mat similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleSpark.mat rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleSpark.mat diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleSpark.mat.meta b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleSpark.mat.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleSpark.mat.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleSpark.mat.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleSplashes.mat b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleSplashes.mat similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleSplashes.mat rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleSplashes.mat diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleSplashes.mat.meta b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleSplashes.mat.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleSplashes.mat.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleSplashes.mat.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleSpray.mat b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleSpray.mat similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleSpray.mat rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleSpray.mat diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleSpray.mat.meta b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleSpray.mat.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleSpray.mat.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleSpray.mat.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleSteam.mat b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleSteam.mat similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleSteam.mat rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleSteam.mat diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleSteam.mat.meta b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleSteam.mat.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleSteam.mat.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleSteam.mat.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleSteamMobile.mat b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleSteamMobile.mat similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleSteamMobile.mat rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleSteamMobile.mat diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleSteamMobile.mat.meta b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleSteamMobile.mat.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleSteamMobile.mat.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleSteamMobile.mat.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleWaterSpray.mat b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleWaterSpray.mat similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleWaterSpray.mat rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleWaterSpray.mat diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleWaterSpray.mat.meta b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleWaterSpray.mat.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Materials/ParticleWaterSpray.mat.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Materials/ParticleWaterSpray.mat.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/ParticleSystemsGuidelines.txt b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/ParticleSystemsGuidelines.txt similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/ParticleSystemsGuidelines.txt rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/ParticleSystemsGuidelines.txt diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/ParticleSystemsGuidelines.txt.meta b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/ParticleSystemsGuidelines.txt.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/ParticleSystemsGuidelines.txt.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/ParticleSystemsGuidelines.txt.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Prefabs.meta b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Prefabs.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Prefabs.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Prefabs.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Prefabs/Afterburner.prefab b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Prefabs/Afterburner.prefab similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Prefabs/Afterburner.prefab rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Prefabs/Afterburner.prefab diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Prefabs/Afterburner.prefab.meta b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Prefabs/Afterburner.prefab.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Prefabs/Afterburner.prefab.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Prefabs/Afterburner.prefab.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Prefabs/DustStorm.prefab b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Prefabs/DustStorm.prefab similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Prefabs/DustStorm.prefab rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Prefabs/DustStorm.prefab diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Prefabs/DustStorm.prefab.meta b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Prefabs/DustStorm.prefab.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Prefabs/DustStorm.prefab.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Prefabs/DustStorm.prefab.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Prefabs/DustStormMobile.prefab b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Prefabs/DustStormMobile.prefab similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Prefabs/DustStormMobile.prefab rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Prefabs/DustStormMobile.prefab diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Prefabs/DustStormMobile.prefab.meta b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Prefabs/DustStormMobile.prefab.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Prefabs/DustStormMobile.prefab.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Prefabs/DustStormMobile.prefab.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Prefabs/Explosion.prefab b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Prefabs/Explosion.prefab similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Prefabs/Explosion.prefab rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Prefabs/Explosion.prefab diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Prefabs/Explosion.prefab.meta b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Prefabs/Explosion.prefab.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Prefabs/Explosion.prefab.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Prefabs/Explosion.prefab.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Prefabs/ExplosionMobile.prefab b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Prefabs/ExplosionMobile.prefab similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Prefabs/ExplosionMobile.prefab rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Prefabs/ExplosionMobile.prefab diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Prefabs/ExplosionMobile.prefab.meta b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Prefabs/ExplosionMobile.prefab.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Prefabs/ExplosionMobile.prefab.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Prefabs/ExplosionMobile.prefab.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Prefabs/FireComplex.prefab b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Prefabs/FireComplex.prefab similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Prefabs/FireComplex.prefab rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Prefabs/FireComplex.prefab diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Prefabs/FireComplex.prefab.meta b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Prefabs/FireComplex.prefab.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Prefabs/FireComplex.prefab.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Prefabs/FireComplex.prefab.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Prefabs/FireMobile.prefab b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Prefabs/FireMobile.prefab similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Prefabs/FireMobile.prefab rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Prefabs/FireMobile.prefab diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Prefabs/FireMobile.prefab.meta b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Prefabs/FireMobile.prefab.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Prefabs/FireMobile.prefab.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Prefabs/FireMobile.prefab.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Prefabs/Fireworks.prefab b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Prefabs/Fireworks.prefab similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Prefabs/Fireworks.prefab rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Prefabs/Fireworks.prefab diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Prefabs/Fireworks.prefab.meta b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Prefabs/Fireworks.prefab.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Prefabs/Fireworks.prefab.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Prefabs/Fireworks.prefab.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Prefabs/Flare.prefab b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Prefabs/Flare.prefab similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Prefabs/Flare.prefab rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Prefabs/Flare.prefab diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Prefabs/Flare.prefab.meta b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Prefabs/Flare.prefab.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Prefabs/Flare.prefab.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Prefabs/Flare.prefab.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Prefabs/FlareMobile.prefab b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Prefabs/FlareMobile.prefab similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Prefabs/FlareMobile.prefab rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Prefabs/FlareMobile.prefab diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Prefabs/FlareMobile.prefab.meta b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Prefabs/FlareMobile.prefab.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Prefabs/FlareMobile.prefab.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Prefabs/FlareMobile.prefab.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Prefabs/Hose.prefab b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Prefabs/Hose.prefab similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Prefabs/Hose.prefab rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Prefabs/Hose.prefab diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Prefabs/Hose.prefab.meta b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Prefabs/Hose.prefab.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Prefabs/Hose.prefab.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Prefabs/Hose.prefab.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Prefabs/HoseMobile.prefab b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Prefabs/HoseMobile.prefab similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Prefabs/HoseMobile.prefab rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Prefabs/HoseMobile.prefab diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Prefabs/HoseMobile.prefab.meta b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Prefabs/HoseMobile.prefab.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Prefabs/HoseMobile.prefab.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Prefabs/HoseMobile.prefab.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Prefabs/Smoke.prefab b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Prefabs/Smoke.prefab similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Prefabs/Smoke.prefab rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Prefabs/Smoke.prefab diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Prefabs/Smoke.prefab.meta b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Prefabs/Smoke.prefab.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Prefabs/Smoke.prefab.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Prefabs/Smoke.prefab.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Prefabs/Steam.prefab b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Prefabs/Steam.prefab similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Prefabs/Steam.prefab rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Prefabs/Steam.prefab diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Prefabs/Steam.prefab.meta b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Prefabs/Steam.prefab.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Prefabs/Steam.prefab.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Prefabs/Steam.prefab.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Prefabs/SteamMobile.prefab b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Prefabs/SteamMobile.prefab similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Prefabs/SteamMobile.prefab rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Prefabs/SteamMobile.prefab diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Prefabs/SteamMobile.prefab.meta b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Prefabs/SteamMobile.prefab.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Prefabs/SteamMobile.prefab.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Prefabs/SteamMobile.prefab.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Prefabs/TyreBurnoutSmoke.prefab b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Prefabs/TyreBurnoutSmoke.prefab similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Prefabs/TyreBurnoutSmoke.prefab rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Prefabs/TyreBurnoutSmoke.prefab diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Prefabs/TyreBurnoutSmoke.prefab.meta b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Prefabs/TyreBurnoutSmoke.prefab.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Prefabs/TyreBurnoutSmoke.prefab.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Prefabs/TyreBurnoutSmoke.prefab.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Prefabs/WildFire.prefab b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Prefabs/WildFire.prefab similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Prefabs/WildFire.prefab rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Prefabs/WildFire.prefab diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Prefabs/WildFire.prefab.meta b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Prefabs/WildFire.prefab.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Prefabs/WildFire.prefab.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Prefabs/WildFire.prefab.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Scripts.meta b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Scripts.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Scripts.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Scripts.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Scripts/AfterburnerPhysicsForce.cs b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Scripts/AfterburnerPhysicsForce.cs similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Scripts/AfterburnerPhysicsForce.cs rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Scripts/AfterburnerPhysicsForce.cs diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Scripts/AfterburnerPhysicsForce.cs.meta b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Scripts/AfterburnerPhysicsForce.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Scripts/AfterburnerPhysicsForce.cs.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Scripts/AfterburnerPhysicsForce.cs.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Scripts/ExplosionFireAndDebris.cs b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Scripts/ExplosionFireAndDebris.cs similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Scripts/ExplosionFireAndDebris.cs rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Scripts/ExplosionFireAndDebris.cs diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Scripts/ExplosionFireAndDebris.cs.meta b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Scripts/ExplosionFireAndDebris.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Scripts/ExplosionFireAndDebris.cs.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Scripts/ExplosionFireAndDebris.cs.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Scripts/ExplosionPhysicsForce.cs b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Scripts/ExplosionPhysicsForce.cs similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Scripts/ExplosionPhysicsForce.cs rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Scripts/ExplosionPhysicsForce.cs diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Scripts/ExplosionPhysicsForce.cs.meta b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Scripts/ExplosionPhysicsForce.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Scripts/ExplosionPhysicsForce.cs.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Scripts/ExplosionPhysicsForce.cs.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Scripts/Explosive.cs b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Scripts/Explosive.cs similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Scripts/Explosive.cs rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Scripts/Explosive.cs diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Scripts/Explosive.cs.meta b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Scripts/Explosive.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Scripts/Explosive.cs.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Scripts/Explosive.cs.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Scripts/ExtinguishableParticleSystem.cs b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Scripts/ExtinguishableParticleSystem.cs similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Scripts/ExtinguishableParticleSystem.cs rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Scripts/ExtinguishableParticleSystem.cs diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Scripts/ExtinguishableParticleSystem.cs.meta b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Scripts/ExtinguishableParticleSystem.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Scripts/ExtinguishableParticleSystem.cs.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Scripts/ExtinguishableParticleSystem.cs.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Scripts/FireLight.cs b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Scripts/FireLight.cs similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Scripts/FireLight.cs rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Scripts/FireLight.cs diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Scripts/FireLight.cs.meta b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Scripts/FireLight.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Scripts/FireLight.cs.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Scripts/FireLight.cs.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Scripts/Hose.cs b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Scripts/Hose.cs similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Scripts/Hose.cs rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Scripts/Hose.cs diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Scripts/Hose.cs.meta b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Scripts/Hose.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Scripts/Hose.cs.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Scripts/Hose.cs.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Scripts/ParticleSystemMultiplier.cs b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Scripts/ParticleSystemMultiplier.cs similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Scripts/ParticleSystemMultiplier.cs rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Scripts/ParticleSystemMultiplier.cs diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Scripts/ParticleSystemMultiplier.cs.meta b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Scripts/ParticleSystemMultiplier.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Scripts/ParticleSystemMultiplier.cs.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Scripts/ParticleSystemMultiplier.cs.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Scripts/SmokeParticles.cs b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Scripts/SmokeParticles.cs similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Scripts/SmokeParticles.cs rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Scripts/SmokeParticles.cs diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Scripts/SmokeParticles.cs.meta b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Scripts/SmokeParticles.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Scripts/SmokeParticles.cs.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Scripts/SmokeParticles.cs.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Scripts/WaterHoseParticles.cs b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Scripts/WaterHoseParticles.cs similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Scripts/WaterHoseParticles.cs rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Scripts/WaterHoseParticles.cs diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Scripts/WaterHoseParticles.cs.meta b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Scripts/WaterHoseParticles.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Scripts/WaterHoseParticles.cs.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Scripts/WaterHoseParticles.cs.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Shaders.meta b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Shaders.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Shaders.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Shaders.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Shaders/PriorityParticleAdd.shader b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Shaders/PriorityParticleAdd.shader similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Shaders/PriorityParticleAdd.shader rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Shaders/PriorityParticleAdd.shader diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Shaders/PriorityParticleAdd.shader.meta b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Shaders/PriorityParticleAdd.shader.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Shaders/PriorityParticleAdd.shader.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Shaders/PriorityParticleAdd.shader.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Shaders/PriorityParticleAddSoft.shader b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Shaders/PriorityParticleAddSoft.shader similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Shaders/PriorityParticleAddSoft.shader rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Shaders/PriorityParticleAddSoft.shader diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Shaders/PriorityParticleAddSoft.shader.meta b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Shaders/PriorityParticleAddSoft.shader.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Shaders/PriorityParticleAddSoft.shader.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Shaders/PriorityParticleAddSoft.shader.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Shaders/PriorityParticleAlpha.shader b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Shaders/PriorityParticleAlpha.shader similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Shaders/PriorityParticleAlpha.shader rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Shaders/PriorityParticleAlpha.shader diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Shaders/PriorityParticleAlpha.shader.meta b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Shaders/PriorityParticleAlpha.shader.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Shaders/PriorityParticleAlpha.shader.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Shaders/PriorityParticleAlpha.shader.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Textures.meta b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Textures.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Textures.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Textures.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Textures/ParticleBokeh.png b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Textures/ParticleBokeh.png similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Textures/ParticleBokeh.png rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Textures/ParticleBokeh.png diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Textures/ParticleBokeh.png.meta b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Textures/ParticleBokeh.png.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Textures/ParticleBokeh.png.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Textures/ParticleBokeh.png.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Textures/ParticleCloudBlack.png b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Textures/ParticleCloudBlack.png similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Textures/ParticleCloudBlack.png rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Textures/ParticleCloudBlack.png diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Textures/ParticleCloudBlack.png.meta b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Textures/ParticleCloudBlack.png.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Textures/ParticleCloudBlack.png.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Textures/ParticleCloudBlack.png.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Textures/ParticleCloudWhite.png b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Textures/ParticleCloudWhite.png similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Textures/ParticleCloudWhite.png rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Textures/ParticleCloudWhite.png diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Textures/ParticleCloudWhite.png.meta b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Textures/ParticleCloudWhite.png.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Textures/ParticleCloudWhite.png.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Textures/ParticleCloudWhite.png.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Textures/ParticleFireballSheet.png b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Textures/ParticleFireballSheet.png similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Textures/ParticleFireballSheet.png rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Textures/ParticleFireballSheet.png diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Textures/ParticleFireballSheet.png.meta b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Textures/ParticleFireballSheet.png.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Textures/ParticleFireballSheet.png.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Textures/ParticleFireballSheet.png.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Textures/ParticleFirecloud.png b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Textures/ParticleFirecloud.png similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Textures/ParticleFirecloud.png rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Textures/ParticleFirecloud.png diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Textures/ParticleFirecloud.png.meta b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Textures/ParticleFirecloud.png.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Textures/ParticleFirecloud.png.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Textures/ParticleFirecloud.png.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Textures/ParticleFlameLickSheet.png b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Textures/ParticleFlameLickSheet.png similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Textures/ParticleFlameLickSheet.png rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Textures/ParticleFlameLickSheet.png diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Textures/ParticleFlameLickSheet.png.meta b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Textures/ParticleFlameLickSheet.png.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Textures/ParticleFlameLickSheet.png.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Textures/ParticleFlameLickSheet.png.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Textures/ParticleFlamesSheet.png b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Textures/ParticleFlamesSheet.png similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Textures/ParticleFlamesSheet.png rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Textures/ParticleFlamesSheet.png diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Textures/ParticleFlamesSheet.png.meta b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Textures/ParticleFlamesSheet.png.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Textures/ParticleFlamesSheet.png.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Textures/ParticleFlamesSheet.png.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Textures/ParticleFlare.png b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Textures/ParticleFlare.png similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Textures/ParticleFlare.png rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Textures/ParticleFlare.png diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Textures/ParticleFlare.png.meta b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Textures/ParticleFlare.png.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Textures/ParticleFlare.png.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Textures/ParticleFlare.png.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Textures/Spark.png b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Textures/Spark.png similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Textures/Spark.png rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Textures/Spark.png diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Textures/Spark.png.meta b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Textures/Spark.png.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Textures/Spark.png.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Textures/Spark.png.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Textures/SplashesFineParticle.png b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Textures/SplashesFineParticle.png similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Textures/SplashesFineParticle.png rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Textures/SplashesFineParticle.png diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Textures/SplashesFineParticle.png.meta b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Textures/SplashesFineParticle.png.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Textures/SplashesFineParticle.png.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Textures/SplashesFineParticle.png.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Textures/SplashesLargeParticle.png b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Textures/SplashesLargeParticle.png similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Textures/SplashesLargeParticle.png rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Textures/SplashesLargeParticle.png diff --git a/UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Textures/SplashesLargeParticle.png.meta b/UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Textures/SplashesLargeParticle.png.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/ParticleSystems/Textures/SplashesLargeParticle.png.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/ParticleSystems/Textures/SplashesLargeParticle.png.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/Utility.meta b/UnityProject/Assets/ThirdParty/Standard Assets/Utility.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/Utility.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/Utility.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/Utility/ActivateTrigger.cs b/UnityProject/Assets/ThirdParty/Standard Assets/Utility/ActivateTrigger.cs similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/Utility/ActivateTrigger.cs rename to UnityProject/Assets/ThirdParty/Standard Assets/Utility/ActivateTrigger.cs diff --git a/UnityProject/Assets/!ext/Standard Assets/Utility/ActivateTrigger.cs.meta b/UnityProject/Assets/ThirdParty/Standard Assets/Utility/ActivateTrigger.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/Utility/ActivateTrigger.cs.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/Utility/ActivateTrigger.cs.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/Utility/AlphaButtonClickMask.cs b/UnityProject/Assets/ThirdParty/Standard Assets/Utility/AlphaButtonClickMask.cs similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/Utility/AlphaButtonClickMask.cs rename to UnityProject/Assets/ThirdParty/Standard Assets/Utility/AlphaButtonClickMask.cs diff --git a/UnityProject/Assets/!ext/Standard Assets/Utility/AlphaButtonClickMask.cs.meta b/UnityProject/Assets/ThirdParty/Standard Assets/Utility/AlphaButtonClickMask.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/Utility/AlphaButtonClickMask.cs.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/Utility/AlphaButtonClickMask.cs.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/Utility/AutoMobileShaderSwitch.cs b/UnityProject/Assets/ThirdParty/Standard Assets/Utility/AutoMobileShaderSwitch.cs similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/Utility/AutoMobileShaderSwitch.cs rename to UnityProject/Assets/ThirdParty/Standard Assets/Utility/AutoMobileShaderSwitch.cs diff --git a/UnityProject/Assets/!ext/Standard Assets/Utility/AutoMobileShaderSwitch.cs.meta b/UnityProject/Assets/ThirdParty/Standard Assets/Utility/AutoMobileShaderSwitch.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/Utility/AutoMobileShaderSwitch.cs.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/Utility/AutoMobileShaderSwitch.cs.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/Utility/AutoMoveAndRotate.cs b/UnityProject/Assets/ThirdParty/Standard Assets/Utility/AutoMoveAndRotate.cs similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/Utility/AutoMoveAndRotate.cs rename to UnityProject/Assets/ThirdParty/Standard Assets/Utility/AutoMoveAndRotate.cs diff --git a/UnityProject/Assets/!ext/Standard Assets/Utility/AutoMoveAndRotate.cs.meta b/UnityProject/Assets/ThirdParty/Standard Assets/Utility/AutoMoveAndRotate.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/Utility/AutoMoveAndRotate.cs.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/Utility/AutoMoveAndRotate.cs.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/Utility/CameraRefocus.cs b/UnityProject/Assets/ThirdParty/Standard Assets/Utility/CameraRefocus.cs similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/Utility/CameraRefocus.cs rename to UnityProject/Assets/ThirdParty/Standard Assets/Utility/CameraRefocus.cs diff --git a/UnityProject/Assets/!ext/Standard Assets/Utility/CameraRefocus.cs.meta b/UnityProject/Assets/ThirdParty/Standard Assets/Utility/CameraRefocus.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/Utility/CameraRefocus.cs.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/Utility/CameraRefocus.cs.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/Utility/CurveControlledBob.cs b/UnityProject/Assets/ThirdParty/Standard Assets/Utility/CurveControlledBob.cs similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/Utility/CurveControlledBob.cs rename to UnityProject/Assets/ThirdParty/Standard Assets/Utility/CurveControlledBob.cs diff --git a/UnityProject/Assets/!ext/Standard Assets/Utility/CurveControlledBob.cs.meta b/UnityProject/Assets/ThirdParty/Standard Assets/Utility/CurveControlledBob.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/Utility/CurveControlledBob.cs.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/Utility/CurveControlledBob.cs.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/Utility/DragRigidbody.cs b/UnityProject/Assets/ThirdParty/Standard Assets/Utility/DragRigidbody.cs similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/Utility/DragRigidbody.cs rename to UnityProject/Assets/ThirdParty/Standard Assets/Utility/DragRigidbody.cs diff --git a/UnityProject/Assets/!ext/Standard Assets/Utility/DragRigidbody.cs.meta b/UnityProject/Assets/ThirdParty/Standard Assets/Utility/DragRigidbody.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/Utility/DragRigidbody.cs.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/Utility/DragRigidbody.cs.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/Utility/DynamicShadowSettings.cs b/UnityProject/Assets/ThirdParty/Standard Assets/Utility/DynamicShadowSettings.cs similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/Utility/DynamicShadowSettings.cs rename to UnityProject/Assets/ThirdParty/Standard Assets/Utility/DynamicShadowSettings.cs diff --git a/UnityProject/Assets/!ext/Standard Assets/Utility/DynamicShadowSettings.cs.meta b/UnityProject/Assets/ThirdParty/Standard Assets/Utility/DynamicShadowSettings.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/Utility/DynamicShadowSettings.cs.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/Utility/DynamicShadowSettings.cs.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/Utility/EventSystemChecker.cs b/UnityProject/Assets/ThirdParty/Standard Assets/Utility/EventSystemChecker.cs similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/Utility/EventSystemChecker.cs rename to UnityProject/Assets/ThirdParty/Standard Assets/Utility/EventSystemChecker.cs diff --git a/UnityProject/Assets/!ext/Standard Assets/Utility/EventSystemChecker.cs.meta b/UnityProject/Assets/ThirdParty/Standard Assets/Utility/EventSystemChecker.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/Utility/EventSystemChecker.cs.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/Utility/EventSystemChecker.cs.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/Utility/FOVKick.cs b/UnityProject/Assets/ThirdParty/Standard Assets/Utility/FOVKick.cs similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/Utility/FOVKick.cs rename to UnityProject/Assets/ThirdParty/Standard Assets/Utility/FOVKick.cs diff --git a/UnityProject/Assets/!ext/Standard Assets/Utility/FOVKick.cs.meta b/UnityProject/Assets/ThirdParty/Standard Assets/Utility/FOVKick.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/Utility/FOVKick.cs.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/Utility/FOVKick.cs.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/Utility/FPSCounter.cs b/UnityProject/Assets/ThirdParty/Standard Assets/Utility/FPSCounter.cs similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/Utility/FPSCounter.cs rename to UnityProject/Assets/ThirdParty/Standard Assets/Utility/FPSCounter.cs diff --git a/UnityProject/Assets/!ext/Standard Assets/Utility/FPSCounter.cs.meta b/UnityProject/Assets/ThirdParty/Standard Assets/Utility/FPSCounter.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/Utility/FPSCounter.cs.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/Utility/FPSCounter.cs.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/Utility/FollowTarget.cs b/UnityProject/Assets/ThirdParty/Standard Assets/Utility/FollowTarget.cs similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/Utility/FollowTarget.cs rename to UnityProject/Assets/ThirdParty/Standard Assets/Utility/FollowTarget.cs diff --git a/UnityProject/Assets/!ext/Standard Assets/Utility/FollowTarget.cs.meta b/UnityProject/Assets/ThirdParty/Standard Assets/Utility/FollowTarget.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/Utility/FollowTarget.cs.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/Utility/FollowTarget.cs.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/Utility/ForcedReset.cs b/UnityProject/Assets/ThirdParty/Standard Assets/Utility/ForcedReset.cs similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/Utility/ForcedReset.cs rename to UnityProject/Assets/ThirdParty/Standard Assets/Utility/ForcedReset.cs diff --git a/UnityProject/Assets/!ext/Standard Assets/Utility/ForcedReset.cs.meta b/UnityProject/Assets/ThirdParty/Standard Assets/Utility/ForcedReset.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/Utility/ForcedReset.cs.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/Utility/ForcedReset.cs.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/Utility/LerpControlledBob.cs b/UnityProject/Assets/ThirdParty/Standard Assets/Utility/LerpControlledBob.cs similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/Utility/LerpControlledBob.cs rename to UnityProject/Assets/ThirdParty/Standard Assets/Utility/LerpControlledBob.cs diff --git a/UnityProject/Assets/!ext/Standard Assets/Utility/LerpControlledBob.cs.meta b/UnityProject/Assets/ThirdParty/Standard Assets/Utility/LerpControlledBob.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/Utility/LerpControlledBob.cs.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/Utility/LerpControlledBob.cs.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/Utility/ObjectResetter.cs b/UnityProject/Assets/ThirdParty/Standard Assets/Utility/ObjectResetter.cs similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/Utility/ObjectResetter.cs rename to UnityProject/Assets/ThirdParty/Standard Assets/Utility/ObjectResetter.cs diff --git a/UnityProject/Assets/!ext/Standard Assets/Utility/ObjectResetter.cs.meta b/UnityProject/Assets/ThirdParty/Standard Assets/Utility/ObjectResetter.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/Utility/ObjectResetter.cs.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/Utility/ObjectResetter.cs.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/Utility/ParticleSystemDestroyer.cs b/UnityProject/Assets/ThirdParty/Standard Assets/Utility/ParticleSystemDestroyer.cs similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/Utility/ParticleSystemDestroyer.cs rename to UnityProject/Assets/ThirdParty/Standard Assets/Utility/ParticleSystemDestroyer.cs diff --git a/UnityProject/Assets/!ext/Standard Assets/Utility/ParticleSystemDestroyer.cs.meta b/UnityProject/Assets/ThirdParty/Standard Assets/Utility/ParticleSystemDestroyer.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/Utility/ParticleSystemDestroyer.cs.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/Utility/ParticleSystemDestroyer.cs.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/Utility/PlatformSpecificContent.cs b/UnityProject/Assets/ThirdParty/Standard Assets/Utility/PlatformSpecificContent.cs similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/Utility/PlatformSpecificContent.cs rename to UnityProject/Assets/ThirdParty/Standard Assets/Utility/PlatformSpecificContent.cs diff --git a/UnityProject/Assets/!ext/Standard Assets/Utility/PlatformSpecificContent.cs.meta b/UnityProject/Assets/ThirdParty/Standard Assets/Utility/PlatformSpecificContent.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/Utility/PlatformSpecificContent.cs.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/Utility/PlatformSpecificContent.cs.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/Utility/Prefabs.meta b/UnityProject/Assets/ThirdParty/Standard Assets/Utility/Prefabs.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/Utility/Prefabs.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/Utility/Prefabs.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/Utility/Prefabs/FramerateCounter.prefab b/UnityProject/Assets/ThirdParty/Standard Assets/Utility/Prefabs/FramerateCounter.prefab similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/Utility/Prefabs/FramerateCounter.prefab rename to UnityProject/Assets/ThirdParty/Standard Assets/Utility/Prefabs/FramerateCounter.prefab diff --git a/UnityProject/Assets/!ext/Standard Assets/Utility/Prefabs/FramerateCounter.prefab.meta b/UnityProject/Assets/ThirdParty/Standard Assets/Utility/Prefabs/FramerateCounter.prefab.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/Utility/Prefabs/FramerateCounter.prefab.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/Utility/Prefabs/FramerateCounter.prefab.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/Utility/SimpleActivatorMenu.cs b/UnityProject/Assets/ThirdParty/Standard Assets/Utility/SimpleActivatorMenu.cs similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/Utility/SimpleActivatorMenu.cs rename to UnityProject/Assets/ThirdParty/Standard Assets/Utility/SimpleActivatorMenu.cs diff --git a/UnityProject/Assets/!ext/Standard Assets/Utility/SimpleActivatorMenu.cs.meta b/UnityProject/Assets/ThirdParty/Standard Assets/Utility/SimpleActivatorMenu.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/Utility/SimpleActivatorMenu.cs.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/Utility/SimpleActivatorMenu.cs.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/Utility/SimpleMouseRotator.cs b/UnityProject/Assets/ThirdParty/Standard Assets/Utility/SimpleMouseRotator.cs similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/Utility/SimpleMouseRotator.cs rename to UnityProject/Assets/ThirdParty/Standard Assets/Utility/SimpleMouseRotator.cs diff --git a/UnityProject/Assets/!ext/Standard Assets/Utility/SimpleMouseRotator.cs.meta b/UnityProject/Assets/ThirdParty/Standard Assets/Utility/SimpleMouseRotator.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/Utility/SimpleMouseRotator.cs.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/Utility/SimpleMouseRotator.cs.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/Utility/SmoothFollow.cs b/UnityProject/Assets/ThirdParty/Standard Assets/Utility/SmoothFollow.cs similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/Utility/SmoothFollow.cs rename to UnityProject/Assets/ThirdParty/Standard Assets/Utility/SmoothFollow.cs diff --git a/UnityProject/Assets/!ext/Standard Assets/Utility/SmoothFollow.cs.meta b/UnityProject/Assets/ThirdParty/Standard Assets/Utility/SmoothFollow.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/Utility/SmoothFollow.cs.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/Utility/SmoothFollow.cs.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/Utility/TimedObjectActivator.cs b/UnityProject/Assets/ThirdParty/Standard Assets/Utility/TimedObjectActivator.cs similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/Utility/TimedObjectActivator.cs rename to UnityProject/Assets/ThirdParty/Standard Assets/Utility/TimedObjectActivator.cs diff --git a/UnityProject/Assets/!ext/Standard Assets/Utility/TimedObjectActivator.cs.meta b/UnityProject/Assets/ThirdParty/Standard Assets/Utility/TimedObjectActivator.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/Utility/TimedObjectActivator.cs.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/Utility/TimedObjectActivator.cs.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/Utility/TimedObjectDestructor.cs b/UnityProject/Assets/ThirdParty/Standard Assets/Utility/TimedObjectDestructor.cs similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/Utility/TimedObjectDestructor.cs rename to UnityProject/Assets/ThirdParty/Standard Assets/Utility/TimedObjectDestructor.cs diff --git a/UnityProject/Assets/!ext/Standard Assets/Utility/TimedObjectDestructor.cs.meta b/UnityProject/Assets/ThirdParty/Standard Assets/Utility/TimedObjectDestructor.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/Utility/TimedObjectDestructor.cs.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/Utility/TimedObjectDestructor.cs.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/Utility/WaypointCircuit.cs b/UnityProject/Assets/ThirdParty/Standard Assets/Utility/WaypointCircuit.cs similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/Utility/WaypointCircuit.cs rename to UnityProject/Assets/ThirdParty/Standard Assets/Utility/WaypointCircuit.cs diff --git a/UnityProject/Assets/!ext/Standard Assets/Utility/WaypointCircuit.cs.meta b/UnityProject/Assets/ThirdParty/Standard Assets/Utility/WaypointCircuit.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/Utility/WaypointCircuit.cs.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/Utility/WaypointCircuit.cs.meta diff --git a/UnityProject/Assets/!ext/Standard Assets/Utility/WaypointProgressTracker.cs b/UnityProject/Assets/ThirdParty/Standard Assets/Utility/WaypointProgressTracker.cs similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/Utility/WaypointProgressTracker.cs rename to UnityProject/Assets/ThirdParty/Standard Assets/Utility/WaypointProgressTracker.cs diff --git a/UnityProject/Assets/!ext/Standard Assets/Utility/WaypointProgressTracker.cs.meta b/UnityProject/Assets/ThirdParty/Standard Assets/Utility/WaypointProgressTracker.cs.meta similarity index 100% rename from UnityProject/Assets/!ext/Standard Assets/Utility/WaypointProgressTracker.cs.meta rename to UnityProject/Assets/ThirdParty/Standard Assets/Utility/WaypointProgressTracker.cs.meta diff --git a/UnityProject/Assets/!ext/fonts.meta b/UnityProject/Assets/ThirdParty/fonts.meta similarity index 100% rename from UnityProject/Assets/!ext/fonts.meta rename to UnityProject/Assets/ThirdParty/fonts.meta diff --git a/UnityProject/Assets/!ext/fonts/Montserrat-Bold.ttf b/UnityProject/Assets/ThirdParty/fonts/Montserrat-Bold.ttf similarity index 100% rename from UnityProject/Assets/!ext/fonts/Montserrat-Bold.ttf rename to UnityProject/Assets/ThirdParty/fonts/Montserrat-Bold.ttf diff --git a/UnityProject/Assets/!ext/fonts/Montserrat-Bold.ttf.meta b/UnityProject/Assets/ThirdParty/fonts/Montserrat-Bold.ttf.meta similarity index 100% rename from UnityProject/Assets/!ext/fonts/Montserrat-Bold.ttf.meta rename to UnityProject/Assets/ThirdParty/fonts/Montserrat-Bold.ttf.meta diff --git a/UnityProject/Assets/!ext/fonts/Montserrat-Regular.ttf b/UnityProject/Assets/ThirdParty/fonts/Montserrat-Regular.ttf similarity index 100% rename from UnityProject/Assets/!ext/fonts/Montserrat-Regular.ttf rename to UnityProject/Assets/ThirdParty/fonts/Montserrat-Regular.ttf diff --git a/UnityProject/Assets/!ext/fonts/Montserrat-Regular.ttf.meta b/UnityProject/Assets/ThirdParty/fonts/Montserrat-Regular.ttf.meta similarity index 100% rename from UnityProject/Assets/!ext/fonts/Montserrat-Regular.ttf.meta rename to UnityProject/Assets/ThirdParty/fonts/Montserrat-Regular.ttf.meta diff --git a/UnityProject/Assets/!ext/fonts/Roboto-Light.ttf b/UnityProject/Assets/ThirdParty/fonts/Roboto-Light.ttf similarity index 100% rename from UnityProject/Assets/!ext/fonts/Roboto-Light.ttf rename to UnityProject/Assets/ThirdParty/fonts/Roboto-Light.ttf diff --git a/UnityProject/Assets/!ext/fonts/Roboto-Light.ttf.meta b/UnityProject/Assets/ThirdParty/fonts/Roboto-Light.ttf.meta similarity index 100% rename from UnityProject/Assets/!ext/fonts/Roboto-Light.ttf.meta rename to UnityProject/Assets/ThirdParty/fonts/Roboto-Light.ttf.meta diff --git a/UnityProject/Assets/!ext/fonts/Roboto-Thin.ttf b/UnityProject/Assets/ThirdParty/fonts/Roboto-Thin.ttf similarity index 100% rename from UnityProject/Assets/!ext/fonts/Roboto-Thin.ttf rename to UnityProject/Assets/ThirdParty/fonts/Roboto-Thin.ttf diff --git a/UnityProject/Assets/!ext/fonts/Roboto-Thin.ttf.meta b/UnityProject/Assets/ThirdParty/fonts/Roboto-Thin.ttf.meta similarity index 100% rename from UnityProject/Assets/!ext/fonts/Roboto-Thin.ttf.meta rename to UnityProject/Assets/ThirdParty/fonts/Roboto-Thin.ttf.meta diff --git a/UnityProject/Assets/!ext/fonts/SEGOEUI.TTF b/UnityProject/Assets/ThirdParty/fonts/SEGOEUI.TTF similarity index 100% rename from UnityProject/Assets/!ext/fonts/SEGOEUI.TTF rename to UnityProject/Assets/ThirdParty/fonts/SEGOEUI.TTF diff --git a/UnityProject/Assets/!ext/fonts/SEGOEUI.TTF.meta b/UnityProject/Assets/ThirdParty/fonts/SEGOEUI.TTF.meta similarity index 100% rename from UnityProject/Assets/!ext/fonts/SEGOEUI.TTF.meta rename to UnityProject/Assets/ThirdParty/fonts/SEGOEUI.TTF.meta diff --git a/UnityProject/Assets/!ext/images.meta b/UnityProject/Assets/ThirdParty/images.meta similarity index 100% rename from UnityProject/Assets/!ext/images.meta rename to UnityProject/Assets/ThirdParty/images.meta diff --git a/UnityProject/Assets/!ext/images/checkmark.jpg b/UnityProject/Assets/ThirdParty/images/checkmark.jpg similarity index 100% rename from UnityProject/Assets/!ext/images/checkmark.jpg rename to UnityProject/Assets/ThirdParty/images/checkmark.jpg diff --git a/UnityProject/Assets/!ext/images/checkmark.jpg.meta b/UnityProject/Assets/ThirdParty/images/checkmark.jpg.meta similarity index 100% rename from UnityProject/Assets/!ext/images/checkmark.jpg.meta rename to UnityProject/Assets/ThirdParty/images/checkmark.jpg.meta diff --git a/UnityProject/Assets/ThirdParty/moCap animations.meta b/UnityProject/Assets/ThirdParty/moCap animations.meta new file mode 100644 index 0000000..3bfb6ae --- /dev/null +++ b/UnityProject/Assets/ThirdParty/moCap animations.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 516d6b8a73558437d954a63bf098a4f8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Attack-Kick-L1.FBX b/UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Attack-Kick-L1.FBX similarity index 100% rename from UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Attack-Kick-L1.FBX rename to UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Attack-Kick-L1.FBX diff --git a/UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Attack-Kick-L1.FBX.meta b/UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Attack-Kick-L1.FBX.meta similarity index 100% rename from UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Attack-Kick-L1.FBX.meta rename to UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Attack-Kick-L1.FBX.meta diff --git a/UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Attack-Kick-R1.FBX b/UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Attack-Kick-R1.FBX similarity index 100% rename from UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Attack-Kick-R1.FBX rename to UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Attack-Kick-R1.FBX diff --git a/UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Attack-Kick-R1.FBX.meta b/UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Attack-Kick-R1.FBX.meta similarity index 100% rename from UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Attack-Kick-R1.FBX.meta rename to UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Attack-Kick-R1.FBX.meta diff --git a/UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Attack-L3.FBX b/UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Attack-L3.FBX similarity index 100% rename from UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Attack-L3.FBX rename to UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Attack-L3.FBX diff --git a/UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Attack-L3.FBX.meta b/UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Attack-L3.FBX.meta similarity index 100% rename from UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Attack-L3.FBX.meta rename to UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Attack-L3.FBX.meta diff --git a/UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Attack-R3.FBX b/UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Attack-R3.FBX similarity index 100% rename from UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Attack-R3.FBX rename to UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Attack-R3.FBX diff --git a/UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Attack-R3.FBX.meta b/UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Attack-R3.FBX.meta similarity index 100% rename from UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Attack-R3.FBX.meta rename to UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Attack-R3.FBX.meta diff --git a/UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Death1.FBX b/UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Death1.FBX similarity index 100% rename from UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Death1.FBX rename to UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Death1.FBX diff --git a/UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Death1.FBX.meta b/UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Death1.FBX.meta similarity index 100% rename from UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Death1.FBX.meta rename to UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Death1.FBX.meta diff --git a/UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Fall.FBX b/UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Fall.FBX similarity index 100% rename from UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Fall.FBX rename to UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Fall.FBX diff --git a/UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Fall.FBX.meta b/UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Fall.FBX.meta similarity index 100% rename from UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Fall.FBX.meta rename to UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Fall.FBX.meta diff --git a/UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-GetHit-B1.FBX b/UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-GetHit-B1.FBX similarity index 100% rename from UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-GetHit-B1.FBX rename to UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-GetHit-B1.FBX diff --git a/UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-GetHit-B1.FBX.meta b/UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-GetHit-B1.FBX.meta similarity index 100% rename from UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-GetHit-B1.FBX.meta rename to UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-GetHit-B1.FBX.meta diff --git a/UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-GetHit-F1.FBX b/UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-GetHit-F1.FBX similarity index 100% rename from UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-GetHit-F1.FBX rename to UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-GetHit-F1.FBX diff --git a/UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-GetHit-F1.FBX.meta b/UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-GetHit-F1.FBX.meta similarity index 100% rename from UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-GetHit-F1.FBX.meta rename to UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-GetHit-F1.FBX.meta diff --git a/UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-GetHit-F2.FBX b/UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-GetHit-F2.FBX similarity index 100% rename from UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-GetHit-F2.FBX rename to UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-GetHit-F2.FBX diff --git a/UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-GetHit-F2.FBX.meta b/UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-GetHit-F2.FBX.meta similarity index 100% rename from UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-GetHit-F2.FBX.meta rename to UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-GetHit-F2.FBX.meta diff --git a/UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-GetHit-R1.FBX b/UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-GetHit-R1.FBX similarity index 100% rename from UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-GetHit-R1.FBX rename to UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-GetHit-R1.FBX diff --git a/UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-GetHit-R1.FBX.meta b/UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-GetHit-R1.FBX.meta similarity index 100% rename from UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-GetHit-R1.FBX.meta rename to UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-GetHit-R1.FBX.meta diff --git a/UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Idle.FBX b/UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Idle.FBX similarity index 100% rename from UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Idle.FBX rename to UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Idle.FBX diff --git a/UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Idle.FBX.meta b/UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Idle.FBX.meta similarity index 100% rename from UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Idle.FBX.meta rename to UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Idle.FBX.meta diff --git a/UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Jump.FBX b/UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Jump.FBX similarity index 100% rename from UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Jump.FBX rename to UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Jump.FBX diff --git a/UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Jump.FBX.meta b/UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Jump.FBX.meta similarity index 100% rename from UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Jump.FBX.meta rename to UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Jump.FBX.meta diff --git a/UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Roll-Backward.FBX b/UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Roll-Backward.FBX similarity index 100% rename from UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Roll-Backward.FBX rename to UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Roll-Backward.FBX diff --git a/UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Roll-Backward.FBX.meta b/UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Roll-Backward.FBX.meta similarity index 100% rename from UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Roll-Backward.FBX.meta rename to UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Roll-Backward.FBX.meta diff --git a/UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Roll-Forward.FBX b/UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Roll-Forward.FBX similarity index 100% rename from UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Roll-Forward.FBX rename to UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Roll-Forward.FBX diff --git a/UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Roll-Forward.FBX.meta b/UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Roll-Forward.FBX.meta similarity index 100% rename from UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Roll-Forward.FBX.meta rename to UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Roll-Forward.FBX.meta diff --git a/UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Roll-Left.FBX b/UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Roll-Left.FBX similarity index 100% rename from UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Roll-Left.FBX rename to UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Roll-Left.FBX diff --git a/UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Roll-Left.FBX.meta b/UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Roll-Left.FBX.meta similarity index 100% rename from UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Roll-Left.FBX.meta rename to UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Roll-Left.FBX.meta diff --git a/UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Roll-Right.FBX b/UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Roll-Right.FBX similarity index 100% rename from UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Roll-Right.FBX rename to UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Roll-Right.FBX diff --git a/UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Roll-Right.FBX.meta b/UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Roll-Right.FBX.meta similarity index 100% rename from UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Roll-Right.FBX.meta rename to UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Roll-Right.FBX.meta diff --git a/UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Run-Forward.FBX b/UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Run-Forward.FBX similarity index 100% rename from UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Run-Forward.FBX rename to UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Run-Forward.FBX diff --git a/UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Run-Forward.FBX.meta b/UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Run-Forward.FBX.meta similarity index 100% rename from UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Run-Forward.FBX.meta rename to UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Run-Forward.FBX.meta diff --git a/UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Strafe-Backward-Left.FBX b/UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Strafe-Backward-Left.FBX similarity index 100% rename from UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Strafe-Backward-Left.FBX rename to UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Strafe-Backward-Left.FBX diff --git a/UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Strafe-Backward-Left.FBX.meta b/UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Strafe-Backward-Left.FBX.meta similarity index 100% rename from UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Strafe-Backward-Left.FBX.meta rename to UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Strafe-Backward-Left.FBX.meta diff --git a/UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Strafe-Backward-Right.FBX b/UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Strafe-Backward-Right.FBX similarity index 100% rename from UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Strafe-Backward-Right.FBX rename to UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Strafe-Backward-Right.FBX diff --git a/UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Strafe-Backward-Right.FBX.meta b/UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Strafe-Backward-Right.FBX.meta similarity index 100% rename from UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Strafe-Backward-Right.FBX.meta rename to UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Strafe-Backward-Right.FBX.meta diff --git a/UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Strafe-Backward.FBX b/UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Strafe-Backward.FBX similarity index 100% rename from UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Strafe-Backward.FBX rename to UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Strafe-Backward.FBX diff --git a/UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Strafe-Backward.FBX.meta b/UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Strafe-Backward.FBX.meta similarity index 100% rename from UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Strafe-Backward.FBX.meta rename to UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Strafe-Backward.FBX.meta diff --git a/UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Strafe-Forward-Left.FBX b/UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Strafe-Forward-Left.FBX similarity index 100% rename from UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Strafe-Forward-Left.FBX rename to UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Strafe-Forward-Left.FBX diff --git a/UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Strafe-Forward-Left.FBX.meta b/UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Strafe-Forward-Left.FBX.meta similarity index 100% rename from UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Strafe-Forward-Left.FBX.meta rename to UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Strafe-Forward-Left.FBX.meta diff --git a/UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Strafe-Forward-Right.FBX b/UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Strafe-Forward-Right.FBX similarity index 100% rename from UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Strafe-Forward-Right.FBX rename to UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Strafe-Forward-Right.FBX diff --git a/UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Strafe-Forward-Right.FBX.meta b/UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Strafe-Forward-Right.FBX.meta similarity index 100% rename from UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Strafe-Forward-Right.FBX.meta rename to UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Strafe-Forward-Right.FBX.meta diff --git a/UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Strafe-Forward.FBX b/UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Strafe-Forward.FBX similarity index 100% rename from UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Strafe-Forward.FBX rename to UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Strafe-Forward.FBX diff --git a/UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Strafe-Forward.FBX.meta b/UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Strafe-Forward.FBX.meta similarity index 100% rename from UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Strafe-Forward.FBX.meta rename to UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Strafe-Forward.FBX.meta diff --git a/UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Strafe-Left.FBX b/UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Strafe-Left.FBX similarity index 100% rename from UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Strafe-Left.FBX rename to UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Strafe-Left.FBX diff --git a/UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Strafe-Left.FBX.meta b/UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Strafe-Left.FBX.meta new file mode 100644 index 0000000..720b5ce --- /dev/null +++ b/UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Strafe-Left.FBX.meta @@ -0,0 +1,502 @@ +fileFormatVersion: 2 +guid: af2453d50b96fc949891d7b278aaf733 +ModelImporter: + serializedVersion: 22 + fileIDToRecycleName: + 100000: B_L_Hand + 100002: B_L_Forearm + 100004: B_L_UpperArm + 100006: B_Spine1 + 100008: B_R_Foot + 100010: B_Prop1 + 100012: PositionLocator + 100014: Mesh_Soldier_A + 100016: //RootNode + 100018: B_R_Hand + 100020: B_R_Forearm + 100022: B_R_UpperArm + 100024: B_Head + 100026: B_L_Thigh + 100028: B_L_Calf + 100030: B_L_Finger1 + 100032: B_L_Foot + 100034: B_R_Calf + 100036: B_Spine + 100038: B_Pelvis + 100040: B_L_Finger11 + 100042: B_L_Finger01 + 100044: B_L_Finger0 + 100046: B_R_Finger0 + 100048: B_R_Finger1 + 100050: B_R_Finger01 + 100052: B_R_Finger11 + 100054: B_R_Thigh + 100056: AK47 + 100058: B_L_Clavicle + 100060: B_L_Toe + 100062: B_Neck + 100064: B_R_Clavicle + 100066: B_R_Toe + 100068: Bip01 + 100070: Bip01 Footsteps + 100072: Bip01 Head + 100074: Bip01 HeadNub + 100076: Bip01 L Calf + 100078: Bip01 L Clavicle + 100080: Bip01 L Finger0 + 100082: Bip01 L Finger01 + 100084: Bip01 L Finger0Nub + 100086: Bip01 L Finger1 + 100088: Bip01 L Finger11 + 100090: Bip01 L Finger1Nub + 100092: Bip01 L Foot + 100094: Bip01 L Forearm + 100096: Bip01 L Hand + 100098: Bip01 L Thigh + 100100: Bip01 L Toe0 + 100102: Bip01 L Toe0Nub + 100104: Bip01 L UpperArm + 100106: Bip01 Neck + 100108: Bip01 Pelvis + 100110: Bip01 Prop1 + 100112: Bip01 R Calf + 100114: Bip01 R Clavicle + 100116: Bip01 R Finger0 + 100118: Bip01 R Finger01 + 100120: Bip01 R Finger0Nub + 100122: Bip01 R Finger1 + 100124: Bip01 R Finger11 + 100126: Bip01 R Finger1Nub + 100128: Bip01 R Foot + 100130: Bip01 R Forearm + 100132: Bip01 R Hand + 100134: Bip01 R Thigh + 100136: Bip01 R Toe0 + 100138: Bip01 R Toe0Nub + 100140: Bip01 R UpperArm + 100142: Bip01 Spine + 100144: Bip01 Spine1 + 100146: Chaingun + 100148: MissileLauncher + 100150: Soldier_Mesh + 100152: USP + 100154: B_L_Finger02 + 100156: B_L_Finger12 + 100158: B_L_Finger2 + 100160: B_L_Finger21 + 100162: B_L_Finger22 + 100164: B_L_Finger3 + 100166: B_L_Finger31 + 100168: B_L_Finger32 + 100170: B_L_Finger4 + 100172: B_L_Finger41 + 100174: B_L_Finger42 + 100176: B_L_Toe0 + 100178: B_R_Finger02 + 100180: B_R_Finger12 + 100182: B_R_Finger2 + 100184: B_R_Finger21 + 100186: B_R_Finger22 + 100188: B_R_Finger3 + 100190: B_R_Finger31 + 100192: B_R_Finger32 + 100194: B_R_Finger4 + 100196: B_R_Finger41 + 100198: B_R_Finger42 + 100200: B_R_Toe0 + 100202: B_Spine2 + 100204: Motion + 100206: RPG-Character-Mesh + 100208: Exporter + 400000: B_L_Hand + 400002: B_L_Forearm + 400004: B_L_UpperArm + 400006: B_Spine1 + 400008: B_R_Foot + 400010: B_Prop1 + 400012: PositionLocator + 400014: Mesh_Soldier_A + 400016: //RootNode + 400018: B_R_Hand + 400020: B_R_Forearm + 400022: B_R_UpperArm + 400024: B_Head + 400026: B_L_Thigh + 400028: B_L_Calf + 400030: B_L_Finger1 + 400032: B_L_Foot + 400034: B_R_Calf + 400036: B_Spine + 400038: B_Pelvis + 400040: B_L_Finger11 + 400042: B_L_Finger01 + 400044: B_L_Finger0 + 400046: B_R_Finger0 + 400048: B_R_Finger1 + 400050: B_R_Finger01 + 400052: B_R_Finger11 + 400054: B_R_Thigh + 400056: AK47 + 400058: B_L_Clavicle + 400060: B_L_Toe + 400062: B_Neck + 400064: B_R_Clavicle + 400066: B_R_Toe + 400068: Bip01 + 400070: Bip01 Footsteps + 400072: Bip01 Head + 400074: Bip01 HeadNub + 400076: Bip01 L Calf + 400078: Bip01 L Clavicle + 400080: Bip01 L Finger0 + 400082: Bip01 L Finger01 + 400084: Bip01 L Finger0Nub + 400086: Bip01 L Finger1 + 400088: Bip01 L Finger11 + 400090: Bip01 L Finger1Nub + 400092: Bip01 L Foot + 400094: Bip01 L Forearm + 400096: Bip01 L Hand + 400098: Bip01 L Thigh + 400100: Bip01 L Toe0 + 400102: Bip01 L Toe0Nub + 400104: Bip01 L UpperArm + 400106: Bip01 Neck + 400108: Bip01 Pelvis + 400110: Bip01 Prop1 + 400112: Bip01 R Calf + 400114: Bip01 R Clavicle + 400116: Bip01 R Finger0 + 400118: Bip01 R Finger01 + 400120: Bip01 R Finger0Nub + 400122: Bip01 R Finger1 + 400124: Bip01 R Finger11 + 400126: Bip01 R Finger1Nub + 400128: Bip01 R Foot + 400130: Bip01 R Forearm + 400132: Bip01 R Hand + 400134: Bip01 R Thigh + 400136: Bip01 R Toe0 + 400138: Bip01 R Toe0Nub + 400140: Bip01 R UpperArm + 400142: Bip01 Spine + 400144: Bip01 Spine1 + 400146: Chaingun + 400148: MissileLauncher + 400150: Soldier_Mesh + 400152: USP + 400154: B_L_Finger02 + 400156: B_L_Finger12 + 400158: B_L_Finger2 + 400160: B_L_Finger21 + 400162: B_L_Finger22 + 400164: B_L_Finger3 + 400166: B_L_Finger31 + 400168: B_L_Finger32 + 400170: B_L_Finger4 + 400172: B_L_Finger41 + 400174: B_L_Finger42 + 400176: B_L_Toe0 + 400178: B_R_Finger02 + 400180: B_R_Finger12 + 400182: B_R_Finger2 + 400184: B_R_Finger21 + 400186: B_R_Finger22 + 400188: B_R_Finger3 + 400190: B_R_Finger31 + 400192: B_R_Finger32 + 400194: B_R_Finger4 + 400196: B_R_Finger41 + 400198: B_R_Finger42 + 400200: B_R_Toe0 + 400202: B_Spine2 + 400204: Motion + 400206: RPG-Character-Mesh + 400208: Exporter + 2300000: Mesh_Soldier_A + 2300002: AK47 + 2300004: Chaingun + 2300006: MissileLauncher + 2300008: USP + 3300000: Mesh_Soldier_A + 3300002: AK47 + 3300004: Chaingun + 3300006: MissileLauncher + 3300008: USP + 4300000: Mesh_Soldier_A + 4300002: AK47 + 4300004: MissileLauncher + 4300006: USP + 4300008: Chaingun + 4300010: Soldier_Mesh + 4300012: RPG-Character-Mesh + 7400000: Unarmed-Strafe-Left + 9500000: //RootNode + 11100000: //RootNode + 13700000: Soldier_Mesh + 13700002: RPG-Character-Mesh + 2186277476908879412: ImportLogs + externalObjects: {} + materials: + importMaterials: 0 + materialName: 0 + materialSearch: 1 + materialLocation: 0 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + motionNodeName: '' + rigImportErrors: '' + rigImportWarnings: '' + animationImportErrors: '' + animationImportWarnings: "\nClip 'Take 001' has import animation warnings that might lower retargeting quality:\nNote:\ + \ Activate translation DOF on avatar to improve retargeting quality.\n\t'B_Spine2' is inbetween humanoid transforms\ + \ and has rotation animation that will be discarded.\n" + animationRetargetingWarnings: "\nRetargeting quality report for clip 'Take 001':\n\tLeftUpperArm average position error\ + \ 7.0 mm and maximum position error 7.4 mm at time 0: 0 (0.0%) Frame 0\n\tLeftLowerArm average position error 9.3 mm\ + \ and maximum position error 9.8 mm at time 0:23 (95.8%) Frame 23\n\tLeftHand average position error 7.6 mm and maximum\ + \ position error 8.0 mm at time 0:24 (100.0%) Frame 24\n\tRightUpperArm average position error 5.3 mm and maximum position\ + \ error 5.7 mm at time 0: 0 (0.0%) Frame 0\n\tRightLowerArm average position error 8.3 mm and maximum position error\ + \ 9.6 mm at time 0:18 (75.0%) Frame 18\n\tRightHand average position error 5.2 mm and maximum position error 5.4 mm\ + \ at time 0:24 (100.0%) Frame 24\n\tHead average position error 22.2 mm and maximum position error 23.3 mm at time 0:\ + \ 0 (0.0%) Frame 0\n" + animationDoRetargetingWarnings: 1 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 3 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: + - name: Unarmed-Strafe-Left + takeName: Take 001 + firstFrame: 0.0 + lastFrame: 24.0 + wrapMode: 0 + orientationOffsetY: 0.0 + level: 0.0 + cycleOffset: 0.0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 1 + loopBlend: 1 + loopBlendOrientation: 1 + loopBlendPositionY: 1 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 1 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 1 + heightFromFeet: 0 + mirror: 0 + bodyMask: + - 1 + - 1 + - 1 + - 1 + - 1 + - 1 + - 1 + - 1 + - 1 + - 1 + - 1 + - 1 + - 1 + curves: [] + events: + - time: 0.0 + functionName: FootL + data: '' + objectReferenceParameter: + fileID: 0 + floatParameter: 0.0 + intParameter: 0 + messageOptions: 0 + - time: 0.5303798317909241 + functionName: FootR + data: '' + objectReferenceParameter: + fileID: 0 + floatParameter: 0.0 + intParameter: 0 + messageOptions: 0 + transformMask: + - m_Path: '' + m_Weight: 1.0 + - m_Path: Motion + m_Weight: 1.0 + - m_Path: Motion/B_Pelvis + m_Weight: 1.0 + - m_Path: Motion/B_Pelvis/B_L_Thigh + m_Weight: 1.0 + - m_Path: Motion/B_Pelvis/B_L_Thigh/B_L_Calf + m_Weight: 1.0 + - m_Path: Motion/B_Pelvis/B_L_Thigh/B_L_Calf/B_L_Foot + m_Weight: 1.0 + - m_Path: Motion/B_Pelvis/B_L_Thigh/B_L_Calf/B_L_Foot/B_L_Toe0 + m_Weight: 1.0 + - m_Path: Motion/B_Pelvis/B_R_Thigh + m_Weight: 1.0 + - m_Path: Motion/B_Pelvis/B_R_Thigh/B_R_Calf + m_Weight: 1.0 + - m_Path: Motion/B_Pelvis/B_R_Thigh/B_R_Calf/B_R_Foot + m_Weight: 1.0 + - m_Path: Motion/B_Pelvis/B_R_Thigh/B_R_Calf/B_R_Foot/B_R_Toe0 + m_Weight: 1.0 + - m_Path: Motion/B_Pelvis/B_Spine + m_Weight: 1.0 + - m_Path: Motion/B_Pelvis/B_Spine/B_Spine1 + m_Weight: 1.0 + - m_Path: Motion/B_Pelvis/B_Spine/B_Spine1/B_Spine2 + m_Weight: 1.0 + - m_Path: Motion/B_Pelvis/B_Spine/B_Spine1/B_Spine2/B_L_Clavicle + m_Weight: 1.0 + - m_Path: Motion/B_Pelvis/B_Spine/B_Spine1/B_Spine2/B_L_Clavicle/B_L_UpperArm + m_Weight: 1.0 + - m_Path: Motion/B_Pelvis/B_Spine/B_Spine1/B_Spine2/B_L_Clavicle/B_L_UpperArm/B_L_Forearm + m_Weight: 1.0 + - m_Path: Motion/B_Pelvis/B_Spine/B_Spine1/B_Spine2/B_L_Clavicle/B_L_UpperArm/B_L_Forearm/B_L_Hand + m_Weight: 1.0 + - m_Path: Motion/B_Pelvis/B_Spine/B_Spine1/B_Spine2/B_L_Clavicle/B_L_UpperArm/B_L_Forearm/B_L_Hand/B_L_Finger0 + m_Weight: 1.0 + - m_Path: Motion/B_Pelvis/B_Spine/B_Spine1/B_Spine2/B_L_Clavicle/B_L_UpperArm/B_L_Forearm/B_L_Hand/B_L_Finger0/B_L_Finger01 + m_Weight: 1.0 + - m_Path: Motion/B_Pelvis/B_Spine/B_Spine1/B_Spine2/B_L_Clavicle/B_L_UpperArm/B_L_Forearm/B_L_Hand/B_L_Finger0/B_L_Finger01/B_L_Finger02 + m_Weight: 1.0 + - m_Path: Motion/B_Pelvis/B_Spine/B_Spine1/B_Spine2/B_L_Clavicle/B_L_UpperArm/B_L_Forearm/B_L_Hand/B_L_Finger1 + m_Weight: 1.0 + - m_Path: Motion/B_Pelvis/B_Spine/B_Spine1/B_Spine2/B_L_Clavicle/B_L_UpperArm/B_L_Forearm/B_L_Hand/B_L_Finger1/B_L_Finger11 + m_Weight: 1.0 + - m_Path: Motion/B_Pelvis/B_Spine/B_Spine1/B_Spine2/B_L_Clavicle/B_L_UpperArm/B_L_Forearm/B_L_Hand/B_L_Finger1/B_L_Finger11/B_L_Finger12 + m_Weight: 1.0 + - m_Path: Motion/B_Pelvis/B_Spine/B_Spine1/B_Spine2/B_L_Clavicle/B_L_UpperArm/B_L_Forearm/B_L_Hand/B_L_Finger2 + m_Weight: 1.0 + - m_Path: Motion/B_Pelvis/B_Spine/B_Spine1/B_Spine2/B_L_Clavicle/B_L_UpperArm/B_L_Forearm/B_L_Hand/B_L_Finger2/B_L_Finger21 + m_Weight: 1.0 + - m_Path: Motion/B_Pelvis/B_Spine/B_Spine1/B_Spine2/B_L_Clavicle/B_L_UpperArm/B_L_Forearm/B_L_Hand/B_L_Finger2/B_L_Finger21/B_L_Finger22 + m_Weight: 1.0 + - m_Path: Motion/B_Pelvis/B_Spine/B_Spine1/B_Spine2/B_L_Clavicle/B_L_UpperArm/B_L_Forearm/B_L_Hand/B_L_Finger3 + m_Weight: 1.0 + - m_Path: Motion/B_Pelvis/B_Spine/B_Spine1/B_Spine2/B_L_Clavicle/B_L_UpperArm/B_L_Forearm/B_L_Hand/B_L_Finger3/B_L_Finger31 + m_Weight: 1.0 + - m_Path: Motion/B_Pelvis/B_Spine/B_Spine1/B_Spine2/B_L_Clavicle/B_L_UpperArm/B_L_Forearm/B_L_Hand/B_L_Finger3/B_L_Finger31/B_L_Finger32 + m_Weight: 1.0 + - m_Path: Motion/B_Pelvis/B_Spine/B_Spine1/B_Spine2/B_L_Clavicle/B_L_UpperArm/B_L_Forearm/B_L_Hand/B_L_Finger4 + m_Weight: 1.0 + - m_Path: Motion/B_Pelvis/B_Spine/B_Spine1/B_Spine2/B_L_Clavicle/B_L_UpperArm/B_L_Forearm/B_L_Hand/B_L_Finger4/B_L_Finger41 + m_Weight: 1.0 + - m_Path: Motion/B_Pelvis/B_Spine/B_Spine1/B_Spine2/B_L_Clavicle/B_L_UpperArm/B_L_Forearm/B_L_Hand/B_L_Finger4/B_L_Finger41/B_L_Finger42 + m_Weight: 1.0 + - m_Path: Motion/B_Pelvis/B_Spine/B_Spine1/B_Spine2/B_Neck + m_Weight: 1.0 + - m_Path: Motion/B_Pelvis/B_Spine/B_Spine1/B_Spine2/B_Neck/B_Head + m_Weight: 1.0 + - m_Path: Motion/B_Pelvis/B_Spine/B_Spine1/B_Spine2/B_R_Clavicle + m_Weight: 1.0 + - m_Path: Motion/B_Pelvis/B_Spine/B_Spine1/B_Spine2/B_R_Clavicle/B_R_UpperArm + m_Weight: 1.0 + - m_Path: Motion/B_Pelvis/B_Spine/B_Spine1/B_Spine2/B_R_Clavicle/B_R_UpperArm/B_R_Forearm + m_Weight: 1.0 + - m_Path: Motion/B_Pelvis/B_Spine/B_Spine1/B_Spine2/B_R_Clavicle/B_R_UpperArm/B_R_Forearm/B_R_Hand + m_Weight: 1.0 + - m_Path: Motion/B_Pelvis/B_Spine/B_Spine1/B_Spine2/B_R_Clavicle/B_R_UpperArm/B_R_Forearm/B_R_Hand/B_R_Finger0 + m_Weight: 1.0 + - m_Path: Motion/B_Pelvis/B_Spine/B_Spine1/B_Spine2/B_R_Clavicle/B_R_UpperArm/B_R_Forearm/B_R_Hand/B_R_Finger0/B_R_Finger01 + m_Weight: 1.0 + - m_Path: Motion/B_Pelvis/B_Spine/B_Spine1/B_Spine2/B_R_Clavicle/B_R_UpperArm/B_R_Forearm/B_R_Hand/B_R_Finger0/B_R_Finger01/B_R_Finger02 + m_Weight: 1.0 + - m_Path: Motion/B_Pelvis/B_Spine/B_Spine1/B_Spine2/B_R_Clavicle/B_R_UpperArm/B_R_Forearm/B_R_Hand/B_R_Finger1 + m_Weight: 1.0 + - m_Path: Motion/B_Pelvis/B_Spine/B_Spine1/B_Spine2/B_R_Clavicle/B_R_UpperArm/B_R_Forearm/B_R_Hand/B_R_Finger1/B_R_Finger11 + m_Weight: 1.0 + - m_Path: Motion/B_Pelvis/B_Spine/B_Spine1/B_Spine2/B_R_Clavicle/B_R_UpperArm/B_R_Forearm/B_R_Hand/B_R_Finger1/B_R_Finger11/B_R_Finger12 + m_Weight: 1.0 + - m_Path: Motion/B_Pelvis/B_Spine/B_Spine1/B_Spine2/B_R_Clavicle/B_R_UpperArm/B_R_Forearm/B_R_Hand/B_R_Finger2 + m_Weight: 1.0 + - m_Path: Motion/B_Pelvis/B_Spine/B_Spine1/B_Spine2/B_R_Clavicle/B_R_UpperArm/B_R_Forearm/B_R_Hand/B_R_Finger2/B_R_Finger21 + m_Weight: 1.0 + - m_Path: Motion/B_Pelvis/B_Spine/B_Spine1/B_Spine2/B_R_Clavicle/B_R_UpperArm/B_R_Forearm/B_R_Hand/B_R_Finger2/B_R_Finger21/B_R_Finger22 + m_Weight: 1.0 + - m_Path: Motion/B_Pelvis/B_Spine/B_Spine1/B_Spine2/B_R_Clavicle/B_R_UpperArm/B_R_Forearm/B_R_Hand/B_R_Finger3 + m_Weight: 1.0 + - m_Path: Motion/B_Pelvis/B_Spine/B_Spine1/B_Spine2/B_R_Clavicle/B_R_UpperArm/B_R_Forearm/B_R_Hand/B_R_Finger3/B_R_Finger31 + m_Weight: 1.0 + - m_Path: Motion/B_Pelvis/B_Spine/B_Spine1/B_Spine2/B_R_Clavicle/B_R_UpperArm/B_R_Forearm/B_R_Hand/B_R_Finger3/B_R_Finger31/B_R_Finger32 + m_Weight: 1.0 + - m_Path: Motion/B_Pelvis/B_Spine/B_Spine1/B_Spine2/B_R_Clavicle/B_R_UpperArm/B_R_Forearm/B_R_Hand/B_R_Finger4 + m_Weight: 1.0 + - m_Path: Motion/B_Pelvis/B_Spine/B_Spine1/B_Spine2/B_R_Clavicle/B_R_UpperArm/B_R_Forearm/B_R_Hand/B_R_Finger4/B_R_Finger41 + m_Weight: 1.0 + - m_Path: Motion/B_Pelvis/B_Spine/B_Spine1/B_Spine2/B_R_Clavicle/B_R_UpperArm/B_R_Forearm/B_R_Hand/B_R_Finger4/B_R_Finger41/B_R_Finger42 + m_Weight: 1.0 + - m_Path: RPG-Character-Mesh + m_Weight: 1.0 + maskType: 1 + maskSource: + fileID: 101100000 + guid: 4ebc95c8618479f4d8251c7dafa10029 + type: 2 + additiveReferencePoseFrame: 0.0 + isReadable: 1 + meshes: + lODScreenPercentages: [] + globalScale: 0.009999999776482582 + meshCompression: 0 + addColliders: 0 + importVisibility: 0 + importBlendShapes: 1 + importCameras: 0 + importLights: 0 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + optimizeMeshForGPU: 1 + keepQuads: 0 + weldVertices: 1 + preserveHierarchy: 0 + indexFormat: 1 + secondaryUVAngleDistortion: 8.0 + secondaryUVAreaDistortion: 15.000000953674316 + secondaryUVHardAngle: 88.0 + secondaryUVPackMargin: 4.0 + useFileScale: 0 + tangentSpace: + normalSmoothAngle: 60.0 + normalImportMode: 2 + tangentImportMode: 2 + normalCalculationMode: 0 + importAnimation: 1 + copyAvatar: 1 + humanDescription: + serializedVersion: 2 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + rootMotionBoneName: null + rootMotionBoneRotation: + x: 0 + y: 0 + z: 0 + w: 1 + hasTranslationDoF: 0 + hasExtraRoot: 1 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: + instanceID: 0 + animationType: 3 + humanoidOversampling: 1 + additionalBone: 0 + userData: '' + assetBundleName: '' + assetBundleVariant: '' diff --git a/UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Strafe-Right.FBX b/UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Strafe-Right.FBX similarity index 100% rename from UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Strafe-Right.FBX rename to UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Strafe-Right.FBX diff --git a/UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Strafe-Right.FBX.meta b/UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Strafe-Right.FBX.meta similarity index 100% rename from UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Strafe-Right.FBX.meta rename to UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Strafe-Right.FBX.meta diff --git a/UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Stunned.FBX b/UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Stunned.FBX similarity index 100% rename from UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Stunned.FBX rename to UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Stunned.FBX diff --git a/UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Stunned.FBX.meta b/UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Stunned.FBX.meta similarity index 100% rename from UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Stunned.FBX.meta rename to UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Stunned.FBX.meta diff --git a/UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Walk-Slow.FBX b/UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Walk-Slow.FBX similarity index 100% rename from UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Walk-Slow.FBX rename to UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Walk-Slow.FBX diff --git a/UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Walk-Slow.FBX.meta b/UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Walk-Slow.FBX.meta similarity index 100% rename from UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Walk-Slow.FBX.meta rename to UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Walk-Slow.FBX.meta diff --git a/UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Walk.FBX b/UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Walk.FBX similarity index 100% rename from UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Walk.FBX rename to UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Walk.FBX diff --git a/UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Walk.FBX.meta b/UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Walk.FBX.meta similarity index 100% rename from UnityProject/Assets/!ext/moCap animations/RPG-Character@Unarmed-Walk.FBX.meta rename to UnityProject/Assets/ThirdParty/moCap animations/RPG-Character@Unarmed-Walk.FBX.meta diff --git a/UnityProject/Assets/junctionAssets/animControllers/swingController.controller.meta b/UnityProject/Assets/junctionAssets/animControllers/swingController.controller.meta index c8a861f..d0d9e35 100644 --- a/UnityProject/Assets/junctionAssets/animControllers/swingController.controller.meta +++ b/UnityProject/Assets/junctionAssets/animControllers/swingController.controller.meta @@ -1,69 +1,8 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!91 &9100000 -AnimatorController: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: woman - serializedVersion: 5 - m_AnimatorParameters: [] - m_AnimatorLayers: - - serializedVersion: 5 - m_Name: Base Layer - m_StateMachine: {fileID: 1107172934540300734} - m_Mask: {fileID: 0} - m_Motions: [] - m_Behaviours: [] - m_BlendingMode: 0 - m_SyncedLayerIndex: -1 - m_DefaultWeight: 0 - m_IKPass: 0 - m_SyncedLayerAffectsTiming: 0 - m_Controller: {fileID: 9100000} ---- !u!1102 &1102304681178197246 -AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: ArmatureAction - m_Speed: 0.75 - m_CycleOffset: 0 - m_Transitions: [] - m_StateMachineBehaviours: [] - m_Position: {x: 50, y: 50, z: 0} - m_IKOnFeet: 0 - m_WriteDefaultValues: 1 - m_Mirror: 0 - m_SpeedParameterActive: 0 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: 7400008, guid: 3c6878070049ea6438724fc9c91a7a6e, type: 3} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1107 &1107172934540300734 -AnimatorStateMachine: - serializedVersion: 5 - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: Base Layer - m_ChildStates: - - serializedVersion: 1 - m_State: {fileID: 1102304681178197246} - m_Position: {x: 259.75, y: 393, z: 0} - m_ChildStateMachines: [] - m_AnyStateTransitions: [] - m_EntryTransitions: [] - m_StateMachineTransitions: {} - m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 20, z: 0} - m_EntryPosition: {x: 50, y: 120, z: 0} - m_ExitPosition: {x: 800, y: 120, z: 0} - m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: 1102304681178197246} +fileFormatVersion: 2 +guid: c37ee391b9e463e4a9c9e07c180a594d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/junctionAssets/blends/buildings.blend b/UnityProject/Assets/junctionAssets/blends/buildings.blend index 6a50171..bd82aa2 100644 Binary files a/UnityProject/Assets/junctionAssets/blends/buildings.blend and b/UnityProject/Assets/junctionAssets/blends/buildings.blend differ diff --git a/UnityProject/Assets/junctionAssets/blends/fence.blend b/UnityProject/Assets/junctionAssets/blends/fence.blend index 549586c..81465a9 100644 Binary files a/UnityProject/Assets/junctionAssets/blends/fence.blend and b/UnityProject/Assets/junctionAssets/blends/fence.blend differ diff --git a/UnityProject/Assets/junctionAssets/blends/roadShiftedSigns.blend.meta b/UnityProject/Assets/junctionAssets/blends/roadShiftedSigns.blend.meta index 834c70f..672b417 100644 Binary files a/UnityProject/Assets/junctionAssets/blends/roadShiftedSigns.blend.meta and b/UnityProject/Assets/junctionAssets/blends/roadShiftedSigns.blend.meta differ diff --git a/UnityProject/Assets/junctionAssets/blends/terrain.blend (2).meta b/UnityProject/Assets/junctionAssets/blends/terrain.blend (2).meta deleted file mode 100644 index 473ca70..0000000 --- a/UnityProject/Assets/junctionAssets/blends/terrain.blend (2).meta +++ /dev/null @@ -1,95 +0,0 @@ -fileFormatVersion: 2 -guid: 44e67f972134b5249b9ff69c76a940ca -ModelImporter: - serializedVersion: 22 - fileIDToRecycleName: - 100000: //RootNode - 400000: //RootNode - 2100000: unnamed - 2300000: //RootNode - 3300000: //RootNode - 4300000: Terrain - 7400000: Default Take - 9500000: //RootNode - 2186277476908879412: ImportLogs - externalObjects: {} - materials: - importMaterials: 1 - materialName: 0 - materialSearch: 1 - materialLocation: 1 - animations: - legacyGenerateAnimations: 4 - bakeSimulation: 0 - resampleCurves: 1 - optimizeGameObjects: 0 - motionNodeName: - rigImportErrors: - rigImportWarnings: - animationImportErrors: - animationImportWarnings: - animationRetargetingWarnings: - animationDoRetargetingWarnings: 0 - importAnimatedCustomProperties: 0 - importConstraints: 0 - animationCompression: 1 - animationRotationError: 0.5 - animationPositionError: 0.5 - animationScaleError: 0.5 - animationWrapMode: 0 - extraExposedTransformPaths: [] - extraUserProperties: [] - clipAnimations: [] - isReadable: 1 - meshes: - lODScreenPercentages: [] - globalScale: 1 - meshCompression: 0 - addColliders: 0 - importVisibility: 1 - importBlendShapes: 1 - importCameras: 1 - importLights: 1 - swapUVChannels: 0 - generateSecondaryUV: 0 - useFileUnits: 1 - optimizeMeshForGPU: 1 - keepQuads: 0 - weldVertices: 1 - preserveHierarchy: 0 - indexFormat: 0 - secondaryUVAngleDistortion: 8 - secondaryUVAreaDistortion: 15.000001 - secondaryUVHardAngle: 88 - secondaryUVPackMargin: 4 - useFileScale: 1 - tangentSpace: - normalSmoothAngle: 180 - normalImportMode: 1 - tangentImportMode: 3 - normalCalculationMode: 4 - importAnimation: 1 - copyAvatar: 0 - humanDescription: - serializedVersion: 2 - human: [] - skeleton: [] - armTwist: 0.5 - foreArmTwist: 0.5 - upperLegTwist: 0.5 - legTwist: 0.5 - armStretch: 0.05 - legStretch: 0.05 - feetSpacing: 0 - rootMotionBoneName: - rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1} - hasTranslationDoF: 0 - hasExtraRoot: 0 - skeletonHasParents: 1 - lastHumanDescriptionAvatarSource: {instanceID: 0} - animationType: 2 - humanoidOversampling: 1 - additionalBone: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnityProject/Assets/junctionAssets/blends/trashcan.blend.meta b/UnityProject/Assets/junctionAssets/blends/trashcan.blend.meta index 54d6d26..72aacd2 100644 Binary files a/UnityProject/Assets/junctionAssets/blends/trashcan.blend.meta and b/UnityProject/Assets/junctionAssets/blends/trashcan.blend.meta differ diff --git a/UnityProject/Assets/junctionAssets/materials/car/body_bottom.mat b/UnityProject/Assets/junctionAssets/materials/car/body_bottom.mat index 8e88c22..c807245 100644 --- a/UnityProject/Assets/junctionAssets/materials/car/body_bottom.mat +++ b/UnityProject/Assets/junctionAssets/materials/car/body_bottom.mat @@ -1,8 +1,76 @@ -fileFormatVersion: 2 -guid: f83e5bc3a14dde147bd05ca05bb3c98c -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: body_bottom + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.45 + - _GlossyReflections: 1 + - _Metallic: 0.85 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.3773585, g: 0.3773585, b: 0.3773585, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/UnityProject/Assets/junctionAssets/materials/common materials/sidewalk.mat b/UnityProject/Assets/junctionAssets/materials/common materials/sidewalk.mat index f5fdc7b..59146ba 100644 --- a/UnityProject/Assets/junctionAssets/materials/common materials/sidewalk.mat +++ b/UnityProject/Assets/junctionAssets/materials/common materials/sidewalk.mat @@ -1,8 +1,76 @@ -fileFormatVersion: 2 -guid: c80c55b3dca5ede499feceadd2d451b4 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: sidewalk + m_Shader: {fileID: 4800000, guid: 0e6364cdbae97ac48bf357f0b0c91b6e, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0 + - _GlossyReflections: 1 + - _Metallic: 0.053 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.5754717, g: 0.5754717, b: 0.5754717, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/UnityProject/Assets/junctionAssets/materials/enviroment.meta b/UnityProject/Assets/junctionAssets/materials/enviroment.meta index 38205f9..dbfec7e 100644 --- a/UnityProject/Assets/junctionAssets/materials/enviroment.meta +++ b/UnityProject/Assets/junctionAssets/materials/enviroment.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2a4f964421233e24a869450adb6234f0 +guid: f17abcc8d8db2e746bf25afb84194998 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/UnityProject/Assets/junctionAssets/materials/enviroment/Grass.mat b/UnityProject/Assets/junctionAssets/materials/enviroment/Grass.mat index 1c693d1..a2ac642 100644 --- a/UnityProject/Assets/junctionAssets/materials/enviroment/Grass.mat +++ b/UnityProject/Assets/junctionAssets/materials/enviroment/Grass.mat @@ -1,8 +1,76 @@ -fileFormatVersion: 2 -guid: 096c537d98a83df42b30da44699ca0ad -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Grass + m_Shader: {fileID: 4800000, guid: 0e6364cdbae97ac48bf357f0b0c91b6e, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0 + - _GlossyReflections: 1 + - _Metallic: 0.312 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.21466666, g: 0.552, b: 0.22999999, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/UnityProject/Assets/junctionAssets/materials/enviroment/leaves2.mat b/UnityProject/Assets/junctionAssets/materials/enviroment/leaves2.mat index dd7bddb..d8715fd 100644 --- a/UnityProject/Assets/junctionAssets/materials/enviroment/leaves2.mat +++ b/UnityProject/Assets/junctionAssets/materials/enviroment/leaves2.mat @@ -1,8 +1,76 @@ -fileFormatVersion: 2 -guid: 5ea063170f5879b4fae89f5be73469fe -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: leaves2 + m_Shader: {fileID: 4800000, guid: 0e6364cdbae97ac48bf357f0b0c91b6e, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.34 + - _GlossyReflections: 1 + - _Metallic: 0.37 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.8071409, g: 1, b: 0.3066038, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/UnityProject/Assets/junctionAssets/materials/houses/roof.mat b/UnityProject/Assets/junctionAssets/materials/houses/roof.mat index 2ff61ff..92280fb 100644 --- a/UnityProject/Assets/junctionAssets/materials/houses/roof.mat +++ b/UnityProject/Assets/junctionAssets/materials/houses/roof.mat @@ -1,8 +1,76 @@ -fileFormatVersion: 2 -guid: 925f5b3bec0f2b444986300aa5418042 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: roof + m_Shader: {fileID: 4800000, guid: 0e6364cdbae97ac48bf357f0b0c91b6e, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.4716981, g: 0.36936292, b: 0.10012461, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/UnityProject/Assets/junctionAssets/materials/office/separator.mat b/UnityProject/Assets/junctionAssets/materials/office/separator.mat index 1d349d0..8e55889 100644 --- a/UnityProject/Assets/junctionAssets/materials/office/separator.mat +++ b/UnityProject/Assets/junctionAssets/materials/office/separator.mat @@ -1,8 +1,76 @@ -fileFormatVersion: 2 -guid: ff5ea5c523f4ff34c956778d90994de4 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: separator + m_Shader: {fileID: 4800000, guid: 0e6364cdbae97ac48bf357f0b0c91b6e, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.63 + - _GlossyReflections: 1 + - _Metallic: 1 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.86713284, g: 0.88111883, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/UnityProject/Assets/junctionAssets/materials/people/cloths/piros_polo.mat.meta b/UnityProject/Assets/junctionAssets/materials/people/cloths/piros_polo.mat.meta index 4b40afb..d225e4e 100644 --- a/UnityProject/Assets/junctionAssets/materials/people/cloths/piros_polo.mat.meta +++ b/UnityProject/Assets/junctionAssets/materials/people/cloths/piros_polo.mat.meta @@ -1,76 +1,8 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: piros_polo - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.314 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 0.27345735, b: 0.13679248, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} +fileFormatVersion: 2 +guid: b244e6692c1ea0f4caa525626f19c4e4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/junctionAssets/materials/people/fenyes_cipo.mat.meta b/UnityProject/Assets/junctionAssets/materials/people/fenyes_cipo.mat.meta index a6eb4e2..022a07c 100644 --- a/UnityProject/Assets/junctionAssets/materials/people/fenyes_cipo.mat.meta +++ b/UnityProject/Assets/junctionAssets/materials/people/fenyes_cipo.mat.meta @@ -1,76 +1,8 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: fenyes_cipo - m_Shader: {fileID: 4800000, guid: 0e6364cdbae97ac48bf357f0b0c91b6e, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3500 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.749 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 0.21698111, g: 0.06243324, b: 0.06243324, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} +fileFormatVersion: 2 +guid: 52805f7d66183574981683b06dce936f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/junctionAssets/materials/road/roadSigns.mat b/UnityProject/Assets/junctionAssets/materials/road/roadSigns.mat index 7a6f553..286f162 100644 --- a/UnityProject/Assets/junctionAssets/materials/road/roadSigns.mat +++ b/UnityProject/Assets/junctionAssets/materials/road/roadSigns.mat @@ -1,8 +1,76 @@ -fileFormatVersion: 2 -guid: c6c1ad52c1a4cce44892655ecfdcf50f -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: roadSigns + m_Shader: {fileID: 4800000, guid: 0e6364cdbae97ac48bf357f0b0c91b6e, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.38 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.9245283, g: 0.9245283, b: 0.9245283, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/UnityProject/Assets/junctionAssets/prefabs.meta b/UnityProject/Assets/junctionAssets/prefabs.meta index 4ca6a9b..8e962f4 100644 --- a/UnityProject/Assets/junctionAssets/prefabs.meta +++ b/UnityProject/Assets/junctionAssets/prefabs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5e81972afcc15614182b5c3a52366a4f +guid: 08868d2911ec7b1449223053a0dd4c7a folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/UnityProject/Assets/junctionAssets/prefabs/Traffic/spawn.prefab b/UnityProject/Assets/junctionAssets/prefabs/Traffic/spawn.prefab index 83af1e4..29d161c 100644 --- a/UnityProject/Assets/junctionAssets/prefabs/Traffic/spawn.prefab +++ b/UnityProject/Assets/junctionAssets/prefabs/Traffic/spawn.prefab @@ -1,8 +1,98 @@ -fileFormatVersion: 2 -guid: 68223b2e2d01d7b4f928b7f9e21603e7 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 100100000 - userData: - assetBundleName: - assetBundleVariant: +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: [] + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 0} + m_RootGameObject: {fileID: 1607133051838876} + m_IsPrefabParent: 1 +--- !u!1 &1607133051838876 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4674743612876728} + - component: {fileID: 33122383070323446} + - component: {fileID: 23194502503015064} + - component: {fileID: 135363365660046326} + m_Layer: 0 + m_Name: spawn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4674743612876728 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1607133051838876} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 144.5, y: 4.666832, z: 205.97} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &23194502503015064 +MeshRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1607133051838876} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 + m_Materials: + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!33 &33122383070323446 +MeshFilter: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1607133051838876} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!135 &135363365660046326 +SphereCollider: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1607133051838876} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.5 + m_Center: {x: 0, y: 0, z: 0} diff --git a/UnityProject/Assets/junctionAssets/prefabs/buildings.meta b/UnityProject/Assets/junctionAssets/prefabs/buildings.meta index c999ab9..0414d73 100644 --- a/UnityProject/Assets/junctionAssets/prefabs/buildings.meta +++ b/UnityProject/Assets/junctionAssets/prefabs/buildings.meta @@ -1,1397 +1,8 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1001 &100100000 -Prefab: - m_ObjectHideFlags: 1 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: [] - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 0} - m_RootGameObject: {fileID: 1210777582185934} - m_IsPrefabParent: 1 ---- !u!1 &1038294681852994 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 224972634899969178} - - component: {fileID: 222635532214521852} - - component: {fileID: 114794864356999526} - m_Layer: 5 - m_Name: tweet_1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!1 &1061650553774000 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 224796555806117194} - - component: {fileID: 222490966539148786} - - component: {fileID: 114767408317923132} - m_Layer: 5 - m_Name: message - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1088829831413472 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 224371376517048420} - - component: {fileID: 222292724214919492} - - component: {fileID: 114669602398876494} - m_Layer: 5 - m_Name: bg - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1165297454867938 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 224095203310980180} - - component: {fileID: 222852622700210650} - - component: {fileID: 114775664163413592} - m_Layer: 5 - m_Name: name - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1197096213458710 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 224183506526273124} - - component: {fileID: 222508468165229760} - - component: {fileID: 114734668155567056} - m_Layer: 5 - m_Name: name - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1210777582185934 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 224673779731126774} - - component: {fileID: 223930056677376208} - - component: {fileID: 114229348474079596} - - component: {fileID: 114100273566063144} - - component: {fileID: 114100717001774242} - - component: {fileID: 114975200490854076} - m_Layer: 5 - m_Name: clientGame - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1316453201421426 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 224303344572135348} - - component: {fileID: 222539378647882152} - - component: {fileID: 114958152560119496} - m_Layer: 5 - m_Name: name - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1337041950860596 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 224656169066195774} - - component: {fileID: 222795349191686770} - - component: {fileID: 114901488394711528} - m_Layer: 5 - m_Name: message - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1350895799815228 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 224117479900117638} - - component: {fileID: 222599136467776380} - - component: {fileID: 114909869317740632} - m_Layer: 5 - m_Name: RawImage - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1454374643764660 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 224834178857114396} - - component: {fileID: 222341364706544468} - - component: {fileID: 114119997076619734} - - component: {fileID: 331337810655337806} - - component: {fileID: 114330911947922266} - m_Layer: 5 - m_Name: RawImage - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1463802595171778 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 224897006387704478} - - component: {fileID: 222094679191607538} - - component: {fileID: 114543289563633844} - m_Layer: 5 - m_Name: message - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1466987064299460 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 224846021644193030} - - component: {fileID: 222990185579322870} - - component: {fileID: 114617825759018050} - m_Layer: 5 - m_Name: RawImage - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1513325839309728 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 224486701726571408} - - component: {fileID: 222827598461183388} - - component: {fileID: 114173947639857384} - m_Layer: 5 - m_Name: bg - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1602815615249518 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 224404602570610114} - - component: {fileID: 222739041051096308} - - component: {fileID: 114481370759802600} - m_Layer: 5 - m_Name: tweet_2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!1 &1713600301191020 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 224195618394870126} - - component: {fileID: 222328193208687014} - - component: {fileID: 114057916326979050} - - component: {fileID: 225528469073541742} - m_Layer: 5 - m_Name: tweet_0 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1914862909756648 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 224703107439197560} - - component: {fileID: 222827187275832388} - - component: {fileID: 114978752675589710} - - component: {fileID: 114268373889443330} - m_Layer: 5 - m_Name: tweet_container - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1986336388991970 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 224714957267730532} - - component: {fileID: 222361234846967568} - - component: {fileID: 114577769700370174} - m_Layer: 5 - m_Name: bg - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &114057916326979050 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1713600301191020} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 ---- !u!114 &114100273566063144 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1210777582185934} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 2 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 ---- !u!114 &114100717001774242 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1210777582185934} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 372142912, guid: dc443db3e92b4983b9738c1131f555cb, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SceneId: - m_Value: 0 - m_AssetId: - i0: 161 - i1: 176 - i2: 161 - i3: 224 - i4: 229 - i5: 0 - i6: 42 - i7: 4 - i8: 25 - i9: 191 - i10: 64 - i11: 191 - i12: 117 - i13: 123 - i14: 67 - i15: 5 - m_ServerOnly: 0 - m_LocalPlayerAuthority: 0 ---- !u!114 &114119997076619734 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1454374643764660} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Texture: {fileID: 2800000, guid: 28d3b15bbc6a33e45a62ce7d55359e96, type: 3} - m_UVRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 ---- !u!114 &114173947639857384 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1513325839309728} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Texture: {fileID: 0} - m_UVRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 ---- !u!114 &114229348474079596 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1210777582185934} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 1 - m_ReferencePixelsPerUnit: 180 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 1280, y: 720} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0.561 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 ---- !u!114 &114268373889443330 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1914862909756648} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 0 - m_Spacing: 0 - m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 1 - m_ChildControlWidth: 0 - m_ChildControlHeight: 0 ---- !u!114 &114330911947922266 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1454374643764660} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -1200242548, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShowMaskGraphic: 1 ---- !u!114 &114481370759802600 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1602815615249518} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.6} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 ---- !u!114 &114543289563633844 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1463802595171778} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 12800000, guid: 9cad31830de888a43948d819d02754f8, type: 3} - m_FontSize: 14 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 97 - m_Alignment: 0 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: 'dolor sit amet #secops dolor sit amet #secops dolor sit amet #secops dolor - sit amet #secopst #secops dolor sit amet #secops dolor sit amet #secops' ---- !u!114 &114577769700370174 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1986336388991970} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Texture: {fileID: 0} - m_UVRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 ---- !u!114 &114617825759018050 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1466987064299460} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Texture: {fileID: 2800000, guid: 6d31169822947114584283e559c04b81, type: 3} - m_UVRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 ---- !u!114 &114669602398876494 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1088829831413472} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Texture: {fileID: 0} - m_UVRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 ---- !u!114 &114734668155567056 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1197096213458710} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 12800000, guid: 9cad31830de888a43948d819d02754f8, type: 3} - m_FontSize: 16 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 97 - m_Alignment: 0 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Lorem Ipsum ---- !u!114 &114767408317923132 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1061650553774000} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 12800000, guid: 9cad31830de888a43948d819d02754f8, type: 3} - m_FontSize: 14 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 97 - m_Alignment: 0 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: 'dolor sit amet #secops dolor sit amet #secops dolor sit amet #secops dolor - sit amet #secopst #secops dolor sit amet #secops dolor sit amet #secops' ---- !u!114 &114775664163413592 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1165297454867938} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 12800000, guid: 9cad31830de888a43948d819d02754f8, type: 3} - m_FontSize: 16 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 97 - m_Alignment: 0 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Lorem Ipsum ---- !u!114 &114794864356999526 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1038294681852994} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.6} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 ---- !u!114 &114901488394711528 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1337041950860596} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 12800000, guid: 9cad31830de888a43948d819d02754f8, type: 3} - m_FontSize: 14 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 97 - m_Alignment: 0 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: 'dolor sit amet #secops dolor sit amet #secops dolor sit amet #secops dolor - sit amet #secopst #secops dolor sit amet #secops dolor sit amet #secops' ---- !u!114 &114909869317740632 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1350895799815228} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Texture: {fileID: 2800000, guid: 6d31169822947114584283e559c04b81, type: 3} - m_UVRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 ---- !u!114 &114958152560119496 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1316453201421426} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 12800000, guid: 9cad31830de888a43948d819d02754f8, type: 3} - m_FontSize: 16 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 97 - m_Alignment: 0 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Lorem Ipsum ---- !u!114 &114975200490854076 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1210777582185934} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c9ca4ea21ecfa14fb07a297a985e20a, type: 3} - m_Name: - m_EditorClassIdentifier: - next: {fileID: 0} - network: {fileID: 0} - tweetContainer: - tweetBox: {fileID: 1713600301191020} - realName: {fileID: 114958152560119496} - message: {fileID: 114543289563633844} - image: {fileID: 114119997076619734} - pics: - - {fileID: 2800000, guid: 28d3b15bbc6a33e45a62ce7d55359e96, type: 3} - - {fileID: 2800000, guid: a337ed2703a207a48bf8cda2fa605c76, type: 3} - - {fileID: 2800000, guid: d4018d5ff1b60b74daaf74ee26092020, type: 3} - - {fileID: 2800000, guid: 98266600f692a6c41ad9a0dbb9a557bf, type: 3} - - {fileID: 2800000, guid: 2e83e83ab6e0e1e4bb55e23d4b4ec755, type: 3} - - {fileID: 2800000, guid: 0d13f83913e6b9b4f99fe6ca40253ba3, type: 3} - - {fileID: 2800000, guid: 67328f14f1b09bf46900325beb3ce75f, type: 3} - - {fileID: 2800000, guid: ab6e39f79342fe04d996061c0cc68280, type: 3} ---- !u!114 &114978752675589710 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1914862909756648} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.392} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 ---- !u!222 &222094679191607538 -CanvasRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1463802595171778} ---- !u!222 &222292724214919492 -CanvasRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1088829831413472} ---- !u!222 &222328193208687014 -CanvasRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1713600301191020} ---- !u!222 &222341364706544468 -CanvasRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1454374643764660} ---- !u!222 &222361234846967568 -CanvasRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1986336388991970} ---- !u!222 &222490966539148786 -CanvasRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1061650553774000} ---- !u!222 &222508468165229760 -CanvasRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1197096213458710} ---- !u!222 &222539378647882152 -CanvasRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1316453201421426} ---- !u!222 &222599136467776380 -CanvasRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1350895799815228} ---- !u!222 &222635532214521852 -CanvasRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1038294681852994} ---- !u!222 &222739041051096308 -CanvasRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1602815615249518} ---- !u!222 &222795349191686770 -CanvasRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1337041950860596} ---- !u!222 &222827187275832388 -CanvasRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1914862909756648} ---- !u!222 &222827598461183388 -CanvasRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1513325839309728} ---- !u!222 &222852622700210650 -CanvasRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1165297454867938} ---- !u!222 &222990185579322870 -CanvasRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1466987064299460} ---- !u!223 &223930056677376208 -Canvas: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1210777582185934} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 0 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 1 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_AdditionalShaderChannelsFlag: 0 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 ---- !u!224 &224095203310980180 -RectTransform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1165297454867938} - 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: 224972634899969178} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 51.869976, y: 29.4} - m_SizeDelta: {x: 308.74, y: 23.62} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!224 &224117479900117638 -RectTransform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1350895799815228} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.19845821, y: 0.19845828, z: 0.19845828} - m_Children: [] - m_Father: {fileID: 224404602570610114} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -158, y: 0} - m_SizeDelta: {x: 400, y: 400} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!224 &224183506526273124 -RectTransform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1197096213458710} - 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: 224404602570610114} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 51.869976, y: 29.4} - m_SizeDelta: {x: 308.74, y: 23.62} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!224 &224195618394870126 -RectTransform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1713600301191020} - 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: - - {fileID: 224714957267730532} - - {fileID: 224303344572135348} - - {fileID: 224897006387704478} - - {fileID: 224834178857114396} - m_Father: {fileID: 224703107439197560} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -428.6, y: -109.5} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!224 &224303344572135348 -RectTransform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1316453201421426} - 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: 224195618394870126} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 54.52, y: 35} - m_SizeDelta: {x: 303.44, y: 23.62} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!224 &224371376517048420 -RectTransform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1088829831413472} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.0000038146973} - m_LocalScale: {x: 0.19845493, y: 0.19845493, z: 0.19845493} - m_Children: [] - m_Father: {fileID: 224972634899969178} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0.83000183, y: -0.70000076} - m_SizeDelta: {x: 2157.88, y: 569.95} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!224 &224404602570610114 -RectTransform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1602815615249518} - 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: - - {fileID: 224486701726571408} - - {fileID: 224183506526273124} - - {fileID: 224796555806117194} - - {fileID: 224117479900117638} - m_Father: {fileID: 224703107439197560} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: -212.9, y: 0} - m_SizeDelta: {x: -425.8, y: -110.899994} - m_Pivot: {x: 0.5, y: 1} ---- !u!224 &224486701726571408 -RectTransform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1513325839309728} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.0000038146973} - m_LocalScale: {x: 0.19845493, y: 0.19845493, z: 0.19845493} - m_Children: [] - m_Father: {fileID: 224404602570610114} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0.83000183, y: -0.70000076} - m_SizeDelta: {x: 2157.88, y: 569.95} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!224 &224656169066195774 -RectTransform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1337041950860596} - 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: 224972634899969178} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 51.86997, y: -16.414993} - m_SizeDelta: {x: 308.74, y: 60.27} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!224 &224673779731126774 -RectTransform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1210777582185934} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} - m_Children: - - {fileID: 224703107439197560} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 0} ---- !u!224 &224703107439197560 -RectTransform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1914862909756648} - 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: - - {fileID: 224404602570610114} - - {fileID: 224972634899969178} - - {fileID: 224195618394870126} - m_Father: {fileID: 224673779731126774} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0.16244444} - m_AnchorMax: {x: 1, y: 0.35150003} - m_AnchoredPosition: {x: 47.9, y: -235} - m_SizeDelta: {x: 95.8, y: -32.2} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!224 &224714957267730532 -RectTransform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1986336388991970} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.0000038146973} - m_LocalScale: {x: 0.19845493, y: 0.19845493, z: 0.19845493} - m_Children: [] - m_Father: {fileID: 224195618394870126} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0.83000183, y: -0.70000076} - m_SizeDelta: {x: 2157.88, y: 569.95} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!224 &224796555806117194 -RectTransform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1061650553774000} - 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: 224404602570610114} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 51.86997, y: -16.414993} - m_SizeDelta: {x: 308.74, y: 60.27} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!224 &224834178857114396 -RectTransform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1454374643764660} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.1662364, y: 0.16623645, z: 0.16623645} - m_Children: [] - m_Father: {fileID: 224195618394870126} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -156.8, y: -0.00000071526} - m_SizeDelta: {x: 516.61, y: 516.61} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!224 &224846021644193030 -RectTransform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1466987064299460} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.19845821, y: 0.19845828, z: 0.19845828} - m_Children: [] - m_Father: {fileID: 224972634899969178} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -158, y: 0} - m_SizeDelta: {x: 400, y: 400} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!224 &224897006387704478 -RectTransform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1463802595171778} - 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: 224195618394870126} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 54.50001, y: -11.9} - m_SizeDelta: {x: 303.4, y: 60.3} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!224 &224972634899969178 -RectTransform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1038294681852994} - 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: - - {fileID: 224371376517048420} - - {fileID: 224095203310980180} - - {fileID: 224656169066195774} - - {fileID: 224846021644193030} - m_Father: {fileID: 224703107439197560} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: -429.5, y: 56.399994} - m_SizeDelta: {x: -429.5, y: -112.79999} - m_Pivot: {x: 1, y: 0.5} ---- !u!225 &225528469073541742 -CanvasGroup: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1713600301191020} - m_Enabled: 1 - m_Alpha: 0 - m_Interactable: 0 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 ---- !u!331 &331337810655337806 -SpriteMask: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1454374643764660} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 4294967295 - m_Materials: - - {fileID: 10758, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: ba556c7a4e9d1004ea47f07d901a77e4, type: 3} - m_MaskAlphaCutoff: 0.09 - m_FrontSortingLayerID: 0 - m_BackSortingLayerID: 0 - m_FrontSortingLayer: 0 - m_BackSortingLayer: 0 - m_FrontSortingOrder: 0 - m_BackSortingOrder: 0 - m_IsCustomRangeActive: 0 +fileFormatVersion: 2 +guid: e50bb1b4e28348645a323dbc70ae5d3b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/junctionAssets/prefabs/buildings/smallHouse.prefab b/UnityProject/Assets/junctionAssets/prefabs/buildings/smallHouse.prefab index de663d6..1b26f7f 100644 --- a/UnityProject/Assets/junctionAssets/prefabs/buildings/smallHouse.prefab +++ b/UnityProject/Assets/junctionAssets/prefabs/buildings/smallHouse.prefab @@ -1,8 +1,89 @@ -fileFormatVersion: 2 -guid: 2b32666b5a235494a8be8d528e1c8e24 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 100100000 - userData: - assetBundleName: - assetBundleVariant: +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: [] + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 0} + m_RootGameObject: {fileID: 1100742977228774} + m_IsPrefabParent: 1 +--- !u!1 &1100742977228774 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4158942427948816} + - component: {fileID: 33511602750188712} + - component: {fileID: 23382122387692012} + m_Layer: 0 + m_Name: smallHouse + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4158942427948816 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1100742977228774} + m_LocalRotation: {x: -0.5, y: 0.5, z: 0.5, w: 0.5} + m_LocalPosition: {x: 40.636, y: 18.747, z: -27.458} + m_LocalScale: {x: 12.5, y: 12.5, z: 10} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: -90.00001, y: 90, z: 0} +--- !u!23 &23382122387692012 +MeshRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1100742977228774} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 + m_Materials: + - {fileID: 2100000, guid: 925f5b3bec0f2b444986300aa5418042, type: 2} + - {fileID: 2100000, guid: f034ec01973193f41bd79e2b0f012f0c, type: 2} + - {fileID: 2100000, guid: c80c55b3dca5ede499feceadd2d451b4, type: 2} + - {fileID: 2100000, guid: 6a807475f65046c439ba235626b29350, type: 2} + - {fileID: 2100000, guid: 52018fb31de51cd4bba307dd51e9a274, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!33 &33511602750188712 +MeshFilter: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1100742977228774} + m_Mesh: {fileID: 4300004, guid: 4b8980018b0892a44b5fb03d71990b9b, type: 3} diff --git a/UnityProject/Assets/junctionAssets/prefabs/enviroment/bush_0.prefab b/UnityProject/Assets/junctionAssets/prefabs/enviroment/bush_0.prefab index 9399104..9beda03 100644 --- a/UnityProject/Assets/junctionAssets/prefabs/enviroment/bush_0.prefab +++ b/UnityProject/Assets/junctionAssets/prefabs/enviroment/bush_0.prefab @@ -1,8 +1,105 @@ -fileFormatVersion: 2 -guid: c41c06a28f4b7d74898900db818dd5d1 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 100100000 - userData: - assetBundleName: - assetBundleVariant: +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: [] + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 0} + m_RootGameObject: {fileID: 1533381890700138} + m_IsPrefabParent: 1 +--- !u!1 &1533381890700138 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4250613260765750} + - component: {fileID: 33262095977551468} + - component: {fileID: 23891725452091596} + - component: {fileID: 95504378727416290} + m_Layer: 0 + m_Name: bush_0 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4250613260765750 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1533381890700138} + m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068} + m_LocalPosition: {x: 45.811054, y: -0.014235802, z: 91.09439} + m_LocalScale: {x: 0.22002655, y: 0.22002655, z: 0.22002655} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &23891725452091596 +MeshRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1533381890700138} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 + m_Materials: + - {fileID: 2100000, guid: 6a807475f65046c439ba235626b29350, type: 2} + - {fileID: 2100000, guid: 64a7750321c7f4143a64e5434768411b, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!33 &33262095977551468 +MeshFilter: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1533381890700138} + m_Mesh: {fileID: 4300000, guid: f1d30c3079353c64eb903e66570f9756, type: 3} +--- !u!95 &95504378727416290 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1533381890700138} + m_Enabled: 1 + m_Avatar: {fileID: 9000000, guid: f1d30c3079353c64eb903e66570f9756, type: 3} + m_Controller: {fileID: 0} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 diff --git a/UnityProject/Assets/junctionAssets/prefabs/enviroment/tree_0.prefab.meta b/UnityProject/Assets/junctionAssets/prefabs/enviroment/tree_0.prefab.meta index c2cf481..b6724a7 100644 --- a/UnityProject/Assets/junctionAssets/prefabs/enviroment/tree_0.prefab.meta +++ b/UnityProject/Assets/junctionAssets/prefabs/enviroment/tree_0.prefab.meta @@ -1,105 +1,8 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1001 &100100000 -Prefab: - m_ObjectHideFlags: 1 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: [] - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 0} - m_RootGameObject: {fileID: 1495444229537352} - m_IsPrefabParent: 1 ---- !u!1 &1495444229537352 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 4487219845517904} - - component: {fileID: 33997448764777266} - - component: {fileID: 23388577891263802} - - component: {fileID: 95072548841686088} - m_Layer: 0 - m_Name: tree_1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4487219845517904 -Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1495444229537352} - m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068} - m_LocalPosition: {x: 99.56, y: 3.18, z: 112.25} - m_LocalScale: {x: 0.20244455, y: 0.20244455, z: 0.20244455} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!23 &23388577891263802 -MeshRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1495444229537352} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 4294967295 - m_Materials: - - {fileID: 2100000, guid: 6a807475f65046c439ba235626b29350, type: 2} - - {fileID: 2100000, guid: 1b92214b7bc384246afcf41bf5191ef7, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 ---- !u!33 &33997448764777266 -MeshFilter: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1495444229537352} - m_Mesh: {fileID: 4300000, guid: dddb14e4ad69672419ae700887a4ff87, type: 3} ---- !u!95 &95072548841686088 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1495444229537352} - m_Enabled: 1 - m_Avatar: {fileID: 9000000, guid: dddb14e4ad69672419ae700887a4ff87, type: 3} - m_Controller: {fileID: 0} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 +fileFormatVersion: 2 +guid: 1529641574e8fd54c9c763378eee2061 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/junctionAssets/prefabs/misc/big rock.prefab.meta b/UnityProject/Assets/junctionAssets/prefabs/misc/big rock.prefab.meta index 0a2dc63..f472ecc 100644 --- a/UnityProject/Assets/junctionAssets/prefabs/misc/big rock.prefab.meta +++ b/UnityProject/Assets/junctionAssets/prefabs/misc/big rock.prefab.meta @@ -1,104 +1,8 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1001 &100100000 -Prefab: - m_ObjectHideFlags: 1 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: [] - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 0} - m_RootGameObject: {fileID: 1110298318157612} - m_IsPrefabParent: 1 ---- !u!1 &1110298318157612 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 4250635842828218} - - component: {fileID: 33083040831652796} - - component: {fileID: 23533773825912026} - - component: {fileID: 95508554862330804} - m_Layer: 0 - m_Name: fence - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 1 - m_IsActive: 1 ---- !u!4 &4250635842828218 -Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1110298318157612} - m_LocalRotation: {x: -0, y: -0, z: -4.6566123e-10, w: 1} - m_LocalPosition: {x: -140.36, y: 0.00000021992, z: 0.000068784} - m_LocalScale: {x: 1.0000173, y: 1.0000168, z: 1.0000167} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: -93.584, y: 180, z: -90} ---- !u!23 &23533773825912026 -MeshRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1110298318157612} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 4294967295 - m_Materials: - - {fileID: 2100000, guid: 6a807475f65046c439ba235626b29350, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 ---- !u!33 &33083040831652796 -MeshFilter: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1110298318157612} - m_Mesh: {fileID: 4300000, guid: 6e0ae810dc0a45043be6cf808fd4f010, type: 3} ---- !u!95 &95508554862330804 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1110298318157612} - m_Enabled: 1 - m_Avatar: {fileID: 9000000, guid: 6e0ae810dc0a45043be6cf808fd4f010, type: 3} - m_Controller: {fileID: 0} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 +fileFormatVersion: 2 +guid: 65789133a8d00b949ab709795f13bd37 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/junctionAssets/prefabs/people/people180.prefab.meta b/UnityProject/Assets/junctionAssets/prefabs/people/people180.prefab.meta index 206e456..78db942 100644 --- a/UnityProject/Assets/junctionAssets/prefabs/people/people180.prefab.meta +++ b/UnityProject/Assets/junctionAssets/prefabs/people/people180.prefab.meta @@ -1,213 +1,8 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1001 &100100000 -Prefab: - m_ObjectHideFlags: 1 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: [] - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 0} - m_RootGameObject: {fileID: 1284591473558562} - m_IsPrefabParent: 1 ---- !u!1 &1284591473558562 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 4493967892375414} - m_Layer: 0 - m_Name: peopleTurn - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1297336485443936 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 4982766633235434} - - component: {fileID: 33482964171243322} - - component: {fileID: 23394881817597638} - - component: {fileID: 65752539832065986} - m_Layer: 0 - m_Name: peopleRightTurn - m_TagString: peopleTurnRight - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1915868309771176 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 4962700475548710} - - component: {fileID: 33874767879589654} - - component: {fileID: 23760841564948702} - - component: {fileID: 65976679260007384} - m_Layer: 0 - m_Name: peopleLeftTurn - m_TagString: peopleTurnLeft - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4493967892375414 -Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1284591473558562} - m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} - m_LocalPosition: {x: 123.98, y: -6.3521023, z: 81.44} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 4982766633235434} - - {fileID: 4962700475548710} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} ---- !u!4 &4962700475548710 -Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1915868309771176} - m_LocalRotation: {x: -0, y: 0.7096453, z: -0, w: 0.70455915} - m_LocalPosition: {x: -0.01, y: 7.466102, z: -1.61} - m_LocalScale: {x: 0.41673592, y: 1.5138896, z: 1.9961987} - m_Children: [] - m_Father: {fileID: 4493967892375414} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 90.412, z: 0} ---- !u!4 &4982766633235434 -Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1297336485443936} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -1.18, y: 7.466102, z: -0.46} - m_LocalScale: {x: 0.41673598, y: 1.5138896, z: 1.9961987} - m_Children: [] - m_Father: {fileID: 4493967892375414} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!23 &23394881817597638 -MeshRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1297336485443936} - m_Enabled: 0 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 4294967295 - m_Materials: - - {fileID: 2100012, guid: ab0bae469a0a12f44bdf0d1f9aec1f27, type: 3} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 ---- !u!23 &23760841564948702 -MeshRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1915868309771176} - m_Enabled: 0 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 4294967295 - m_Materials: - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 ---- !u!33 &33482964171243322 -MeshFilter: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1297336485443936} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!33 &33874767879589654 -MeshFilter: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1915868309771176} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!65 &65752539832065986 -BoxCollider: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1297336485443936} - m_Material: {fileID: 0} - m_IsTrigger: 1 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!65 &65976679260007384 -BoxCollider: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1915868309771176} - m_Material: {fileID: 0} - m_IsTrigger: 1 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} +fileFormatVersion: 2 +guid: 9d5a9a3d27709844cb146551f89e63c7 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/junctionAssets/prefabs/roads/safeSpace.prefab b/UnityProject/Assets/junctionAssets/prefabs/roads/safeSpace.prefab index c3ffa93..14319cf 100644 --- a/UnityProject/Assets/junctionAssets/prefabs/roads/safeSpace.prefab +++ b/UnityProject/Assets/junctionAssets/prefabs/roads/safeSpace.prefab @@ -1,8 +1,112 @@ -fileFormatVersion: 2 -guid: 39c0552056e74224180ccb6525dd6355 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 100100000 - userData: - assetBundleName: - assetBundleVariant: +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: [] + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 0} + m_RootGameObject: {fileID: 1181343553563290} + m_IsPrefabParent: 1 +--- !u!1 &1181343553563290 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4181307304208580} + - component: {fileID: 33271198198288784} + - component: {fileID: 23714266560748508} + - component: {fileID: 65353433593446010} + - component: {fileID: 114733049962020090} + m_Layer: 0 + m_Name: safeSpace + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4181307304208580 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1181343553563290} + m_LocalRotation: {x: -0, y: 0.7071068, z: -0, w: 0.7071068} + m_LocalPosition: {x: -6.71, y: 0.647318, z: 67.6} + m_LocalScale: {x: 2, y: 1, z: 6} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} +--- !u!23 &23714266560748508 +MeshRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1181343553563290} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 + m_Materials: + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!33 &33271198198288784 +MeshFilter: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1181343553563290} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!65 &65353433593446010 +BoxCollider: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1181343553563290} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &114733049962020090 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1181343553563290} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ed316f5bd09830c46bd502b7cb2bed3f, type: 3} + m_Name: + m_EditorClassIdentifier: + roadID: 6 + trafficContollerName: Traffic controller diff --git a/UnityProject/Assets/tweetPoller.cs b/UnityProject/Assets/tweetPoller.cs index 91f1516..1734f21 100644 --- a/UnityProject/Assets/tweetPoller.cs +++ b/UnityProject/Assets/tweetPoller.cs @@ -16,8 +16,10 @@ public class tweetPoller : NetworkBehaviour { private clientGameMenu client; - private void Start () + public override void OnStartServer () { + base.OnStartServer(); + url = url.TrimEnd('/'); GameObject newTweetObject = Instantiate(tweetPrefab); client = newTweetObject.GetComponent(); NetworkServer.Spawn(newTweetObject); diff --git a/UnityProject/Assets/twitterPics/6.jpg.meta b/UnityProject/Assets/twitterPics/6.jpg.meta index c2ef216..3e249fb 100644 Binary files a/UnityProject/Assets/twitterPics/6.jpg.meta and b/UnityProject/Assets/twitterPics/6.jpg.meta differ diff --git a/UnityProject/ProjectSettings/PresetManager.asset b/UnityProject/ProjectSettings/PresetManager.asset index aeb48d2..2ea8007 100644 --- a/UnityProject/ProjectSettings/PresetManager.asset +++ b/UnityProject/ProjectSettings/PresetManager.asset @@ -1,681 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!129 &1 -PlayerSettings: +--- !u!1386491679 &1 +PresetManager: m_ObjectHideFlags: 0 - serializedVersion: 15 - productGUID: 4e00efee1f7abd548b237926124bb8aa - AndroidProfiler: 0 - AndroidFilterTouchesWhenObscured: 0 - AndroidEnableSustainedPerformanceMode: 0 - defaultScreenOrientation: 4 - targetDevice: 2 - useOnDemandResources: 0 - accelerometerFrequency: 60 - companyName: "Schmelczer Andr\xE1s" - productName: Simulation - defaultCursor: {fileID: 0} - cursorHotspot: {x: 0, y: 0} - m_SplashScreenBackgroundColor: {r: 1, g: 1, b: 1, a: 1} - m_ShowUnitySplashScreen: 1 - m_ShowUnitySplashLogo: 1 - m_SplashScreenOverlayOpacity: 1 - m_SplashScreenAnimation: 0 - m_SplashScreenLogoStyle: 0 - m_SplashScreenDrawMode: 1 - m_SplashScreenBackgroundAnimationZoom: 1 - m_SplashScreenLogoAnimationZoom: 1 - m_SplashScreenBackgroundLandscapeAspect: 1 - m_SplashScreenBackgroundPortraitAspect: 1 - m_SplashScreenBackgroundLandscapeUvs: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - m_SplashScreenBackgroundPortraitUvs: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - m_SplashScreenLogos: - - logo: {fileID: 10404, guid: 0000000000000000e000000000000000, type: 0} - duration: 2 - m_VirtualRealitySplashScreen: {fileID: 0} - m_HolographicTrackingLossScreen: {fileID: 0} - defaultScreenWidth: 250 - defaultScreenHeight: 400 - defaultScreenWidthWeb: 1280 - defaultScreenHeightWeb: 720 - m_StereoRenderingPath: 0 - m_ActiveColorSpace: 1 - m_MTRendering: 1 - m_StackTraceTypes: 000000000000000000000000000000000000000001000000 - iosShowActivityIndicatorOnLoading: -1 - androidShowActivityIndicatorOnLoading: -1 - tizenShowActivityIndicatorOnLoading: -1 - iosAppInBackgroundBehavior: 0 - displayResolutionDialog: 1 - iosAllowHTTPDownload: 1 - allowedAutorotateToPortrait: 1 - allowedAutorotateToPortraitUpsideDown: 1 - allowedAutorotateToLandscapeRight: 1 - allowedAutorotateToLandscapeLeft: 1 - useOSAutorotation: 1 - use32BitDisplayBuffer: 1 - preserveFramebufferAlpha: 0 - disableDepthAndStencilBuffers: 0 - androidBlitType: 0 - defaultIsNativeResolution: 1 - macRetinaSupport: 0 - runInBackground: 1 - captureSingleScreen: 0 - muteOtherAudioSources: 0 - Prepare IOS For Recording: 0 - Force IOS Speakers When Recording: 0 - deferSystemGesturesMode: 0 - hideHomeButton: 0 - submitAnalytics: 1 - usePlayerLog: 0 - bakeCollisionMeshes: 1 - forceSingleInstance: 0 - resizableWindow: 1 - useMacAppStoreValidation: 0 - macAppStoreCategory: public.app-category.games - gpuSkinning: 1 - graphicsJobs: 1 - xboxPIXTextureCapture: 0 - xboxEnableAvatar: 0 - xboxEnableKinect: 0 - xboxEnableKinectAutoTracking: 0 - xboxEnableFitness: 0 - visibleInBackground: 1 - allowFullscreenSwitch: 1 - graphicsJobMode: 0 - fullscreenMode: 1 - xboxSpeechDB: 0 - xboxEnableHeadOrientation: 0 - xboxEnableGuest: 0 - xboxEnablePIXSampling: 0 - metalFramebufferOnly: 0 - n3dsDisableStereoscopicView: 0 - n3dsEnableSharedListOpt: 1 - n3dsEnableVSync: 0 - xboxOneResolution: 0 - xboxOneSResolution: 0 - xboxOneXResolution: 3 - xboxOneMonoLoggingLevel: 0 - xboxOneLoggingLevel: 1 - xboxOneDisableEsram: 0 - xboxOnePresentImmediateThreshold: 0 - switchQueueCommandMemory: 0 - videoMemoryForVertexBuffers: 0 - psp2PowerMode: 0 - psp2AcquireBGM: 1 - m_SupportedAspectRatios: - 4:3: 0 - 5:4: 0 - 16:10: 0 - 16:9: 1 - Others: 0 - bundleVersion: 0.1 - preloadedAssets: [] - metroInputSource: 0 - wsaTransparentSwapchain: 0 - m_HolographicPauseOnTrackingLoss: 1 - xboxOneDisableKinectGpuReservation: 0 - xboxOneEnable7thCore: 0 - vrSettings: - cardboard: - depthFormat: 0 - enableTransitionView: 0 - daydream: - depthFormat: 0 - useSustainedPerformanceMode: 0 - enableVideoLayer: 0 - useProtectedVideoMemory: 0 - minimumSupportedHeadTracking: 0 - maximumSupportedHeadTracking: 1 - hololens: - depthFormat: 1 - depthBufferSharingEnabled: 0 - enable360StereoCapture: 0 - oculus: - sharedDepthBuffer: 0 - dashSupport: 0 - protectGraphicsMemory: 0 - useHDRDisplay: 0 - m_ColorGamuts: 00000000 - targetPixelDensity: 30 - resolutionScalingMode: 0 - androidSupportedAspectRatio: 1 - androidMaxAspectRatio: 2.1 - applicationIdentifier: {} - buildNumber: {} - AndroidBundleVersionCode: 1 - AndroidMinSdkVersion: 16 - AndroidTargetSdkVersion: 0 - AndroidPreferredInstallLocation: 1 - aotOptions: - stripEngineCode: 1 - iPhoneStrippingLevel: 0 - iPhoneScriptCallOptimization: 0 - ForceInternetPermission: 0 - ForceSDCardPermission: 0 - CreateWallpaper: 0 - APKExpansionFiles: 0 - keepLoadedShadersAlive: 1 - StripUnusedMeshComponents: 1 - VertexChannelCompressionMask: -1 - iPhoneSdkVersion: 988 - iOSTargetOSVersionString: 8.0 - tvOSSdkVersion: 0 - tvOSRequireExtendedGameController: 0 - tvOSTargetOSVersionString: 9.0 - uIPrerenderedIcon: 0 - uIRequiresPersistentWiFi: 0 - uIRequiresFullScreen: 1 - uIStatusBarHidden: 1 - uIExitOnSuspend: 0 - uIStatusBarStyle: 0 - iPhoneSplashScreen: {fileID: 0} - iPhoneHighResSplashScreen: {fileID: 0} - iPhoneTallHighResSplashScreen: {fileID: 0} - iPhone47inSplashScreen: {fileID: 0} - iPhone55inPortraitSplashScreen: {fileID: 0} - iPhone55inLandscapeSplashScreen: {fileID: 0} - iPhone58inPortraitSplashScreen: {fileID: 0} - iPhone58inLandscapeSplashScreen: {fileID: 0} - iPadPortraitSplashScreen: {fileID: 0} - iPadHighResPortraitSplashScreen: {fileID: 0} - iPadLandscapeSplashScreen: {fileID: 0} - iPadHighResLandscapeSplashScreen: {fileID: 0} - appleTVSplashScreen: {fileID: 0} - appleTVSplashScreen2x: {fileID: 0} - tvOSSmallIconLayers: [] - tvOSSmallIconLayers2x: [] - tvOSLargeIconLayers: [] - tvOSLargeIconLayers2x: [] - tvOSTopShelfImageLayers: [] - tvOSTopShelfImageLayers2x: [] - tvOSTopShelfImageWideLayers: [] - tvOSTopShelfImageWideLayers2x: [] - iOSLaunchScreenType: 0 - iOSLaunchScreenPortrait: {fileID: 0} - iOSLaunchScreenLandscape: {fileID: 0} - iOSLaunchScreenBackgroundColor: - serializedVersion: 2 - rgba: 0 - iOSLaunchScreenFillPct: 100 - iOSLaunchScreenSize: 100 - iOSLaunchScreenCustomXibPath: - iOSLaunchScreeniPadType: 0 - iOSLaunchScreeniPadImage: {fileID: 0} - iOSLaunchScreeniPadBackgroundColor: - serializedVersion: 2 - rgba: 0 - iOSLaunchScreeniPadFillPct: 100 - iOSLaunchScreeniPadSize: 100 - iOSLaunchScreeniPadCustomXibPath: - iOSUseLaunchScreenStoryboard: 0 - iOSLaunchScreenCustomStoryboardPath: - iOSDeviceRequirements: [] - iOSURLSchemes: [] - iOSBackgroundModes: 0 - iOSMetalForceHardShadows: 0 - metalEditorSupport: 1 - metalAPIValidation: 1 - iOSRenderExtraFrameOnPause: 0 - appleDeveloperTeamID: - iOSManualSigningProvisioningProfileID: - tvOSManualSigningProvisioningProfileID: - iOSManualSigningProvisioningProfileType: 0 - tvOSManualSigningProvisioningProfileType: 0 - appleEnableAutomaticSigning: 0 - iOSRequireARKit: 0 - appleEnableProMotion: 0 - clonedFromGUID: 56e7a2d3a00f33d44bdd161b773c35b5 - templatePackageId: com.unity.template.3d@1.0.0 - templateDefaultScene: Assets/Scenes/SampleScene.unity - AndroidTargetArchitectures: 5 - AndroidSplashScreenScale: 0 - androidSplashScreen: {fileID: 0} - AndroidKeystoreName: - AndroidKeyaliasName: - AndroidTVCompatibility: 1 - AndroidIsGame: 1 - AndroidEnableTango: 0 - androidEnableBanner: 1 - androidUseLowAccuracyLocation: 0 - m_AndroidBanners: - - width: 320 - height: 180 - banner: {fileID: 0} - androidGamepadSupportLevel: 0 - resolutionDialogBanner: {fileID: 0} - m_BuildTargetIcons: - - m_BuildTarget: - m_Icons: - - serializedVersion: 2 - m_Icon: {fileID: 2800000, guid: 1276dd73676e50749a6735ed56d209ba, type: 3} - m_Width: 128 - m_Height: 128 - m_Kind: 0 - m_BuildTargetPlatformIcons: [] - m_BuildTargetBatching: - - m_BuildTarget: Standalone - m_StaticBatching: 1 - m_DynamicBatching: 0 - - m_BuildTarget: tvOS - m_StaticBatching: 1 - m_DynamicBatching: 0 - - m_BuildTarget: Android - m_StaticBatching: 1 - m_DynamicBatching: 0 - - m_BuildTarget: iPhone - m_StaticBatching: 1 - m_DynamicBatching: 0 - - m_BuildTarget: WebGL - m_StaticBatching: 1 - m_DynamicBatching: 1 - m_BuildTargetGraphicsAPIs: - - m_BuildTarget: AndroidPlayer - m_APIs: 0b00000015000000 - m_Automatic: 1 - - m_BuildTarget: iOSSupport - m_APIs: 10000000 - m_Automatic: 1 - - m_BuildTarget: AppleTVSupport - m_APIs: 10000000 - m_Automatic: 0 - - m_BuildTarget: WebGLSupport - m_APIs: 0b000000 - m_Automatic: 0 - m_BuildTargetVRSettings: - - m_BuildTarget: Standalone - m_Enabled: 0 - m_Devices: - - Oculus - - OpenVR - m_BuildTargetEnableVuforiaSettings: [] - openGLRequireES31: 0 - openGLRequireES31AEP: 0 - m_TemplateCustomTags: {} - mobileMTRendering: - Android: 1 - iPhone: 1 - tvOS: 1 - m_BuildTargetGroupLightmapEncodingQuality: [] - playModeTestRunnerEnabled: 0 - runPlayModeTestAsEditModeTest: 0 - actionOnDotNetUnhandledException: 1 - enableInternalProfiler: 0 - logObjCUncaughtExceptions: 1 - enableCrashReportAPI: 0 - cameraUsageDescription: - locationUsageDescription: - microphoneUsageDescription: - switchNetLibKey: - switchSocketMemoryPoolSize: 6144 - switchSocketAllocatorPoolSize: 128 - switchSocketConcurrencyLimit: 14 - switchScreenResolutionBehavior: 2 - switchUseCPUProfiler: 0 - switchApplicationID: 0x01004b9000490000 - switchNSODependencies: - switchTitleNames_0: - switchTitleNames_1: - switchTitleNames_2: - switchTitleNames_3: - switchTitleNames_4: - switchTitleNames_5: - switchTitleNames_6: - switchTitleNames_7: - switchTitleNames_8: - switchTitleNames_9: - switchTitleNames_10: - switchTitleNames_11: - switchTitleNames_12: - switchTitleNames_13: - switchTitleNames_14: - switchPublisherNames_0: - switchPublisherNames_1: - switchPublisherNames_2: - switchPublisherNames_3: - switchPublisherNames_4: - switchPublisherNames_5: - switchPublisherNames_6: - switchPublisherNames_7: - switchPublisherNames_8: - switchPublisherNames_9: - switchPublisherNames_10: - switchPublisherNames_11: - switchPublisherNames_12: - switchPublisherNames_13: - switchPublisherNames_14: - switchIcons_0: {fileID: 0} - switchIcons_1: {fileID: 0} - switchIcons_2: {fileID: 0} - switchIcons_3: {fileID: 0} - switchIcons_4: {fileID: 0} - switchIcons_5: {fileID: 0} - switchIcons_6: {fileID: 0} - switchIcons_7: {fileID: 0} - switchIcons_8: {fileID: 0} - switchIcons_9: {fileID: 0} - switchIcons_10: {fileID: 0} - switchIcons_11: {fileID: 0} - switchIcons_12: {fileID: 0} - switchIcons_13: {fileID: 0} - switchIcons_14: {fileID: 0} - switchSmallIcons_0: {fileID: 0} - switchSmallIcons_1: {fileID: 0} - switchSmallIcons_2: {fileID: 0} - switchSmallIcons_3: {fileID: 0} - switchSmallIcons_4: {fileID: 0} - switchSmallIcons_5: {fileID: 0} - switchSmallIcons_6: {fileID: 0} - switchSmallIcons_7: {fileID: 0} - switchSmallIcons_8: {fileID: 0} - switchSmallIcons_9: {fileID: 0} - switchSmallIcons_10: {fileID: 0} - switchSmallIcons_11: {fileID: 0} - switchSmallIcons_12: {fileID: 0} - switchSmallIcons_13: {fileID: 0} - switchSmallIcons_14: {fileID: 0} - switchManualHTML: - switchAccessibleURLs: - switchLegalInformation: - switchMainThreadStackSize: 1048576 - switchPresenceGroupId: - switchLogoHandling: 0 - switchReleaseVersion: 0 - switchDisplayVersion: 1.0.0 - switchStartupUserAccount: 0 - switchTouchScreenUsage: 0 - switchSupportedLanguagesMask: 0 - switchLogoType: 0 - switchApplicationErrorCodeCategory: - switchUserAccountSaveDataSize: 0 - switchUserAccountSaveDataJournalSize: 0 - switchApplicationAttribute: 0 - switchCardSpecSize: -1 - switchCardSpecClock: -1 - switchRatingsMask: 0 - switchRatingsInt_0: 0 - switchRatingsInt_1: 0 - switchRatingsInt_2: 0 - switchRatingsInt_3: 0 - switchRatingsInt_4: 0 - switchRatingsInt_5: 0 - switchRatingsInt_6: 0 - switchRatingsInt_7: 0 - switchRatingsInt_8: 0 - switchRatingsInt_9: 0 - switchRatingsInt_10: 0 - switchRatingsInt_11: 0 - switchLocalCommunicationIds_0: - switchLocalCommunicationIds_1: - switchLocalCommunicationIds_2: - switchLocalCommunicationIds_3: - switchLocalCommunicationIds_4: - switchLocalCommunicationIds_5: - switchLocalCommunicationIds_6: - switchLocalCommunicationIds_7: - switchParentalControl: 0 - switchAllowsScreenshot: 1 - switchAllowsVideoCapturing: 1 - switchAllowsRuntimeAddOnContentInstall: 0 - switchDataLossConfirmation: 0 - switchSupportedNpadStyles: 3 - switchNativeFsCacheSize: 32 - switchSocketConfigEnabled: 0 - switchTcpInitialSendBufferSize: 32 - switchTcpInitialReceiveBufferSize: 64 - switchTcpAutoSendBufferSizeMax: 256 - switchTcpAutoReceiveBufferSizeMax: 256 - switchUdpSendBufferSize: 9 - switchUdpReceiveBufferSize: 42 - switchSocketBufferEfficiency: 4 - switchSocketInitializeEnabled: 1 - switchNetworkInterfaceManagerInitializeEnabled: 1 - switchPlayerConnectionEnabled: 1 - ps4NPAgeRating: 12 - ps4NPTitleSecret: - ps4NPTrophyPackPath: - ps4ParentalLevel: 11 - ps4ContentID: ED1633-NPXX51362_00-0000000000000000 - ps4Category: 0 - ps4MasterVersion: 01.00 - ps4AppVersion: 01.00 - ps4AppType: 0 - ps4ParamSfxPath: - ps4VideoOutPixelFormat: 0 - ps4VideoOutInitialWidth: 1920 - ps4VideoOutBaseModeInitialWidth: 1920 - ps4VideoOutReprojectionRate: 60 - ps4PronunciationXMLPath: - ps4PronunciationSIGPath: - ps4BackgroundImagePath: - ps4StartupImagePath: - ps4StartupImagesFolder: - ps4IconImagesFolder: - ps4SaveDataImagePath: - ps4SdkOverride: - ps4BGMPath: - ps4ShareFilePath: - ps4ShareOverlayImagePath: - ps4PrivacyGuardImagePath: - ps4NPtitleDatPath: - ps4RemotePlayKeyAssignment: -1 - ps4RemotePlayKeyMappingDir: - ps4PlayTogetherPlayerCount: 0 - ps4EnterButtonAssignment: 1 - ps4ApplicationParam1: 0 - ps4ApplicationParam2: 0 - ps4ApplicationParam3: 0 - ps4ApplicationParam4: 0 - ps4DownloadDataSize: 0 - ps4GarlicHeapSize: 2048 - ps4ProGarlicHeapSize: 2560 - ps4Passcode: frAQBc8Wsa1xVPfvJcrgRYwTiizs2trQ - ps4pnSessions: 1 - ps4pnPresence: 1 - ps4pnFriends: 1 - ps4pnGameCustomData: 1 - playerPrefsSupport: 0 - enableApplicationExit: 0 - restrictedAudioUsageRights: 0 - ps4UseResolutionFallback: 0 - ps4ReprojectionSupport: 0 - ps4UseAudio3dBackend: 0 - ps4SocialScreenEnabled: 0 - ps4ScriptOptimizationLevel: 0 - ps4Audio3dVirtualSpeakerCount: 14 - ps4attribCpuUsage: 0 - ps4PatchPkgPath: - ps4PatchLatestPkgPath: - ps4PatchChangeinfoPath: - ps4PatchDayOne: 0 - ps4attribUserManagement: 0 - ps4attribMoveSupport: 0 - ps4attrib3DSupport: 0 - ps4attribShareSupport: 0 - ps4attribExclusiveVR: 0 - ps4disableAutoHideSplash: 0 - ps4videoRecordingFeaturesUsed: 0 - ps4contentSearchFeaturesUsed: 0 - ps4attribEyeToEyeDistanceSettingVR: 0 - ps4IncludedModules: [] - monoEnv: - psp2Splashimage: {fileID: 0} - psp2NPTrophyPackPath: - psp2NPSupportGBMorGJP: 0 - psp2NPAgeRating: 12 - psp2NPTitleDatPath: - psp2NPCommsID: - psp2NPCommunicationsID: - psp2NPCommsPassphrase: - psp2NPCommsSig: - psp2ParamSfxPath: - psp2ManualPath: - psp2LiveAreaGatePath: - psp2LiveAreaBackroundPath: - psp2LiveAreaPath: - psp2LiveAreaTrialPath: - psp2PatchChangeInfoPath: - psp2PatchOriginalPackage: - psp2PackagePassword: F69AzBlax3CF3EDNhm3soLBPh71Yexui - psp2KeystoneFile: - psp2MemoryExpansionMode: 0 - psp2DRMType: 0 - psp2StorageType: 0 - psp2MediaCapacity: 0 - psp2DLCConfigPath: - psp2ThumbnailPath: - psp2BackgroundPath: - psp2SoundPath: - psp2TrophyCommId: - psp2TrophyPackagePath: - psp2PackagedResourcesPath: - psp2SaveDataQuota: 10240 - psp2ParentalLevel: 1 - psp2ShortTitle: Not Set - psp2ContentID: IV0000-ABCD12345_00-0123456789ABCDEF - psp2Category: 0 - psp2MasterVersion: 01.00 - psp2AppVersion: 01.00 - psp2TVBootMode: 0 - psp2EnterButtonAssignment: 2 - psp2TVDisableEmu: 0 - psp2AllowTwitterDialog: 1 - psp2Upgradable: 0 - psp2HealthWarning: 0 - psp2UseLibLocation: 0 - psp2InfoBarOnStartup: 0 - psp2InfoBarColor: 0 - psp2ScriptOptimizationLevel: 0 - splashScreenBackgroundSourceLandscape: {fileID: 0} - splashScreenBackgroundSourcePortrait: {fileID: 0} - spritePackerPolicy: - webGLMemorySize: 256 - webGLExceptionSupport: 0 - webGLNameFilesAsHashes: 0 - webGLDataCaching: 1 - webGLDebugSymbols: 0 - webGLEmscriptenArgs: - webGLModulesDirectory: - webGLTemplate: PROJECT:FullScreenOnly - webGLAnalyzeBuildSize: 0 - webGLUseEmbeddedResources: 0 - webGLCompressionFormat: 1 - webGLLinkerTarget: 0 - scriptingDefineSymbols: - 1: UNITY_POST_PROCESSING_STACK_V2;CROSS_PLATFORM_INPUT - 4: UNITY_POST_PROCESSING_STACK_V2;CROSS_PLATFORM_INPUT;MOBILE_INPUT - 7: UNITY_POST_PROCESSING_STACK_V2;CROSS_PLATFORM_INPUT;MOBILE_INPUT - 13: UNITY_POST_PROCESSING_STACK_V2 - 14: MOBILE_INPUT - 17: UNITY_POST_PROCESSING_STACK_V2;MOBILE_INPUT - 18: UNITY_POST_PROCESSING_STACK_V2 - 19: UNITY_POST_PROCESSING_STACK_V2 - 21: UNITY_POST_PROCESSING_STACK_V2 - 23: UNITY_POST_PROCESSING_STACK_V2 - 24: UNITY_POST_PROCESSING_STACK_V2 - 25: UNITY_POST_PROCESSING_STACK_V2 - 26: UNITY_POST_PROCESSING_STACK_V2 - 27: UNITY_POST_PROCESSING_STACK_V2 - platformArchitecture: {} - scriptingBackend: {} - il2cppCompilerConfiguration: {} - incrementalIl2cppBuild: {} - allowUnsafeCode: 0 - additionalIl2CppArgs: - scriptingRuntimeVersion: 0 - apiCompatibilityLevelPerPlatform: {} - m_RenderingPath: 1 - m_MobileRenderingPath: 1 - metroPackageName: Template_3D - metroPackageVersion: - metroCertificatePath: - metroCertificatePassword: - metroCertificateSubject: - metroCertificateIssuer: - metroCertificateNotAfter: 0000000000000000 - metroApplicationDescription: Template_3D - wsaImages: {} - metroTileShortName: - metroCommandLineArgsFile: - metroTileShowName: 0 - metroMediumTileShowName: 0 - metroLargeTileShowName: 0 - metroWideTileShowName: 0 - metroDefaultTileSize: 1 - metroTileForegroundText: 2 - metroTileBackgroundColor: {r: 0.13333334, g: 0.17254902, b: 0.21568628, a: 0} - metroSplashScreenBackgroundColor: {r: 0.12941177, g: 0.17254902, b: 0.21568628, - a: 1} - metroSplashScreenUseBackgroundColor: 0 - platformCapabilities: {} - metroFTAName: - metroFTAFileTypes: [] - metroProtocolName: - metroCompilationOverrides: 1 - tizenProductDescription: - tizenProductURL: - tizenSigningProfileName: - tizenGPSPermissions: 0 - tizenMicrophonePermissions: 0 - tizenDeploymentTarget: - tizenDeploymentTargetType: -1 - tizenMinOSVersion: 1 - n3dsUseExtSaveData: 0 - n3dsCompressStaticMem: 1 - n3dsExtSaveDataNumber: 0x12345 - n3dsStackSize: 131072 - n3dsTargetPlatform: 2 - n3dsRegion: 7 - n3dsMediaSize: 0 - n3dsLogoStyle: 3 - n3dsTitle: GameName - n3dsProductCode: - n3dsApplicationId: 0xFF3FF - XboxOneProductId: - XboxOneUpdateKey: - XboxOneSandboxId: - XboxOneContentId: - XboxOneTitleId: - XboxOneSCId: - XboxOneGameOsOverridePath: - XboxOnePackagingOverridePath: - XboxOneAppManifestOverridePath: - XboxOnePackageEncryption: 0 - XboxOnePackageUpdateGranularity: 2 - XboxOneDescription: - XboxOneLanguage: - - enus - XboxOneCapability: [] - XboxOneGameRating: {} - XboxOneIsContentPackage: 0 - XboxOneEnableGPUVariability: 0 - XboxOneSockets: {} - XboxOneSplashScreen: {fileID: 0} - XboxOneAllowedProductIds: [] - XboxOnePersistentLocalStorageSize: 0 - XboxOneXTitleMemory: 8 - xboxOneScriptCompiler: 0 - vrEditorSettings: - daydream: - daydreamIconForeground: {fileID: 0} - daydreamIconBackground: {fileID: 0} - cloudServicesEnabled: - UNet: 1 - facebookSdkVersion: 7.9.4 - apiCompatibilityLevel: 2 - cloudProjectId: - projectName: Template_3D - organizationId: - cloudEnabled: 0 - enableNativePlatformBackendsForNewInputSystem: 0 - disableOldInputManagerSupport: 0 + m_DefaultList: [] diff --git a/UnityProject/ProjectSettings/ProjectSettings.asset b/UnityProject/ProjectSettings/ProjectSettings.asset index aeb48d2..d7437f6 100644 --- a/UnityProject/ProjectSettings/ProjectSettings.asset +++ b/UnityProject/ProjectSettings/ProjectSettings.asset @@ -56,7 +56,7 @@ PlayerSettings: androidShowActivityIndicatorOnLoading: -1 tizenShowActivityIndicatorOnLoading: -1 iosAppInBackgroundBehavior: 0 - displayResolutionDialog: 1 + displayResolutionDialog: 0 iosAllowHTTPDownload: 1 allowedAutorotateToPortrait: 1 allowedAutorotateToPortraitUpsideDown: 1 diff --git a/UnityProject/ProjectSettings/UnityConnectSettings.asset b/UnityProject/ProjectSettings/UnityConnectSettings.asset index 88a2666..0ec2f0e 100644 --- a/UnityProject/ProjectSettings/UnityConnectSettings.asset +++ b/UnityProject/ProjectSettings/UnityConnectSettings.asset @@ -1,9 +1,34 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!5 &1 -TimeManager: +--- !u!310 &1 +UnityConnectSettings: m_ObjectHideFlags: 0 - Fixed Timestep: 0.025 - Maximum Allowed Timestep: 0.025 - m_TimeScale: 1 - Maximum Particle Timestep: 0.1 + m_Enabled: 0 + m_TestMode: 0 + m_TestEventUrl: + m_TestConfigUrl: + m_TestInitMode: 0 + CrashReportingSettings: + m_EventUrl: https://perf-events.cloud.unity3d.com/api/events/crashes + m_NativeEventUrl: https://perf-events.cloud.unity3d.com/symbolicate + m_Enabled: 0 + m_CaptureEditorExceptions: 1 + UnityPurchasingSettings: + m_Enabled: 0 + m_TestMode: 0 + UnityAnalyticsSettings: + m_Enabled: 0 + m_InitializeOnStartup: 1 + m_TestMode: 0 + m_TestEventUrl: + m_TestConfigUrl: + UnityAdsSettings: + m_Enabled: 0 + m_InitializeOnStartup: 1 + m_TestMode: 0 + m_IosGameId: + m_AndroidGameId: + m_GameIds: {} + m_GameId: + PerformanceReportingSettings: + m_Enabled: 0 diff --git a/build-linux.sh b/build-linux.sh index d6c252f..78214a9 100755 --- a/build-linux.sh +++ b/build-linux.sh @@ -12,6 +12,9 @@ if [[ ! -x "$unity_editor" ]]; then fi mkdir -p "$output_dir" +# Large shader/import temporary files should not fill a small /tmp tmpfs. +export TMPDIR="${TMPDIR:-$output_dir/tmp}" +mkdir -p "$TMPDIR" echo "Building Linux x86_64 player; log: $log_file" # Unity 2018 on Linux still needs an X server in batch mode. diff --git a/event_server.py b/event_server.py index 5ab5246..a052632 100644 --- a/event_server.py +++ b/event_server.py @@ -1,4 +1,5 @@ import json +import os import random import re from http.server import BaseHTTPRequestHandler, HTTPServer @@ -6,7 +7,7 @@ from socketserver import ThreadingMixIn # SETUP # # -hostAddress = "0.0.0.0" +hostAddress = os.environ.get("SIMULATION_BIND_ADDRESS", "0.0.0.0") hostPort = 8081 network = re.compile(r"(127)\.(0)\.(0)\..*") # diff --git a/run-linux.sh b/run-linux.sh new file mode 100755 index 0000000..28a4004 --- /dev/null +++ b/run-linux.sh @@ -0,0 +1,104 @@ +#!/usr/bin/env bash +set -euo pipefail + +repo_dir="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)" +output_dir="$repo_dir/Builds/linux" +player="$output_dir/Simulation.x86_64" +mode="${1:---demo}" +case "$mode" in + --demo|--server|--vnc) ;; + *) echo "Usage: $0 [--demo | --server | --vnc]"; exit 2 ;; +esac +if [[ ! -x "$player" ]]; then + echo "Build the Linux player first: ./build-linux.sh" >&2 + exit 1 +fi +if [[ "$mode" == --vnc && -z "${DISPLAY:-}" ]]; then + exec xvfb-run -a -s '-screen 0 1280x800x24 -nolisten tcp' "$0" --vnc +fi +if [[ "$mode" == --demo && -z "${DISPLAY:-}" ]]; then + echo "No display. Use --vnc to view over SSH, or --server for a headless server." >&2 + exit 1 +fi +if [[ "$mode" == --vnc ]]; then + command -v x11vnc >/dev/null || { echo "Install x11vnc, xvfb, and xauth." >&2; exit 1; } +fi + +cd "$repo_dir" +mkdir -p "$output_dir" +children=() +cleanup() { + trap - EXIT INT TERM + if (( ${#children[@]} )); then + kill "${children[@]}" 2>/dev/null || true + wait "${children[@]}" 2>/dev/null || true + fi +} +trap cleanup EXIT +trap 'exit 130' INT +trap 'exit 143' TERM + +# These services control the local simulation. Refuse to reuse unknown servers. +python3 - <<'PY' +import socket +for port in (8080, 8081): + with socket.socket() as sock: + sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) + try: + sock.bind(('127.0.0.1', port)) + except OSError: + raise SystemExit('Port %s is already in use; stop the previous simulation first.' % port) +with socket.socket(socket.AF_INET, socket.SOCK_DGRAM) as sock: + try: + sock.bind(('0.0.0.0', 7777)) + except OSError: + raise SystemExit('UDP port 7777 is already in use.') +PY +SIMULATION_BIND_ADDRESS=127.0.0.1 python3 -u traffic_light_server.py >"$output_dir/traffic.log" 2>&1 & +children+=("$!") +SIMULATION_BIND_ADDRESS=127.0.0.1 python3 -u event_server.py >"$output_dir/events.log" 2>&1 & +children+=("$!") +python3 - <<'PY' +import time, urllib.request +for port, path in ((8080, '/trafficLights/'), (8081, '/tweetCount')): + for attempt in range(50): + try: + with urllib.request.urlopen('http://127.0.0.1:%s%s' % (port, path), timeout=1) as response: + response.read() + break + except OSError: + time.sleep(.1) + else: + raise SystemExit('Backend failed to start; inspect Builds/linux/*.log') +PY +: > "$output_dir/server.log" +"$player" -batchmode -nographics --server \ + --traffic-url http://127.0.0.1:8080 --event-url http://127.0.0.1:8081 \ + -logFile "$output_dir/server.log" >"$output_dir/server-console.log" 2>&1 & +children+=("$!") +echo "Simulation server running on port 7777. Logs: $output_dir" + +if [[ "$mode" != --server ]]; then + # Wait for UNet to finish loading the scene before connecting the client. + for ((attempt=0; attempt<100; attempt++)); do + if grep -q 'Simulation server started' "$output_dir/server.log"; then break; fi + kill -0 "${children[2]}" 2>/dev/null || exit 1 + sleep .1 + done + if ! grep -q 'Simulation server started' "$output_dir/server.log"; then + echo "Server startup timed out; inspect $output_dir/server.log" >&2 + exit 1 + fi + "$player" --connect 127.0.0.1 -screen-width 1280 -screen-height 800 \ + -screen-fullscreen 0 -force-glcore -logFile "$output_dir/client.log" \ + >"$output_dir/client-console.log" 2>&1 & + children+=("$!") +fi +if [[ "$mode" == --vnc ]]; then + x11vnc -display "$DISPLAY" -localhost -rfbport 5901 -forever -shared -nopw \ + >"$output_dir/vnc.log" 2>&1 & + children+=("$!") + echo "Forward SSH port 5901, then connect your VNC viewer to localhost:5901." +fi +echo "Press Ctrl-C to stop the simulation and its services." +wait -n "${children[@]}" diff --git a/traffic_light_server.py b/traffic_light_server.py index 0475ae4..6a1c647 100644 --- a/traffic_light_server.py +++ b/traffic_light_server.py @@ -1,4 +1,5 @@ import json +import os import re from enum import Enum from http.server import BaseHTTPRequestHandler, HTTPServer @@ -6,7 +7,7 @@ from socketserver import ThreadingMixIn # SETUP # # -hostAddress = "0.0.0.0" +hostAddress = os.environ.get("SIMULATION_BIND_ADDRESS", "0.0.0.0") hostPort = 8080 network = re.compile(r"(127)\.(0)\.(0)\..+") #