Skip to content
This repository has been archived by the owner on Feb 12, 2021. It is now read-only.

Commit

Permalink
Underwater level
Browse files Browse the repository at this point in the history
  • Loading branch information
VoidXH committed Oct 3, 2017
1 parent fc1a9df commit 412e77b
Show file tree
Hide file tree
Showing 47 changed files with 1,623 additions and 1 deletion.
103 changes: 103 additions & 0 deletions Assembly-CSharp-firstpass.csproj
@@ -0,0 +1,103 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LangVersion>6</LangVersion>
</PropertyGroup>
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>10.0.20506</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<RootNamespace></RootNamespace>
<ProjectGuid>{7F32AB24-E0E8-6554-66C8-AAB8DABB2F87}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<AssemblyName>Assembly-CSharp-firstpass</AssemblyName>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<BaseDirectory>Assets</BaseDirectory>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>Temp\bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_1_1;UNITY_2017_1;UNITY_2017;PLATFORM_ARCH_64;UNITY_64;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_GENERICS;ENABLE_PVR_GI;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_RUNTIME_NAVMESH_BUILDING;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_DIRECTOR;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_TIMELINE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;ENABLE_NATIVE_ARRAY;ENABLE_SPRITE_MASKING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;ENABLE_MONO_BDWGC;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_VIDEO;ENABLE_RMGUI;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_STYLE_SHEETS;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_VR;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_NATIVE_ARRAY_CHECKS;UNITY_TEAM_LICENSE;ENABLE_VSTU</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<NoWarn>0169</NoWarn>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>Temp\bin\Release\</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<NoWarn>0169</NoWarn>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.XML" />
<Reference Include="System.Core" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Xml.Linq" />
<Reference Include="UnityEngine">
<HintPath>B:/Unity/Editor/Data/Managed/UnityEngine.dll</HintPath>
</Reference>
<Reference Include="UnityEditor">
<HintPath>B:/Unity/Editor/Data/Managed/UnityEditor.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Assets\Standard Assets\Environment\Water\Scripts\Displace.cs" />
<Compile Include="Assets\Standard Assets\Environment\Water\Scripts\GerstnerDisplace.cs" />
<Compile Include="Assets\Standard Assets\Environment\Water\Scripts\MeshContainer.cs" />
<Compile Include="Assets\Standard Assets\Environment\Water\Scripts\PlanarReflection.cs" />
<Compile Include="Assets\Standard Assets\Environment\Water\Scripts\SpecularLighting.cs" />
<Compile Include="Assets\Standard Assets\Environment\Water\Scripts\Water.cs" />
<Compile Include="Assets\Standard Assets\Environment\Water\Scripts\WaterBase.cs" />
<Compile Include="Assets\Standard Assets\Environment\Water\Scripts\WaterTile.cs" />
<None Include="Assets\Other\Enter Sansman Font\!license.txt" />
<None Include="Assets\Scripts\ImageEffects\CameraMotionBlurDX11.shader" />
<None Include="Assets\Scripts\ImageEffects\CameraMotionBlur.shader" />
<None Include="Assets\Standard Assets\Environment\Water\Shaders\FXWaterPro.shader" />
<Reference Include="UnityEngine.UI">
<HintPath>B:/Unity/Editor/Data/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.Networking">
<HintPath>B:/Unity/Editor/Data/UnityExtensions/Unity/Networking/UnityEngine.Networking.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.TestRunner">
<HintPath>B:/Unity/Editor/Data/UnityExtensions/Unity/TestRunner/UnityEngine.TestRunner.dll</HintPath>
</Reference>
<Reference Include="nunit.framework">
<HintPath>B:/Unity/Editor/Data/UnityExtensions/Unity/TestRunner/net35/unity-custom/nunit.framework.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.Timeline">
<HintPath>B:/Unity/Editor/Data/UnityExtensions/Unity/Timeline/RuntimeEditor/UnityEngine.Timeline.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.Analytics">
<HintPath>B:/Unity/Editor/Data/UnityExtensions/Unity/UnityAnalytics/UnityEngine.Analytics.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.HoloLens">
<HintPath>B:/Unity/Editor/Data/UnityExtensions/Unity/UnityHoloLens/RuntimeEditor/UnityEngine.HoloLens.dll</HintPath>
</Reference>
<Reference Include="CavernUnity">
<HintPath>B:/Unity/Mayhem/Assets/SDK/CavernUnity.dll</HintPath>
</Reference>
<Reference Include="LeapCSharp.NET3.5">
<HintPath>B:/Unity/Mayhem/Assets/SDK/LeapMotion/Core/Plugins/LeapCSharp.NET3.5.dll</HintPath>
</Reference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->

</Project>
13 changes: 13 additions & 0 deletions Assembly-CSharp.csproj
Expand Up @@ -51,6 +51,14 @@
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Assets\Objects\Water\Scripts\Displace.cs" />
<Compile Include="Assets\Objects\Water\Scripts\GerstnerDisplace.cs" />
<Compile Include="Assets\Objects\Water\Scripts\MeshContainer.cs" />
<Compile Include="Assets\Objects\Water\Scripts\PlanarReflection.cs" />
<Compile Include="Assets\Objects\Water\Scripts\SpecularLighting.cs" />
<Compile Include="Assets\Objects\Water\Scripts\Water.cs" />
<Compile Include="Assets\Objects\Water\Scripts\WaterBase.cs" />
<Compile Include="Assets\Objects\Water\Scripts\WaterTile.cs" />
<Compile Include="Assets\Scripts\Destructors\OOSBottomDespawner.cs" />
<Compile Include="Assets\Scripts\Destructors\OutOfScreenDespawner.cs" />
<Compile Include="Assets\Scripts\Destructors\TimedDespawner.cs" />
Expand Down Expand Up @@ -97,6 +105,7 @@
<None Include="Assets\Other\Enter Sansman Font\!license.txt" />
<None Include="Assets\Scripts\ImageEffects\CameraMotionBlurDX11.shader" />
<None Include="Assets\Scripts\ImageEffects\CameraMotionBlur.shader" />
<None Include="Assets\Objects\Water\Shaders\FXWaterPro.shader" />
<Reference Include="UnityEngine.UI">
<HintPath>B:/Unity/Editor/Data/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll</HintPath>
</Reference>
Expand Down Expand Up @@ -125,6 +134,10 @@
<HintPath>B:/Unity/Mayhem/Assets/SDK/LeapMotion/Core/Plugins/LeapCSharp.NET3.5.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="Assembly-CSharp-firstpass.csproj">
<Project>{7F32AB24-E0E8-6554-66C8-AAB8DABB2F87}</Project> <Name>Assembly-CSharp-firstpass</Name> </ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
Binary file modified Assets/Objects/Surfaces/Materials/SandAlbedo.mat
Binary file not shown.
6 changes: 6 additions & 0 deletions Assets/Objects/Water.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions Assets/Objects/Water/Materials.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Assets/Objects/Water/Materials/Water.mat
Binary file not shown.
5 changes: 5 additions & 0 deletions Assets/Objects/Water/Materials/Water.mat.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions Assets/Objects/Water/Models.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Assets/Objects/Water/Models/WaterPlane.fbx
Binary file not shown.
71 changes: 71 additions & 0 deletions Assets/Objects/Water/Models/WaterPlane.fbx.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions Assets/Objects/Water/Scripts.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

36 changes: 36 additions & 0 deletions Assets/Objects/Water/Scripts/Displace.cs
@@ -0,0 +1,36 @@
using System;
using UnityEngine;

namespace UnityStandardAssets.Water
{
[ExecuteInEditMode]
[RequireComponent(typeof(WaterBase))]
public class Displace : MonoBehaviour
{
public void Awake()
{
if (enabled)
{
OnEnable();
}
else
{
OnDisable();
}
}


public void OnEnable()
{
Shader.EnableKeyword("WATER_VERTEX_DISPLACEMENT_ON");
Shader.DisableKeyword("WATER_VERTEX_DISPLACEMENT_OFF");
}


public void OnDisable()
{
Shader.EnableKeyword("WATER_VERTEX_DISPLACEMENT_OFF");
Shader.DisableKeyword("WATER_VERTEX_DISPLACEMENT_ON");
}
}
}
9 changes: 9 additions & 0 deletions Assets/Objects/Water/Scripts/Displace.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions Assets/Objects/Water/Scripts/GerstnerDisplace.cs
@@ -0,0 +1,9 @@
using System;
using UnityEngine;

namespace UnityStandardAssets.Water
{
[ExecuteInEditMode]
[RequireComponent(typeof(WaterBase))]
public class GerstnerDisplace : Displace { }
}
9 changes: 9 additions & 0 deletions Assets/Objects/Water/Scripts/GerstnerDisplace.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

27 changes: 27 additions & 0 deletions Assets/Objects/Water/Scripts/MeshContainer.cs
@@ -0,0 +1,27 @@
using System;
using UnityEngine;

namespace UnityStandardAssets.Water
{
public class MeshContainer
{
public Mesh mesh;
public Vector3[] vertices;
public Vector3[] normals;


public MeshContainer(Mesh m)
{
mesh = m;
vertices = m.vertices;
normals = m.normals;
}


public void Update()
{
mesh.vertices = vertices;
mesh.normals = normals;
}
}
}
9 changes: 9 additions & 0 deletions Assets/Objects/Water/Scripts/MeshContainer.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 412e77b

Please sign in to comment.