celisej567/LibBSP
1
0
Fork 0
mirror of https://github.com/celisej567/LibBSP.git synced 2026-09-17 20:08:55 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/wfowler1/LibBSP

Browse Source
This commit is contained in:
wfowler
2018-10-08 16:52:08 -06:00
parent af76a7b6b2 1617ffe6f0
commit 853831da7a
4 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
LibBSP/Source/Extensions/VertexExtensions.cs
View File

@@ -1,6 +1,6 @@
#if UNITY_2_6 || UNITY_2_6_1 || UNITY_3_0 || UNITY_3_0_0 || UNITY_3_1 || UNITY_3_2 || UNITY_3_3 || UNITY_3_4 || UNITY_3_5 || UNITY_4_0 || UNITY_4_0_1 || UNITY_4_2 || UNITY_4_3 || UNITY_4_5 || UNITY_4_6 || UNITY_5 || UNITY_5_3_OR_NEWER
#define UNITY
#if !(UNITY_4_6 || UNITY_5 || UNITY_5_3_OR_NEWER)
#if !UNITY_5_6_OR_NEWER
#define OLDUNITY
#endif
#endif

2
LibBSP/Source/Structs/BSP/BSP.cs
View File

@@ -1,6 +1,6 @@
#if UNITY_2_6 || UNITY_2_6_1 || UNITY_3_0 || UNITY_3_0_0 || UNITY_3_1 || UNITY_3_2 || UNITY_3_3 || UNITY_3_4 || UNITY_3_5 || UNITY_4_0 || UNITY_4_0_1 || UNITY_4_2 || UNITY_4_3 || UNITY_4_5 || UNITY_4_6 || UNITY_5 || UNITY_5_3_OR_NEWER
#define UNITY
#if !(UNITY_4_6 || UNITY_5 || UNITY_5_3_OR_NEWER)
#if !UNITY_5_6_OR_NEWER
#define OLDUNITY
#endif
#endif

15
LibBSP/Source/Structs/Common/Vertex.cs
View File

@@ -1,7 +1,8 @@
#if UNITY_2_6 || UNITY_2_6_1 || UNITY_3_0 || UNITY_3_0_0 || UNITY_3_1 || UNITY_3_2 || UNITY_3_3 || UNITY_3_4 || UNITY_3_5 || UNITY_4_0 || UNITY_4_0_1 || UNITY_4_2 || UNITY_4_3 || UNITY_4_5 || UNITY_4_6 || UNITY_5 || UNITY_5_3_OR_NEWER
#define UNITY
#if !(UNITY_4_6 || UNITY_5 || UNITY_5_3_OR_NEWER)
// Unity 4.5 had UIVertex but the implementation was incomplete.
#if !UNITY_5_6_OR_NEWER
// UIVertex was introduced in Unity 4.5 but it only had color, position and one UV.
// From 4.6.0 until 5.5.6 it was missing two sets of UVs.
#define OLDUNITY
#endif
#endif
@@ -12,7 +13,7 @@ using System;
namespace LibBSP {
#if UNITY
using Color = UnityEngine.Color;
using Color = UnityEngine.Color32;
using Vector2d = UnityEngine.Vector2;
using Vector3d = UnityEngine.Vector3;
using Vector4d = UnityEngine.Vector4;
@@ -24,17 +25,17 @@ namespace LibBSP {
/// Vertex struct, including fields for normal, tangent and four sets of UVs.
/// </summary>
[Serializable] public struct Vertex {
public Color color;
public Vector3d normal;
public Vector3d position;
public Vector4d tangent;
public Vector3d normal;
public Color color;
public Vector2d uv0;
public Vector2d uv1;
public Vector2d uv2;
public Vector2d uv3;
public Vector4d tangent;
/// <summary>
/// Simple UIVertex with sensible settings.
/// Simple Vertex with sensible settings.
/// </summary>
public static Vertex simpleVert {
get {

2
LibBSP/Source/Structs/MAP/MAPPatch.cs
View File

@@ -1,6 +1,6 @@
#if UNITY_2_6 || UNITY_2_6_1 || UNITY_3_0 || UNITY_3_0_0 || UNITY_3_1 || UNITY_3_2 || UNITY_3_3 || UNITY_3_4 || UNITY_3_5 || UNITY_4_0 || UNITY_4_0_1 || UNITY_4_2 || UNITY_4_3 || UNITY_4_5 || UNITY_4_6 || UNITY_5 || UNITY_5_3_OR_NEWER
#define UNITY
#if !(UNITY_4_6 || UNITY_5 || UNITY_5_3_OR_NEWER)
#if !UNITY_5_6_OR_NEWER
#define OLDUNITY
#endif
#endif