Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
老鱼er
et
提交
c69a8a49
E
et
项目概览
老鱼er
/
et
与 Fork 源项目一致
从无法访问的项目Fork
通知
10
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
E
et
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
c69a8a49
编写于
1月 16, 2019
作者:
T
tanghai
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
整理UnityMath,删掉一些不用的代码
上级
f3f9991e
变更
20
展开全部
显示空白变更内容
内联
并排
Showing
20 changed file
with
356 addition
and
3719 deletion
+356
-3719
Server/Model/Server.Model.csproj
Server/Model/Server.Model.csproj
+0
-12
Unity/Assets/Model/Base/UnityMath/Color32.cs
Unity/Assets/Model/Base/UnityMath/Color32.cs
+0
-248
Unity/Assets/Model/Base/UnityMath/Color32.cs.meta
Unity/Assets/Model/Base/UnityMath/Color32.cs.meta
+0
-11
Unity/Assets/Model/Base/UnityMath/FrameworkResources.cs
Unity/Assets/Model/Base/UnityMath/FrameworkResources.cs
+0
-2527
Unity/Assets/Model/Base/UnityMath/FrameworkResources.cs.meta
Unity/Assets/Model/Base/UnityMath/FrameworkResources.cs.meta
+0
-11
Unity/Assets/Model/Base/UnityMath/MathHelper.cs
Unity/Assets/Model/Base/UnityMath/MathHelper.cs
+0
-212
Unity/Assets/Model/Base/UnityMath/MathHelper.cs.meta
Unity/Assets/Model/Base/UnityMath/MathHelper.cs.meta
+0
-11
Unity/Assets/Model/Base/UnityMath/Matrix3x3.cs
Unity/Assets/Model/Base/UnityMath/Matrix3x3.cs
+3
-8
Unity/Assets/Model/Base/UnityMath/Matrix4x4.cs
Unity/Assets/Model/Base/UnityMath/Matrix4x4.cs
+19
-148
Unity/Assets/Model/Base/UnityMath/PackUtils.cs
Unity/Assets/Model/Base/UnityMath/PackUtils.cs
+0
-72
Unity/Assets/Model/Base/UnityMath/PackUtils.cs.meta
Unity/Assets/Model/Base/UnityMath/PackUtils.cs.meta
+0
-11
Unity/Assets/Model/Base/UnityMath/Quaternion.cs
Unity/Assets/Model/Base/UnityMath/Quaternion.cs
+289
-296
Unity/Assets/Model/Base/UnityMath/Vector2.cs
Unity/Assets/Model/Base/UnityMath/Vector2.cs
+5
-21
Unity/Assets/Model/Base/UnityMath/Vector3.cs
Unity/Assets/Model/Base/UnityMath/Vector3.cs
+18
-82
Unity/Assets/Model/Base/UnityMath/Vector4.cs
Unity/Assets/Model/Base/UnityMath/Vector4.cs
+6
-23
Unity/Unity.Editor.csproj
Unity/Unity.Editor.csproj
+1
-1
Unity/Unity.Hotfix.csproj
Unity/Unity.Hotfix.csproj
+1
-1
Unity/Unity.Model.csproj
Unity/Unity.Model.csproj
+4
-11
Unity/Unity.ThirdParty.csproj
Unity/Unity.ThirdParty.csproj
+4
-7
Unity/Unity.sln
Unity/Unity.sln
+6
-6
未找到文件。
Server/Model/Server.Model.csproj
浏览文件 @
c69a8a49
...
...
@@ -50,27 +50,15 @@
<Compile Include="..\..\Unity\Assets\Model\Base\Object\IDeserializeSystem.cs">
<Link>Base\Base\IDeserializeSystem.cs</Link>
</Compile>
<Compile Include="..\..\Unity\Assets\Model\Base\UnityMath\Color32.cs">
<Link>Base\UnityMath\Color32.cs</Link>
</Compile>
<Compile Include="..\..\Unity\Assets\Model\Base\UnityMath\FrameworkResources.cs">
<Link>Base\UnityMath\FrameworkResources.cs</Link>
</Compile>
<Compile Include="..\..\Unity\Assets\Model\Base\UnityMath\Mathf.cs">
<Link>Base\UnityMath\Mathf.cs</Link>
</Compile>
<Compile Include="..\..\Unity\Assets\Model\Base\UnityMath\MathHelper.cs">
<Link>Base\UnityMath\MathHelper.cs</Link>
</Compile>
<Compile Include="..\..\Unity\Assets\Model\Base\UnityMath\Matrix3x3.cs">
<Link>Base\UnityMath\Matrix3x3.cs</Link>
</Compile>
<Compile Include="..\..\Unity\Assets\Model\Base\UnityMath\Matrix4x4.cs">
<Link>Base\UnityMath\Matrix4x4.cs</Link>
</Compile>
<Compile Include="..\..\Unity\Assets\Model\Base\UnityMath\PackUtils.cs">
<Link>Base\UnityMath\PackUtils.cs</Link>
</Compile>
<Compile Include="..\..\Unity\Assets\Model\Base\UnityMath\Quaternion.cs">
<Link>Base\UnityMath\Quaternion.cs</Link>
</Compile>
...
...
Unity/Assets/Model/Base/UnityMath/Color32.cs
已删除
100644 → 0
浏览文件 @
f3f9991e
using
System
;
using
System.Globalization
;
namespace
PF
{
[
Serializable
]
public
struct
Color32
:
IEquatable
<
Color32
>
{
private
uint
packedValue
;
internal
Color32
(
uint
packedValue
)
{
this
.
packedValue
=
packedValue
;
}
public
Color32
(
int
r
,
int
g
,
int
b
,
int
a
)
{
if
(((
r
|
g
|
b
|
a
)
&
-
256
)
!=
0
)
{
r
=
Color32
.
ClampToByte32
(
r
);
g
=
Color32
.
ClampToByte32
(
g
);
b
=
Color32
.
ClampToByte32
(
b
);
a
=
Color32
.
ClampToByte32
(
a
);
}
g
<<=
8
;
b
<<=
16
;
a
<<=
24
;
this
.
packedValue
=
(
uint
)
(
r
|
g
|
b
|
a
);
}
public
byte
R
{
get
{
return
(
byte
)
this
.
packedValue
;
}
set
{
this
.
packedValue
=
this
.
packedValue
&
4294967040U
|
(
uint
)
value
;
}
}
public
byte
G
{
get
{
return
(
byte
)
(
this
.
packedValue
>>
8
);
}
set
{
this
.
packedValue
=
(
uint
)
((
int
)
this
.
packedValue
&
-
65281
|
(
int
)
value
<<
8
);
}
}
public
byte
B
{
get
{
return
(
byte
)
(
this
.
packedValue
>>
16
);
}
set
{
this
.
packedValue
=
(
uint
)
((
int
)
this
.
packedValue
&
-
16711681
|
(
int
)
value
<<
16
);
}
}
public
byte
A
{
get
{
return
(
byte
)
(
this
.
packedValue
>>
24
);
}
set
{
this
.
packedValue
=
(
uint
)
((
int
)
this
.
packedValue
&
16777215
|
(
int
)
value
<<
24
);
}
}
public
uint
PackedValue
{
get
{
return
this
.
packedValue
;
}
set
{
this
.
packedValue
=
value
;
}
}
public
static
Color32
Lerp
(
Color32
value1
,
Color32
value2
,
float
amount
)
{
uint
packedValue1
=
value1
.
packedValue
;
uint
packedValue2
=
value2
.
packedValue
;
int
num1
=
(
int
)
(
byte
)
packedValue1
;
int
num2
=
(
int
)
(
byte
)
(
packedValue1
>>
8
);
int
num3
=
(
int
)
(
byte
)
(
packedValue1
>>
16
);
int
num4
=
(
int
)
(
byte
)
(
packedValue1
>>
24
);
int
num5
=
(
int
)
(
byte
)
packedValue2
;
int
num6
=
(
int
)
(
byte
)
(
packedValue2
>>
8
);
int
num7
=
(
int
)
(
byte
)
(
packedValue2
>>
16
);
int
num8
=
(
int
)
(
byte
)
(
packedValue2
>>
24
);
int
num9
=
(
int
)
PackUtils
.
PackUNorm
(
65536f
,
amount
);
int
num10
=
num1
+
((
num5
-
num1
)
*
num9
>>
16
);
int
num11
=
num2
+
((
num6
-
num2
)
*
num9
>>
16
);
int
num12
=
num3
+
((
num7
-
num3
)
*
num9
>>
16
);
int
num13
=
num4
+
((
num8
-
num4
)
*
num9
>>
16
);
Color32
color32
;
color32
.
packedValue
=
(
uint
)
(
num10
|
num11
<<
8
|
num12
<<
16
|
num13
<<
24
);
return
color32
;
}
public
static
Color32
Multiply
(
Color32
value
,
float
scale
)
{
uint
packedValue
=
value
.
packedValue
;
uint
num1
=
(
uint
)
(
byte
)
packedValue
;
uint
num2
=
(
uint
)
(
byte
)
(
packedValue
>>
8
);
uint
num3
=
(
uint
)
(
byte
)
(
packedValue
>>
16
);
uint
num4
=
(
uint
)
(
byte
)
(
packedValue
>>
24
);
scale
*=
65536f
;
uint
num5
=
(
double
)
scale
>=
0.0
?
((
double
)
scale
<=
16777220.0
?
(
uint
)
scale
:
16777215U
)
:
0U
;
uint
num6
=
num1
*
num5
>>
16
;
uint
num7
=
num2
*
num5
>>
16
;
uint
num8
=
num3
*
num5
>>
16
;
uint
num9
=
num4
*
num5
>>
16
;
if
(
num6
>
(
uint
)
byte
.
MaxValue
)
num6
=
(
uint
)
byte
.
MaxValue
;
if
(
num7
>
(
uint
)
byte
.
MaxValue
)
num7
=
(
uint
)
byte
.
MaxValue
;
if
(
num8
>
(
uint
)
byte
.
MaxValue
)
num8
=
(
uint
)
byte
.
MaxValue
;
if
(
num9
>
(
uint
)
byte
.
MaxValue
)
num9
=
(
uint
)
byte
.
MaxValue
;
Color32
color32
;
color32
.
packedValue
=
(
uint
)
((
int
)
num6
|
(
int
)
num7
<<
8
|
(
int
)
num8
<<
16
|
(
int
)
num9
<<
24
);
return
color32
;
}
public
static
Color32
operator
*(
Color32
value
,
float
scale
)
{
uint
packedValue
=
value
.
packedValue
;
uint
num1
=
(
uint
)
(
byte
)
packedValue
;
uint
num2
=
(
uint
)
(
byte
)
(
packedValue
>>
8
);
uint
num3
=
(
uint
)
(
byte
)
(
packedValue
>>
16
);
uint
num4
=
(
uint
)
(
byte
)
(
packedValue
>>
24
);
scale
*=
65536f
;
uint
num5
=
(
double
)
scale
>=
0.0
?
((
double
)
scale
<=
16777220.0
?
(
uint
)
scale
:
16777215U
)
:
0U
;
uint
num6
=
num1
*
num5
>>
16
;
uint
num7
=
num2
*
num5
>>
16
;
uint
num8
=
num3
*
num5
>>
16
;
uint
num9
=
num4
*
num5
>>
16
;
if
(
num6
>
(
uint
)
byte
.
MaxValue
)
num6
=
(
uint
)
byte
.
MaxValue
;
if
(
num7
>
(
uint
)
byte
.
MaxValue
)
num7
=
(
uint
)
byte
.
MaxValue
;
if
(
num8
>
(
uint
)
byte
.
MaxValue
)
num8
=
(
uint
)
byte
.
MaxValue
;
if
(
num9
>
(
uint
)
byte
.
MaxValue
)
num9
=
(
uint
)
byte
.
MaxValue
;
Color32
color32
;
color32
.
packedValue
=
(
uint
)
((
int
)
num6
|
(
int
)
num7
<<
8
|
(
int
)
num8
<<
16
|
(
int
)
num9
<<
24
);
return
color32
;
}
public
override
string
ToString
()
{
return
string
.
Format
((
IFormatProvider
)
CultureInfo
.
CurrentCulture
,
"{R:{0} G:{1} B:{2} A:{3}}"
,
(
object
)
this
.
R
,
(
object
)
this
.
G
,
(
object
)
this
.
B
,
(
object
)
this
.
A
);
}
public
override
int
GetHashCode
()
{
return
this
.
packedValue
.
GetHashCode
();
}
public
override
bool
Equals
(
object
obj
)
{
if
(
obj
is
Color32
)
return
this
.
Equals
((
Color32
)
obj
);
return
false
;
}
public
bool
Equals
(
Color32
other
)
{
return
this
.
packedValue
.
Equals
(
other
.
packedValue
);
}
public
static
bool
operator
==(
Color32
a
,
Color32
b
)
{
return
a
.
Equals
(
b
);
}
public
static
bool
operator
!=(
Color32
a
,
Color32
b
)
{
return
!
a
.
Equals
(
b
);
}
public
static
Color32
Black
{
get
{
return
new
Color32
(
4278190080U
);
}
}
public
static
Color32
Blue
{
get
{
return
new
Color32
(
4294901760U
);
}
}
public
static
Color32
Green
{
get
{
return
new
Color32
(
4278222848U
);
}
}
public
static
Color32
Red
{
get
{
return
new
Color32
(
4278190335U
);
}
}
public
static
Color32
White
{
get
{
return
new
Color32
(
uint
.
MaxValue
);
}
}
private
static
int
ClampToByte32
(
int
value
)
{
if
(
value
<
0
)
return
0
;
if
(
value
>
(
int
)
byte
.
MaxValue
)
return
(
int
)
byte
.
MaxValue
;
return
value
;
}
}
}
\ No newline at end of file
Unity/Assets/Model/Base/UnityMath/Color32.cs.meta
已删除
100644 → 0
浏览文件 @
f3f9991e
fileFormatVersion: 2
guid: 04df534720a596d42a88c0e101f87038
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Unity/Assets/Model/Base/UnityMath/FrameworkResources.cs
已删除
100644 → 0
浏览文件 @
f3f9991e
此差异已折叠。
点击以展开。
Unity/Assets/Model/Base/UnityMath/FrameworkResources.cs.meta
已删除
100644 → 0
浏览文件 @
f3f9991e
fileFormatVersion: 2
guid: 4e7c8cf8067465c499daed0296f59fc3
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Unity/Assets/Model/Base/UnityMath/MathHelper.cs
已删除
100644 → 0
浏览文件 @
f3f9991e
using
System
;
namespace
PF
{
public
static
class
MathHelper
{
public
const
float
E
=
2.718282f
;
public
const
float
Log10E
=
0.4342945f
;
public
const
float
Log2E
=
1.442695f
;
public
const
float
Pi
=
3.141593f
;
public
const
float
PiOver2
=
1.570796f
;
public
const
float
PiOver4
=
0.7853982f
;
public
const
float
TwoPi
=
6.283185f
;
public
const
float
Deg2Rad
=
0.01745329f
;
public
const
float
Rad2Deg
=
57.29578f
;
public
const
float
Epsilon
=
1.401298E-45f
;
public
const
float
Infinity
=
float
.
PositiveInfinity
;
public
const
float
NegativeInfinity
=
float
.
NegativeInfinity
;
public
static
float
Clamp
(
float
value
,
float
min
,
float
max
)
{
value
=
(
double
)
value
>
(
double
)
max
?
max
:
value
;
value
=
(
double
)
value
<
(
double
)
min
?
min
:
value
;
return
value
;
}
public
static
int
Clamp
(
int
value
,
int
min
,
int
max
)
{
value
=
value
>
max
?
max
:
value
;
value
=
value
<
min
?
min
:
value
;
return
value
;
}
public
static
float
Hermite
(
float
value1
,
float
tangent1
,
float
value2
,
float
tangent2
,
float
amount
)
{
float
num1
=
amount
;
float
num2
=
num1
*
num1
;
float
num3
=
num1
*
num2
;
float
num4
=
(
float
)
(
2.0
*
(
double
)
num3
-
3.0
*
(
double
)
num2
+
1.0
);
float
num5
=
(
float
)
(-
2.0
*
(
double
)
num3
+
3.0
*
(
double
)
num2
);
float
num6
=
num3
-
2f
*
num2
+
num1
;
float
num7
=
num3
-
num2
;
return
(
float
)
((
double
)
value1
*
(
double
)
num4
+
(
double
)
value2
*
(
double
)
num5
+
(
double
)
tangent1
*
(
double
)
num6
+
(
double
)
tangent2
*
(
double
)
num7
);
}
public
static
float
Lerp
(
float
value1
,
float
value2
,
float
amount
)
{
return
value1
+
(
value2
-
value1
)
*
amount
;
}
public
static
float
Max
(
float
a
,
float
b
)
{
if
((
double
)
a
>
(
double
)
b
)
return
a
;
return
b
;
}
public
static
float
Min
(
float
a
,
float
b
)
{
if
((
double
)
a
<
(
double
)
b
)
return
a
;
return
b
;
}
public
static
int
Max
(
int
a
,
int
b
)
{
if
(
a
>
b
)
return
a
;
return
b
;
}
public
static
int
Min
(
int
a
,
int
b
)
{
if
(
a
<
b
)
return
a
;
return
b
;
}
public
static
float
SmoothStep
(
float
value1
,
float
value2
,
float
amount
)
{
float
num
=
MathHelper
.
Clamp
(
amount
,
0.0f
,
1f
);
return
MathHelper
.
Lerp
(
value1
,
value2
,
(
float
)
((
double
)
num
*
(
double
)
num
*
(
3.0
-
2.0
*
(
double
)
num
)));
}
public
static
float
RadiansToDegrees
(
float
radians
)
{
return
radians
*
57.29578f
;
}
public
static
float
DegreesToRadians
(
float
degrees
)
{
return
degrees
*
((
float
)
Math
.
PI
/
180f
);
}
public
static
float
Sin
(
float
f
)
{
return
(
float
)
Math
.
Sin
((
double
)
f
);
}
public
static
float
Cos
(
float
f
)
{
return
(
float
)
Math
.
Cos
((
double
)
f
);
}
public
static
float
Tan
(
float
f
)
{
return
(
float
)
Math
.
Tan
((
double
)
f
);
}
public
static
float
ASin
(
float
f
)
{
return
(
float
)
Math
.
Asin
((
double
)
f
);
}
public
static
float
ACos
(
float
f
)
{
return
(
float
)
Math
.
Acos
((
double
)
f
);
}
public
static
float
ATan
(
float
f
)
{
return
(
float
)
Math
.
Atan
((
double
)
f
);
}
public
static
float
ATan2
(
float
a
,
float
b
)
{
return
(
float
)
Math
.
Atan2
((
double
)
a
,
(
double
)
b
);
}
public
static
float
Sqrt
(
float
f
)
{
return
(
float
)
Math
.
Sqrt
((
double
)
f
);
}
public
static
float
Abs
(
float
f
)
{
return
Math
.
Abs
(
f
);
}
public
static
int
Abs
(
int
value
)
{
return
Math
.
Abs
(
value
);
}
public
static
float
Pow
(
float
fBase
,
float
fExponent
)
{
return
(
float
)
Math
.
Pow
((
double
)
fBase
,
(
double
)
fExponent
);
}
public
static
float
Exp
(
float
power
)
{
return
(
float
)
Math
.
Exp
((
double
)
power
);
}
public
static
float
Log
(
float
f
)
{
return
(
float
)
Math
.
Log
((
double
)
f
);
}
public
static
float
Log10
(
float
f
)
{
return
(
float
)
Math
.
Log10
((
double
)
f
);
}
public
static
float
Ceil
(
float
f
)
{
return
(
float
)
Math
.
Ceiling
((
double
)
f
);
}
public
static
float
Floor
(
float
f
)
{
return
(
float
)
Math
.
Floor
((
double
)
f
);
}
public
static
float
Round
(
float
f
)
{
return
(
float
)
Math
.
Round
((
double
)
f
);
}
public
static
int
ICeil
(
float
f
)
{
return
(
int
)
Math
.
Ceiling
((
double
)
f
);
}
public
static
int
IFloor
(
float
f
)
{
return
(
int
)
Math
.
Floor
((
double
)
f
);
}
public
static
int
IRound
(
float
f
)
{
return
(
int
)
Math
.
Round
((
double
)
f
);
}
public
static
bool
IsPowerOfTwo
(
int
value
)
{
return
(
value
&
value
-
1
)
==
0
;
}
public
static
int
NextPowerOfTwo
(
int
v
)
{
--
v
;
v
|=
v
>>
16
;
v
|=
v
>>
8
;
v
|=
v
>>
4
;
v
|=
v
>>
2
;
v
|=
v
>>
1
;
return
v
+
1
;
}
}
}
\ No newline at end of file
Unity/Assets/Model/Base/UnityMath/MathHelper.cs.meta
已删除
100644 → 0
浏览文件 @
f3f9991e
fileFormatVersion: 2
guid: cc8f8adbabab6af4aa9a2adcce2ad471
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Unity/Assets/Model/Base/UnityMath/Matrix3x3.cs
浏览文件 @
c69a8a49
...
...
@@ -7,6 +7,8 @@ namespace PF
{
public
struct
Matrix3x3
{
public
static
readonly
Matrix3x3
identity
=
new
Matrix3x3
(
1
,
0
,
0
,
0
,
1
,
0
,
0
,
0
,
1
);
public
float
[]
Data
;
public
Matrix3x3
(
float
m0
,
float
m1
,
float
m2
,
float
m3
,
float
m4
,
float
m5
,
float
m6
,
float
m7
,
float
m8
)
...
...
@@ -17,13 +19,6 @@ namespace PF
Data
[
2
]
=
m2
;
Data
[
5
]
=
m5
;
Data
[
8
]
=
m8
;
}
public
static
Matrix3x3
identity
{
get
{
return
new
Matrix3x3
(
1
,
0
,
0
,
0
,
1
,
0
,
0
,
0
,
1
);
}
}
public
void
SetZero
()
{
Data
[
0
]
=
0f
;
Data
[
3
]
=
0f
;
Data
[
6
]
=
0f
;
...
...
Unity/Assets/Model/Base/UnityMath/Matrix4x4.cs
浏览文件 @
c69a8a49
...
...
@@ -6,7 +6,7 @@ namespace PF
[
Serializable
]
public
struct
Matrix4x4
:
IEquatable
<
Matrix4x4
>
{
p
rivate
static
readonly
Matrix4x4
_
identity
=
new
Matrix4x4
(
1f
,
0.0f
,
0.0f
,
0.0f
,
0.0f
,
1f
,
0.0f
,
0.0f
,
0.0f
,
0.0f
,
1f
,
0.0f
,
0.0f
,
0.0f
,
0.0f
,
1f
);
p
ublic
static
readonly
Matrix4x4
identity
=
new
Matrix4x4
(
1f
,
0.0f
,
0.0f
,
0.0f
,
0.0f
,
1f
,
0.0f
,
0.0f
,
0.0f
,
0.0f
,
1f
,
0.0f
,
0.0f
,
0.0f
,
0.0f
,
1f
);
public
float
m00
;
public
float
m01
;
public
float
m02
;
...
...
@@ -24,14 +24,6 @@ namespace PF
public
float
m32
;
public
float
m33
;
public
static
Matrix4x4
identity
{
get
{
return
Matrix4x4
.
_identity
;
}
}
public
bool
isIdentity
{
get
...
...
@@ -360,127 +352,6 @@ namespace PF
matrix
.
m33
=
1f
;
}
public
static
Matrix4x4
CreatePerspectiveFieldOfView
(
float
fieldOfView
,
float
aspectRatio
,
float
nearPlaneDistance
,
float
farPlaneDistance
)
{
if
((
double
)
fieldOfView
<=
0.0
||
(
double
)
fieldOfView
>=
3.14159297943115
)
throw
new
ArgumentOutOfRangeException
(
nameof
(
fieldOfView
),
string
.
Format
((
IFormatProvider
)
CultureInfo
.
CurrentCulture
,
FrameworkResources
.
OutRangeFieldOfView
,
new
object
[
1
]
{
(
object
)
nameof
(
fieldOfView
)
}));
if
((
double
)
nearPlaneDistance
<=
0.0
)
throw
new
ArgumentOutOfRangeException
(
nameof
(
nearPlaneDistance
),
string
.
Format
((
IFormatProvider
)
CultureInfo
.
CurrentCulture
,
FrameworkResources
.
NegativePlaneDistance
,
new
object
[
1
]
{
(
object
)
nameof
(
nearPlaneDistance
)
}));
if
((
double
)
farPlaneDistance
<=
0.0
)
throw
new
ArgumentOutOfRangeException
(
nameof
(
farPlaneDistance
),
string
.
Format
((
IFormatProvider
)
CultureInfo
.
CurrentCulture
,
FrameworkResources
.
NegativePlaneDistance
,
new
object
[
1
]
{
(
object
)
nameof
(
farPlaneDistance
)
}));
if
((
double
)
nearPlaneDistance
>=
(
double
)
farPlaneDistance
)
throw
new
ArgumentOutOfRangeException
(
nameof
(
nearPlaneDistance
),
FrameworkResources
.
OppositePlanes
);
float
num1
=
1f
/
(
float
)
Math
.
Tan
((
double
)
fieldOfView
*
0.5
);
float
num2
=
num1
/
aspectRatio
;
Matrix4x4
matrix44
;
matrix44
.
m00
=
num2
;
matrix44
.
m10
=
matrix44
.
m20
=
matrix44
.
m30
=
0.0f
;
matrix44
.
m11
=
num1
;
matrix44
.
m01
=
matrix44
.
m21
=
matrix44
.
m31
=
0.0f
;
matrix44
.
m02
=
matrix44
.
m12
=
0.0f
;
matrix44
.
m22
=
farPlaneDistance
/
(
nearPlaneDistance
-
farPlaneDistance
);
matrix44
.
m32
=
-
1f
;
matrix44
.
m03
=
matrix44
.
m13
=
matrix44
.
m33
=
0.0f
;
matrix44
.
m23
=
(
float
)
((
double
)
nearPlaneDistance
*
(
double
)
farPlaneDistance
/
((
double
)
nearPlaneDistance
-
(
double
)
farPlaneDistance
));
return
matrix44
;
}
public
static
void
CreatePerspectiveFieldOfView
(
float
fieldOfView
,
float
aspectRatio
,
float
nearPlaneDistance
,
float
farPlaneDistance
,
out
Matrix4x4
matrix
)
{
if
((
double
)
fieldOfView
<=
0.0
||
(
double
)
fieldOfView
>=
3.14159297943115
)
throw
new
ArgumentOutOfRangeException
(
nameof
(
fieldOfView
),
string
.
Format
((
IFormatProvider
)
CultureInfo
.
CurrentCulture
,
FrameworkResources
.
OutRangeFieldOfView
,
new
object
[
1
]
{
(
object
)
nameof
(
fieldOfView
)
}));
if
((
double
)
nearPlaneDistance
<=
0.0
)
throw
new
ArgumentOutOfRangeException
(
nameof
(
nearPlaneDistance
),
string
.
Format
((
IFormatProvider
)
CultureInfo
.
CurrentCulture
,
FrameworkResources
.
NegativePlaneDistance
,
new
object
[
1
]
{
(
object
)
nameof
(
nearPlaneDistance
)
}));
if
((
double
)
farPlaneDistance
<=
0.0
)
throw
new
ArgumentOutOfRangeException
(
nameof
(
farPlaneDistance
),
string
.
Format
((
IFormatProvider
)
CultureInfo
.
CurrentCulture
,
FrameworkResources
.
NegativePlaneDistance
,
new
object
[
1
]
{
(
object
)
nameof
(
farPlaneDistance
)
}));
if
((
double
)
nearPlaneDistance
>=
(
double
)
farPlaneDistance
)
throw
new
ArgumentOutOfRangeException
(
nameof
(
nearPlaneDistance
),
FrameworkResources
.
OppositePlanes
);
float
num1
=
1f
/
(
float
)
Math
.
Tan
((
double
)
fieldOfView
*
0.5
);
float
num2
=
num1
/
aspectRatio
;
matrix
.
m00
=
num2
;
matrix
.
m10
=
matrix
.
m20
=
matrix
.
m30
=
0.0f
;
matrix
.
m11
=
num1
;
matrix
.
m01
=
matrix
.
m21
=
matrix
.
m31
=
0.0f
;
matrix
.
m02
=
matrix
.
m12
=
0.0f
;
matrix
.
m22
=
farPlaneDistance
/
(
nearPlaneDistance
-
farPlaneDistance
);
matrix
.
m32
=
-
1f
;
matrix
.
m03
=
matrix
.
m13
=
matrix
.
m33
=
0.0f
;
matrix
.
m23
=
(
float
)
((
double
)
nearPlaneDistance
*
(
double
)
farPlaneDistance
/
((
double
)
nearPlaneDistance
-
(
double
)
farPlaneDistance
));
}
public
static
Matrix4x4
CreatePerspective
(
float
width
,
float
height
,
float
nearPlaneDistance
,
float
farPlaneDistance
)
{
if
((
double
)
nearPlaneDistance
<=
0.0
)
throw
new
ArgumentOutOfRangeException
(
nameof
(
nearPlaneDistance
),
string
.
Format
((
IFormatProvider
)
CultureInfo
.
CurrentCulture
,
FrameworkResources
.
NegativePlaneDistance
,
new
object
[
1
]
{
(
object
)
nameof
(
nearPlaneDistance
)
}));
if
((
double
)
farPlaneDistance
<=
0.0
)
throw
new
ArgumentOutOfRangeException
(
nameof
(
farPlaneDistance
),
string
.
Format
((
IFormatProvider
)
CultureInfo
.
CurrentCulture
,
FrameworkResources
.
NegativePlaneDistance
,
new
object
[
1
]
{
(
object
)
nameof
(
farPlaneDistance
)
}));
if
((
double
)
nearPlaneDistance
>=
(
double
)
farPlaneDistance
)
throw
new
ArgumentOutOfRangeException
(
nameof
(
nearPlaneDistance
),
FrameworkResources
.
OppositePlanes
);
Matrix4x4
matrix44
;
matrix44
.
m00
=
2f
*
nearPlaneDistance
/
width
;
matrix44
.
m10
=
matrix44
.
m20
=
matrix44
.
m30
=
0.0f
;
matrix44
.
m11
=
2f
*
nearPlaneDistance
/
height
;
matrix44
.
m01
=
matrix44
.
m21
=
matrix44
.
m31
=
0.0f
;
matrix44
.
m22
=
farPlaneDistance
/
(
nearPlaneDistance
-
farPlaneDistance
);
matrix44
.
m02
=
matrix44
.
m12
=
0.0f
;
matrix44
.
m32
=
-
1f
;
matrix44
.
m03
=
matrix44
.
m13
=
matrix44
.
m33
=
0.0f
;
matrix44
.
m23
=
(
float
)
((
double
)
nearPlaneDistance
*
(
double
)
farPlaneDistance
/
((
double
)
nearPlaneDistance
-
(
double
)
farPlaneDistance
));
return
matrix44
;
}
public
static
void
CreatePerspective
(
float
width
,
float
height
,
float
nearPlaneDistance
,
float
farPlaneDistance
,
out
Matrix4x4
matrix
)
{
if
((
double
)
nearPlaneDistance
<=
0.0
)
throw
new
ArgumentOutOfRangeException
(
nameof
(
nearPlaneDistance
),
string
.
Format
((
IFormatProvider
)
CultureInfo
.
CurrentCulture
,
FrameworkResources
.
NegativePlaneDistance
,
new
object
[
1
]
{
(
object
)
nameof
(
nearPlaneDistance
)
}));
if
((
double
)
farPlaneDistance
<=
0.0
)
throw
new
ArgumentOutOfRangeException
(
nameof
(
farPlaneDistance
),
string
.
Format
((
IFormatProvider
)
CultureInfo
.
CurrentCulture
,
FrameworkResources
.
NegativePlaneDistance
,
new
object
[
1
]
{
(
object
)
nameof
(
farPlaneDistance
)
}));
if
((
double
)
nearPlaneDistance
>=
(
double
)
farPlaneDistance
)
throw
new
ArgumentOutOfRangeException
(
nameof
(
nearPlaneDistance
),
FrameworkResources
.
OppositePlanes
);
matrix
.
m00
=
2f
*
nearPlaneDistance
/
width
;
matrix
.
m10
=
matrix
.
m20
=
matrix
.
m30
=
0.0f
;
matrix
.
m11
=
2f
*
nearPlaneDistance
/
height
;
matrix
.
m01
=
matrix
.
m21
=
matrix
.
m31
=
0.0f
;
matrix
.
m22
=
farPlaneDistance
/
(
nearPlaneDistance
-
farPlaneDistance
);
matrix
.
m02
=
matrix
.
m12
=
0.0f
;
matrix
.
m32
=
-
1f
;
matrix
.
m03
=
matrix
.
m13
=
matrix
.
m33
=
0.0f
;
matrix
.
m23
=
(
float
)
((
double
)
nearPlaneDistance
*
(
double
)
farPlaneDistance
/
((
double
)
nearPlaneDistance
-
(
double
)
farPlaneDistance
));
}
public
static
Matrix4x4
CreateOrthographic
(
float
width
,
float
height
,
float
zNearPlane
,
float
zFarPlane
)
{
Matrix4x4
matrix44
;
...
...
@@ -559,15 +430,15 @@ namespace PF
public
static
Matrix4x4
CreateFromQuaternion
(
Quaternion
quaternion
)
{
float
num1
=
quaternion
.
X
*
quaternion
.
X
;
float
num2
=
quaternion
.
Y
*
quaternion
.
Y
;
float
num3
=
quaternion
.
Z
*
quaternion
.
Z
;
float
num4
=
quaternion
.
X
*
quaternion
.
Y
;
float
num5
=
quaternion
.
Z
*
quaternion
.
W
;
float
num6
=
quaternion
.
Z
*
quaternion
.
X
;
float
num7
=
quaternion
.
Y
*
quaternion
.
W
;
float
num8
=
quaternion
.
Y
*
quaternion
.
Z
;
float
num9
=
quaternion
.
X
*
quaternion
.
W
;
float
num1
=
quaternion
.
x
*
quaternion
.
x
;
float
num2
=
quaternion
.
y
*
quaternion
.
y
;
float
num3
=
quaternion
.
z
*
quaternion
.
z
;
float
num4
=
quaternion
.
x
*
quaternion
.
y
;
float
num5
=
quaternion
.
z
*
quaternion
.
w
;
float
num6
=
quaternion
.
z
*
quaternion
.
x
;
float
num7
=
quaternion
.
y
*
quaternion
.
w
;
float
num8
=
quaternion
.
y
*
quaternion
.
z
;
float
num9
=
quaternion
.
x
*
quaternion
.
w
;
Matrix4x4
matrix44
;
matrix44
.
m00
=
(
float
)
(
1.0
-
2.0
*
((
double
)
num2
+
(
double
)
num3
));
matrix44
.
m10
=
(
float
)
(
2.0
*
((
double
)
num4
+
(
double
)
num5
));
...
...
@@ -590,15 +461,15 @@ namespace PF
public
static
void
CreateFromQuaternion
(
ref
Quaternion
quaternion
,
out
Matrix4x4
matrix
)
{
float
num1
=
quaternion
.
X
*
quaternion
.
X
;
float
num2
=
quaternion
.
Y
*
quaternion
.
Y
;
float
num3
=
quaternion
.
Z
*
quaternion
.
Z
;
float
num4
=
quaternion
.
X
*
quaternion
.
Y
;
float
num5
=
quaternion
.
Z
*
quaternion
.
W
;
float
num6
=
quaternion
.
Z
*
quaternion
.
X
;
float
num7
=
quaternion
.
Y
*
quaternion
.
W
;
float
num8
=
quaternion
.
Y
*
quaternion
.
Z
;
float
num9
=
quaternion
.
X
*
quaternion
.
W
;
float
num1
=
quaternion
.
x
*
quaternion
.
x
;
float
num2
=
quaternion
.
y
*
quaternion
.
y
;
float
num3
=
quaternion
.
z
*
quaternion
.
z
;
float
num4
=
quaternion
.
x
*
quaternion
.
y
;
float
num5
=
quaternion
.
z
*
quaternion
.
w
;
float
num6
=
quaternion
.
z
*
quaternion
.
x
;
float
num7
=
quaternion
.
y
*
quaternion
.
w
;
float
num8
=
quaternion
.
y
*
quaternion
.
z
;
float
num9
=
quaternion
.
x
*
quaternion
.
w
;
matrix
.
m00
=
(
float
)
(
1.0
-
2.0
*
((
double
)
num2
+
(
double
)
num3
));
matrix
.
m10
=
(
float
)
(
2.0
*
((
double
)
num4
+
(
double
)
num5
));
matrix
.
m20
=
(
float
)
(
2.0
*
((
double
)
num6
-
(
double
)
num7
));
...
...
Unity/Assets/Model/Base/UnityMath/PackUtils.cs
已删除
100644 → 0
浏览文件 @
f3f9991e
using
System
;
namespace
PF
{
internal
static
class
PackUtils
{
private
static
double
ClampAndRound
(
float
value
,
float
min
,
float
max
)
{
if
(
float
.
IsNaN
(
value
))
return
0.0
;
if
(
float
.
IsInfinity
(
value
))
{
if
(!
float
.
IsNegativeInfinity
(
value
))
return
(
double
)
max
;
return
(
double
)
min
;
}
if
((
double
)
value
<
(
double
)
min
)
return
(
double
)
min
;
if
((
double
)
value
>
(
double
)
max
)
return
(
double
)
max
;
return
Math
.
Round
((
double
)
value
);
}
public
static
uint
PackSigned
(
uint
bitmask
,
float
value
)
{
float
max
=
(
float
)
(
bitmask
>>
1
);
float
min
=
(
float
)
(-(
double
)
max
-
1.0
);
return
(
uint
)
(
int
)
PackUtils
.
ClampAndRound
(
value
,
min
,
max
)
&
bitmask
;
}
public
static
uint
PackSNorm
(
uint
bitmask
,
float
value
)
{
float
max
=
(
float
)
(
bitmask
>>
1
);
value
*=
max
;
return
(
uint
)
(
int
)
PackUtils
.
ClampAndRound
(
value
,
-
max
,
max
)
&
bitmask
;
}
public
static
uint
PackUNorm
(
float
bitmask
,
float
value
)
{
value
*=
bitmask
;
return
(
uint
)
PackUtils
.
ClampAndRound
(
value
,
0.0f
,
bitmask
);
}
public
static
uint
PackUnsigned
(
float
bitmask
,
float
value
)
{
return
(
uint
)
PackUtils
.
ClampAndRound
(
value
,
0.0f
,
bitmask
);
}
public
static
float
UnpackSNorm
(
uint
bitmask
,
uint
value
)
{
uint
num1
=
bitmask
+
1U
>>
1
;
if
(((
int
)
value
&
(
int
)
num1
)
!=
0
)
{
if
(((
int
)
value
&
(
int
)
bitmask
)
==
(
int
)
num1
)
return
-
1f
;
value
|=
~
bitmask
;
}
else
value
&=
bitmask
;
float
num2
=
(
float
)
(
bitmask
>>
1
);
return
(
float
)
value
/
num2
;
}
public
static
float
UnpackUNorm
(
uint
bitmask
,
uint
value
)
{
value
&=
bitmask
;
return
(
float
)
value
/
(
float
)
bitmask
;
}
}
}
\ No newline at end of file
Unity/Assets/Model/Base/UnityMath/PackUtils.cs.meta
已删除
100644 → 0
浏览文件 @
f3f9991e
fileFormatVersion: 2
guid: 1a2006ae204bdc148b8fbc4478768333
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Unity/Assets/Model/Base/UnityMath/Quaternion.cs
浏览文件 @
c69a8a49
此差异已折叠。
点击以展开。
Unity/Assets/Model/Base/UnityMath/Vector2.cs
浏览文件 @
c69a8a49
...
...
@@ -6,9 +6,9 @@ namespace PF
[
Serializable
]
public
struct
Vector2
:
IEquatable
<
Vector2
>
{
p
rivate
static
readonly
Vector2
_
zero
=
new
Vector2
();
p
rivate
static
readonly
Vector2
_
one
=
new
Vector2
(
1f
,
1f
);
private
const
float
epsilon
=
1E-05f
;
p
ublic
static
readonly
Vector2
zero
=
new
Vector2
();
p
ublic
static
readonly
Vector2
one
=
new
Vector2
(
1f
,
1f
);
public
float
x
;
public
float
y
;
#if !SERVER
...
...
@@ -33,22 +33,6 @@ namespace PF
return
new
Vector3
(
v
.
x
,
v
.
y
,
0.0f
);
}
public
static
Vector2
zero
{
get
{
return
Vector2
.
_zero
;
}
}
public
static
Vector2
one
{
get
{
return
Vector2
.
_one
;
}
}
public
Vector2
(
float
x
,
float
y
)
{
this
.
x
=
x
;
...
...
@@ -344,7 +328,7 @@ namespace PF
to
.
Normalize
();
float
result
;
Vector2
.
Dot
(
ref
from
,
ref
to
,
out
result
);
return
Math
Helper
.
ACos
(
MathHelper
.
Clamp
(
result
,
-
1f
,
1f
))
*
57.29578f
;
return
Math
f
.
Cos
(
Mathf
.
Clamp
(
result
,
-
1f
,
1f
))
*
57.29578f
;
}
public
static
void
Angle
(
ref
Vector2
from
,
ref
Vector2
to
,
out
float
result
)
...
...
@@ -353,7 +337,7 @@ namespace PF
to
.
Normalize
();
float
result1
;
Vector2
.
Dot
(
ref
from
,
ref
to
,
out
result1
);
result
=
Math
Helper
.
ACos
(
MathHelper
.
Clamp
(
result1
,
-
1f
,
1f
))
*
57.29578f
;
result
=
Math
f
.
Cos
(
Mathf
.
Clamp
(
result1
,
-
1f
,
1f
))
*
57.29578f
;
}
public
static
Vector2
Add
(
Vector2
value1
,
Vector2
value2
)
...
...
Unity/Assets/Model/Base/UnityMath/Vector3.cs
浏览文件 @
c69a8a49
...
...
@@ -8,14 +8,14 @@ namespace PF
{
private
const
float
k1OverSqrt2
=
0.7071068f
;
private
const
float
epsilon
=
1E-05f
;
p
rivate
static
readonly
Vector3
_
zero
=
new
Vector3
();
p
rivate
static
readonly
Vector3
_
one
=
new
Vector3
(
1f
,
1f
,
1f
);
p
rivate
static
readonly
Vector3
_
up
=
new
Vector3
(
0.0f
,
1f
,
0.0f
);
p
rivate
static
readonly
Vector3
_
down
=
new
Vector3
(
0.0f
,
-
1f
,
0.0f
);
p
rivate
static
readonly
Vector3
_
right
=
new
Vector3
(
1f
,
0.0f
,
0.0f
);
p
rivate
static
readonly
Vector3
_
left
=
new
Vector3
(-
1f
,
0.0f
,
0.0f
);
p
rivate
static
readonly
Vector3
_
forward
=
new
Vector3
(
0.0f
,
0.0f
,
1f
);
p
rivate
static
readonly
Vector3
_backward
=
new
Vector3
(
0.0f
,
0.0f
,
-
1f
);
p
ublic
static
readonly
Vector3
zero
=
new
Vector3
();
p
ublic
static
readonly
Vector3
one
=
new
Vector3
(
1f
,
1f
,
1f
);
p
ublic
static
readonly
Vector3
up
=
new
Vector3
(
0.0f
,
1f
,
0.0f
);
p
ublic
static
readonly
Vector3
down
=
new
Vector3
(
0.0f
,
-
1f
,
0.0f
);
p
ublic
static
readonly
Vector3
right
=
new
Vector3
(
1f
,
0.0f
,
0.0f
);
p
ublic
static
readonly
Vector3
left
=
new
Vector3
(-
1f
,
0.0f
,
0.0f
);
p
ublic
static
readonly
Vector3
forward
=
new
Vector3
(
0.0f
,
0.0f
,
1f
);
p
ublic
static
readonly
Vector3
back
=
new
Vector3
(
0.0f
,
0.0f
,
-
1f
);
public
float
x
;
public
float
y
;
public
float
z
;
...
...
@@ -31,70 +31,6 @@ namespace PF
}
#endif
public
static
Vector3
zero
{
get
{
return
Vector3
.
_zero
;
}
}
public
static
Vector3
one
{
get
{
return
Vector3
.
_one
;
}
}
public
static
Vector3
up
{
get
{
return
Vector3
.
_up
;
}
}
public
static
Vector3
down
{
get
{
return
Vector3
.
_down
;
}
}
public
static
Vector3
right
{
get
{
return
Vector3
.
_right
;
}
}
public
static
Vector3
left
{
get
{
return
Vector3
.
_left
;
}
}
public
static
Vector3
forward
{
get
{
return
Vector3
.
_forward
;
}
}
public
static
Vector3
back
{
get
{
return
Vector3
.
_backward
;
}
}
public
Vector3
(
float
x
,
float
y
,
float
z
)
{
this
.
x
=
x
;
...
...
@@ -216,7 +152,7 @@ namespace PF
public
void
Normalize
()
{
float
num1
=
(
float
)
((
double
)
this
.
x
*
(
double
)
this
.
x
+
(
double
)
this
.
y
*
(
double
)
this
.
y
+
(
double
)
this
.
z
*
(
double
)
this
.
z
);
if
((
double
)
num1
<
(
double
)
Vector3
.
e
psilon
)
if
((
double
)
num1
<
(
double
)
Mathf
.
E
psilon
)
return
;
float
num2
=
1f
/
(
float
)
Math
.
Sqrt
((
double
)
num1
);
this
.
x
*=
num2
;
...
...
@@ -235,7 +171,7 @@ namespace PF
public
static
Vector3
Normalize
(
Vector3
value
)
{
float
num1
=
(
float
)
((
double
)
value
.
x
*
(
double
)
value
.
x
+
(
double
)
value
.
y
*
(
double
)
value
.
y
+
(
double
)
value
.
z
*
(
double
)
value
.
z
);
if
((
double
)
num1
<
(
double
)
Vector3
.
e
psilon
)
if
((
double
)
num1
<
(
double
)
Mathf
.
E
psilon
)
return
value
;
float
num2
=
1f
/
(
float
)
Math
.
Sqrt
((
double
)
num1
);
Vector3
vector3
;
...
...
@@ -248,7 +184,7 @@ namespace PF
public
static
void
Normalize
(
ref
Vector3
value
,
out
Vector3
result
)
{
float
num1
=
(
float
)
((
double
)
value
.
x
*
(
double
)
value
.
x
+
(
double
)
value
.
y
*
(
double
)
value
.
y
+
(
double
)
value
.
z
*
(
double
)
value
.
z
);
if
((
double
)
num1
<
(
double
)
Vector3
.
e
psilon
)
if
((
double
)
num1
<
(
double
)
Mathf
.
E
psilon
)
{
result
=
value
;
}
...
...
@@ -580,14 +516,14 @@ namespace PF
public
static
void
OrthoNormalize
(
ref
Vector3
normal
,
ref
Vector3
tangent
)
{
float
num1
=
Vector3
.
magnitudeStatic
(
ref
normal
);
if
((
double
)
num1
>
(
double
)
Vector3
.
e
psilon
)
if
((
double
)
num1
>
(
double
)
Mathf
.
E
psilon
)
normal
/=
num1
;
else
normal
=
new
Vector3
(
1f
,
0.0f
,
0.0f
);
float
num2
=
Vector3
.
Dot
(
normal
,
tangent
);
tangent
-=
num2
*
normal
;
float
num3
=
Vector3
.
magnitudeStatic
(
ref
tangent
);
if
((
double
)
num3
<
(
double
)
Vector3
.
e
psilon
)
if
((
double
)
num3
<
(
double
)
Mathf
.
E
psilon
)
tangent
=
Vector3
.
orthoNormalVectorFast
(
ref
normal
);
else
tangent
/=
num3
;
...
...
@@ -596,14 +532,14 @@ namespace PF
public
static
void
OrthoNormalize
(
ref
Vector3
normal
,
ref
Vector3
tangent
,
ref
Vector3
binormal
)
{
float
num1
=
Vector3
.
magnitudeStatic
(
ref
normal
);
if
((
double
)
num1
>
(
double
)
Vector3
.
e
psilon
)
if
((
double
)
num1
>
(
double
)
Mathf
.
E
psilon
)
normal
/=
num1
;
else
normal
=
new
Vector3
(
1f
,
0.0f
,
0.0f
);
float
num2
=
Vector3
.
Dot
(
normal
,
tangent
);
tangent
-=
num2
*
normal
;
float
num3
=
Vector3
.
magnitudeStatic
(
ref
tangent
);
if
((
double
)
num3
>
(
double
)
Vector3
.
e
psilon
)
if
((
double
)
num3
>
(
double
)
Mathf
.
E
psilon
)
tangent
/=
num3
;
else
tangent
=
Vector3
.
orthoNormalVectorFast
(
ref
normal
);
...
...
@@ -611,7 +547,7 @@ namespace PF
float
num5
=
Vector3
.
Dot
(
normal
,
binormal
);
binormal
-=
num5
*
normal
+
num4
*
tangent
;
float
num6
=
Vector3
.
magnitudeStatic
(
ref
binormal
);
if
((
double
)
num6
>
(
double
)
Vector3
.
e
psilon
)
if
((
double
)
num6
>
(
double
)
Mathf
.
E
psilon
)
binormal
/=
num6
;
else
binormal
=
Vector3
.
Cross
(
normal
,
tangent
);
...
...
@@ -633,7 +569,7 @@ namespace PF
to
.
Normalize
();
float
result
;
Vector3
.
Dot
(
ref
from
,
ref
to
,
out
result
);
return
Math
Helper
.
ACos
(
MathHelper
.
Clamp
(
result
,
-
1f
,
1f
))
*
57.29578f
;
return
Math
f
.
Cos
(
Mathf
.
Clamp
(
result
,
-
1f
,
1f
))
*
57.29578f
;
}
public
static
void
Angle
(
ref
Vector3
from
,
ref
Vector3
to
,
out
float
result
)
...
...
@@ -642,7 +578,7 @@ namespace PF
to
.
Normalize
();
float
result1
;
Vector3
.
Dot
(
ref
from
,
ref
to
,
out
result1
);
result
=
Math
Helper
.
ACos
(
MathHelper
.
Clamp
(
result1
,
-
1f
,
1f
))
*
57.29578f
;
result
=
Math
f
.
Cos
(
Mathf
.
Clamp
(
result1
,
-
1f
,
1f
))
*
57.29578f
;
}
public
static
Vector3
operator
-(
Vector3
value
)
...
...
Unity/Assets/Model/Base/UnityMath/Vector4.cs
浏览文件 @
c69a8a49
...
...
@@ -6,30 +6,13 @@ namespace PF
[
Serializable
]
public
struct
Vector4
:
IEquatable
<
Vector4
>
{
private
static
readonly
float
epsilon
=
1E-05f
;
private
static
Vector4
_zero
=
new
Vector4
();
private
static
Vector4
_one
=
new
Vector4
(
1f
,
1f
,
1f
,
1f
);
public
static
readonly
Vector4
zero
=
new
Vector4
();
public
static
readonly
Vector4
one
=
new
Vector4
(
1f
,
1f
,
1f
,
1f
);
public
float
x
;
public
float
y
;
public
float
z
;
public
float
w
;
public
static
Vector4
zero
{
get
{
return
Vector4
.
_zero
;
}
}
public
static
Vector4
one
{
get
{
return
Vector4
.
_one
;
}
}
public
Vector4
(
float
x
,
float
y
,
float
z
,
float
w
)
{
this
.
x
=
x
;
...
...
@@ -168,7 +151,7 @@ namespace PF
{
float
num1
=
(
float
)
((
double
)
this
.
x
*
(
double
)
this
.
x
+
(
double
)
this
.
y
*
(
double
)
this
.
y
+
(
double
)
this
.
z
*
(
double
)
this
.
z
+
(
double
)
this
.
w
*
(
double
)
this
.
w
);
if
((
double
)
num1
<
(
double
)
Vector4
.
e
psilon
)
if
((
double
)
num1
<
(
double
)
Mathf
.
E
psilon
)
return
;
float
num2
=
1f
/
(
float
)
Math
.
Sqrt
((
double
)
num1
);
this
.
x
*=
num2
;
...
...
@@ -181,7 +164,7 @@ namespace PF
{
float
num1
=
(
float
)
((
double
)
vector
.
x
*
(
double
)
vector
.
x
+
(
double
)
vector
.
y
*
(
double
)
vector
.
y
+
(
double
)
vector
.
z
*
(
double
)
vector
.
z
+
(
double
)
vector
.
w
*
(
double
)
vector
.
w
);
if
((
double
)
num1
<
(
double
)
Vector4
.
e
psilon
)
if
((
double
)
num1
<
(
double
)
Mathf
.
E
psilon
)
return
vector
;
float
num2
=
1f
/
(
float
)
Math
.
Sqrt
((
double
)
num1
);
Vector4
vector4
;
...
...
@@ -196,7 +179,7 @@ namespace PF
{
float
num1
=
(
float
)
((
double
)
vector
.
x
*
(
double
)
vector
.
x
+
(
double
)
vector
.
y
*
(
double
)
vector
.
y
+
(
double
)
vector
.
z
*
(
double
)
vector
.
z
+
(
double
)
vector
.
w
*
(
double
)
vector
.
w
);
if
((
double
)
num1
<
(
double
)
Vector4
.
e
psilon
)
if
((
double
)
num1
<
(
double
)
Mathf
.
E
psilon
)
{
result
=
vector
;
}
...
...
Unity/Unity.Editor.csproj
浏览文件 @
c69a8a49
...
...
@@ -23,7 +23,7 @@
<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_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2018_1_OR_NEWER;UNITY_2018_2_OR_NEWER;UNITY_2018_3_OR_NEWER;UNITY_2018_3_0;UNITY_2018_3;UNITY_2018;
PLATFORM_ARCH_64;UNITY_64;UNITY_INCLUDE_TESTS;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITES;ENABLE_GRID;ENABLE_TILEMAP;ENABLE_TERRAIN;ENABLE_TEXTURE_STREAMING;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_EDITOR_HUB;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_TIMELINE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;INCLUDE_DYNAMIC_GI;INCLUDE_GI;ENABLE_MONO_BDWGC;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_VIDEO;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_LOCALIZATION;PLATFORM_STANDALONE_WIN;PLATFORM_STANDALONE;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_OUT_OF_PROCESS_CRASH_HANDLER;ENABLE_EVENT_QUEUE;ENABLE_CLUSTER_SYNC;ENABLE_CLUSTERINPUT;ENABLE_VR;ENABLE_AR;ENABLE_WEBSOCKET_HOST
;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;UNITY_PRO_LICENSE;NET452;ILRuntime;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER
</DefineConstants>
<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_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2018_1_OR_NEWER;UNITY_2018_2_OR_NEWER;UNITY_2018_3_OR_NEWER;UNITY_2018_3_0;UNITY_2018_3;UNITY_2018;
UNITY_INCLUDE_TESTS;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITES;ENABLE_GRID;ENABLE_TILEMAP;ENABLE_TERRAIN;ENABLE_TEXTURE_STREAMING;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_EDITOR_HUB;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_TIMELINE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;INCLUDE_DYNAMIC_GI;INCLUDE_GI;ENABLE_MONO_BDWGC;PLATFORM_SUPPORTS_MONO;INCLUDE_PUBNUB;ENABLE_VIDEO;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_LOCALIZATION;PLATFORM_ANDROID;UNITY_ANDROID;UNITY_ANDROID_API;ENABLE_SUBSTANCE;ENABLE_EGL;ENABLE_NETWORK;ENABLE_RUNTIME_GI;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_EVENT_QUEUE;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_NATIVE_CRASH_REPORTING;PLATFORM_SUPPORTS_ADS_ID;UNITY_CAN_SHOW_SPLASH_SCREEN;ENABLE_VR;ENABLE_AR;UNITY_HAS_GOOGLEVR;UNITY_HAS_TANGO;ENABLE_SPATIALTRACKING;ENABLE_RUNTIME_PERMISSIONS;UNITY_ASTC_ONLY_DECOMPRESS;ENABLE_UNITYADS_RUNTIME;UNITY_UNITYADS_API
;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;UNITY_PRO_LICENSE;NET452;ILRuntime;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER
</DefineConstants>
<ErrorReport>
prompt
</ErrorReport>
<WarningLevel>
4
</WarningLevel>
<NoWarn>
0169
</NoWarn>
...
...
Unity/Unity.Hotfix.csproj
浏览文件 @
c69a8a49
...
...
@@ -23,7 +23,7 @@
<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_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2018_1_OR_NEWER;UNITY_2018_2_OR_NEWER;UNITY_2018_3_OR_NEWER;UNITY_2018_3_0;UNITY_2018_3;UNITY_2018;
PLATFORM_ARCH_64;UNITY_64;UNITY_INCLUDE_TESTS;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITES;ENABLE_GRID;ENABLE_TILEMAP;ENABLE_TERRAIN;ENABLE_TEXTURE_STREAMING;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_EDITOR_HUB;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_TIMELINE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;INCLUDE_DYNAMIC_GI;INCLUDE_GI;ENABLE_MONO_BDWGC;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_VIDEO;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_LOCALIZATION;PLATFORM_STANDALONE_WIN;PLATFORM_STANDALONE;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_OUT_OF_PROCESS_CRASH_HANDLER;ENABLE_EVENT_QUEUE;ENABLE_CLUSTER_SYNC;ENABLE_CLUSTERINPUT;ENABLE_VR;ENABLE_AR;ENABLE_WEBSOCKET_HOST
;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;UNITY_PRO_LICENSE;NET452;ILRuntime;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER
</DefineConstants>
<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_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2018_1_OR_NEWER;UNITY_2018_2_OR_NEWER;UNITY_2018_3_OR_NEWER;UNITY_2018_3_0;UNITY_2018_3;UNITY_2018;
UNITY_INCLUDE_TESTS;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITES;ENABLE_GRID;ENABLE_TILEMAP;ENABLE_TERRAIN;ENABLE_TEXTURE_STREAMING;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_EDITOR_HUB;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_TIMELINE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;INCLUDE_DYNAMIC_GI;INCLUDE_GI;ENABLE_MONO_BDWGC;PLATFORM_SUPPORTS_MONO;INCLUDE_PUBNUB;ENABLE_VIDEO;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_LOCALIZATION;PLATFORM_ANDROID;UNITY_ANDROID;UNITY_ANDROID_API;ENABLE_SUBSTANCE;ENABLE_EGL;ENABLE_NETWORK;ENABLE_RUNTIME_GI;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_EVENT_QUEUE;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_NATIVE_CRASH_REPORTING;PLATFORM_SUPPORTS_ADS_ID;UNITY_CAN_SHOW_SPLASH_SCREEN;ENABLE_VR;ENABLE_AR;UNITY_HAS_GOOGLEVR;UNITY_HAS_TANGO;ENABLE_SPATIALTRACKING;ENABLE_RUNTIME_PERMISSIONS;UNITY_ASTC_ONLY_DECOMPRESS;ENABLE_UNITYADS_RUNTIME;UNITY_UNITYADS_API
;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;UNITY_PRO_LICENSE;NET452;ILRuntime;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER
</DefineConstants>
<ErrorReport>
prompt
</ErrorReport>
<WarningLevel>
4
</WarningLevel>
<NoWarn>
0169
</NoWarn>
...
...
Unity/Unity.Model.csproj
浏览文件 @
c69a8a49
...
...
@@ -23,7 +23,7 @@
<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_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2018_1_OR_NEWER;UNITY_2018_2_OR_NEWER;UNITY_2018_3_OR_NEWER;UNITY_2018_3_0;UNITY_2018_3;UNITY_2018;
PLATFORM_ARCH_64;UNITY_64;UNITY_INCLUDE_TESTS;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITES;ENABLE_GRID;ENABLE_TILEMAP;ENABLE_TERRAIN;ENABLE_TEXTURE_STREAMING;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_EDITOR_HUB;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_TIMELINE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;INCLUDE_DYNAMIC_GI;INCLUDE_GI;ENABLE_MONO_BDWGC;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_VIDEO;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_LOCALIZATION;PLATFORM_STANDALONE_WIN;PLATFORM_STANDALONE;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_OUT_OF_PROCESS_CRASH_HANDLER;ENABLE_EVENT_QUEUE;ENABLE_CLUSTER_SYNC;ENABLE_CLUSTERINPUT;ENABLE_VR;ENABLE_AR;ENABLE_WEBSOCKET_HOST
;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;UNITY_PRO_LICENSE;NET452;ILRuntime;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER
</DefineConstants>
<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_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2018_1_OR_NEWER;UNITY_2018_2_OR_NEWER;UNITY_2018_3_OR_NEWER;UNITY_2018_3_0;UNITY_2018_3;UNITY_2018;
UNITY_INCLUDE_TESTS;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITES;ENABLE_GRID;ENABLE_TILEMAP;ENABLE_TERRAIN;ENABLE_TEXTURE_STREAMING;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_EDITOR_HUB;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_TIMELINE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;INCLUDE_DYNAMIC_GI;INCLUDE_GI;ENABLE_MONO_BDWGC;PLATFORM_SUPPORTS_MONO;INCLUDE_PUBNUB;ENABLE_VIDEO;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_LOCALIZATION;PLATFORM_ANDROID;UNITY_ANDROID;UNITY_ANDROID_API;ENABLE_SUBSTANCE;ENABLE_EGL;ENABLE_NETWORK;ENABLE_RUNTIME_GI;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_EVENT_QUEUE;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_NATIVE_CRASH_REPORTING;PLATFORM_SUPPORTS_ADS_ID;UNITY_CAN_SHOW_SPLASH_SCREEN;ENABLE_VR;ENABLE_AR;UNITY_HAS_GOOGLEVR;UNITY_HAS_TANGO;ENABLE_SPATIALTRACKING;ENABLE_RUNTIME_PERMISSIONS;UNITY_ASTC_ONLY_DECOMPRESS;ENABLE_UNITYADS_RUNTIME;UNITY_UNITYADS_API
;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;UNITY_PRO_LICENSE;NET452;ILRuntime;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER
</DefineConstants>
<ErrorReport>
prompt
</ErrorReport>
<WarningLevel>
4
</WarningLevel>
<NoWarn>
0169
</NoWarn>
...
...
@@ -120,13 +120,9 @@
<Compile
Include=
"Assets\Model\Base\RecyclableMemoryStream\RecyclableMemoryStream.cs"
/>
<Compile
Include=
"Assets\Model\Base\RecyclableMemoryStream\RecyclableMemoryStreamManager.cs"
/>
<Compile
Include=
"Assets\Model\Base\TryLocker.cs"
/>
<Compile
Include=
"Assets\Model\Base\UnityMath\Color32.cs"
/>
<Compile
Include=
"Assets\Model\Base\UnityMath\FrameworkResources.cs"
/>
<Compile
Include=
"Assets\Model\Base\UnityMath\Mathf.cs"
/>
<Compile
Include=
"Assets\Model\Base\UnityMath\MathHelper.cs"
/>
<Compile
Include=
"Assets\Model\Base\UnityMath\Matrix3x3.cs"
/>
<Compile
Include=
"Assets\Model\Base\UnityMath\Matrix4x4.cs"
/>
<Compile
Include=
"Assets\Model\Base\UnityMath\PackUtils.cs"
/>
<Compile
Include=
"Assets\Model\Base\UnityMath\Quaternion.cs"
/>
<Compile
Include=
"Assets\Model\Base\UnityMath\Vector2.cs"
/>
<Compile
Include=
"Assets\Model\Base\UnityMath\Vector3.cs"
/>
...
...
@@ -537,12 +533,6 @@
<Reference
Include=
"UnityEngine.ClothModule"
>
<HintPath>
C:/Apps/Unity2018/Editor/Data/Managed/UnityEngine/UnityEngine.ClothModule.dll
</HintPath>
</Reference>
<Reference
Include=
"UnityEngine.ClusterInputModule"
>
<HintPath>
C:/Apps/Unity2018/Editor/Data/Managed/UnityEngine/UnityEngine.ClusterInputModule.dll
</HintPath>
</Reference>
<Reference
Include=
"UnityEngine.ClusterRendererModule"
>
<HintPath>
C:/Apps/Unity2018/Editor/Data/Managed/UnityEngine/UnityEngine.ClusterRendererModule.dll
</HintPath>
</Reference>
<Reference
Include=
"UnityEngine.CoreModule"
>
<HintPath>
C:/Apps/Unity2018/Editor/Data/Managed/UnityEngine/UnityEngine.CoreModule.dll
</HintPath>
</Reference>
...
...
@@ -600,6 +590,9 @@
<Reference
Include=
"UnityEngine.SharedInternalsModule"
>
<HintPath>
C:/Apps/Unity2018/Editor/Data/Managed/UnityEngine/UnityEngine.SharedInternalsModule.dll
</HintPath>
</Reference>
<Reference
Include=
"UnityEngine.SpatialTrackingModule"
>
<HintPath>
C:/Apps/Unity2018/Editor/Data/Managed/UnityEngine/UnityEngine.SpatialTrackingModule.dll
</HintPath>
</Reference>
<Reference
Include=
"UnityEngine.SpriteMaskModule"
>
<HintPath>
C:/Apps/Unity2018/Editor/Data/Managed/UnityEngine/UnityEngine.SpriteMaskModule.dll
</HintPath>
</Reference>
...
...
Unity/Unity.ThirdParty.csproj
浏览文件 @
c69a8a49
...
...
@@ -23,7 +23,7 @@
<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_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2018_1_OR_NEWER;UNITY_2018_2_OR_NEWER;UNITY_2018_3_OR_NEWER;UNITY_2018_3_0;UNITY_2018_3;UNITY_2018;
PLATFORM_ARCH_64;UNITY_64;UNITY_INCLUDE_TESTS;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITES;ENABLE_GRID;ENABLE_TILEMAP;ENABLE_TERRAIN;ENABLE_TEXTURE_STREAMING;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_EDITOR_HUB;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_TIMELINE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;INCLUDE_DYNAMIC_GI;INCLUDE_GI;ENABLE_MONO_BDWGC;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_VIDEO;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_LOCALIZATION;PLATFORM_STANDALONE_WIN;PLATFORM_STANDALONE;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_OUT_OF_PROCESS_CRASH_HANDLER;ENABLE_EVENT_QUEUE;ENABLE_CLUSTER_SYNC;ENABLE_CLUSTERINPUT;ENABLE_VR;ENABLE_AR;ENABLE_WEBSOCKET_HOST
;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;UNITY_PRO_LICENSE;NET452;ILRuntime;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER
</DefineConstants>
<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_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2018_1_OR_NEWER;UNITY_2018_2_OR_NEWER;UNITY_2018_3_OR_NEWER;UNITY_2018_3_0;UNITY_2018_3;UNITY_2018;
UNITY_INCLUDE_TESTS;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITES;ENABLE_GRID;ENABLE_TILEMAP;ENABLE_TERRAIN;ENABLE_TEXTURE_STREAMING;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_EDITOR_HUB;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_TIMELINE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;INCLUDE_DYNAMIC_GI;INCLUDE_GI;ENABLE_MONO_BDWGC;PLATFORM_SUPPORTS_MONO;INCLUDE_PUBNUB;ENABLE_VIDEO;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_LOCALIZATION;PLATFORM_ANDROID;UNITY_ANDROID;UNITY_ANDROID_API;ENABLE_SUBSTANCE;ENABLE_EGL;ENABLE_NETWORK;ENABLE_RUNTIME_GI;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_EVENT_QUEUE;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_NATIVE_CRASH_REPORTING;PLATFORM_SUPPORTS_ADS_ID;UNITY_CAN_SHOW_SPLASH_SCREEN;ENABLE_VR;ENABLE_AR;UNITY_HAS_GOOGLEVR;UNITY_HAS_TANGO;ENABLE_SPATIALTRACKING;ENABLE_RUNTIME_PERMISSIONS;UNITY_ASTC_ONLY_DECOMPRESS;ENABLE_UNITYADS_RUNTIME;UNITY_UNITYADS_API
;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;UNITY_PRO_LICENSE;NET452;ILRuntime;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER
</DefineConstants>
<ErrorReport>
prompt
</ErrorReport>
<WarningLevel>
4
</WarningLevel>
<NoWarn>
0169
</NoWarn>
...
...
@@ -663,12 +663,6 @@
<Reference
Include=
"UnityEngine.ClothModule"
>
<HintPath>
C:/Apps/Unity2018/Editor/Data/Managed/UnityEngine/UnityEngine.ClothModule.dll
</HintPath>
</Reference>
<Reference
Include=
"UnityEngine.ClusterInputModule"
>
<HintPath>
C:/Apps/Unity2018/Editor/Data/Managed/UnityEngine/UnityEngine.ClusterInputModule.dll
</HintPath>
</Reference>
<Reference
Include=
"UnityEngine.ClusterRendererModule"
>
<HintPath>
C:/Apps/Unity2018/Editor/Data/Managed/UnityEngine/UnityEngine.ClusterRendererModule.dll
</HintPath>
</Reference>
<Reference
Include=
"UnityEngine.CoreModule"
>
<HintPath>
C:/Apps/Unity2018/Editor/Data/Managed/UnityEngine/UnityEngine.CoreModule.dll
</HintPath>
</Reference>
...
...
@@ -726,6 +720,9 @@
<Reference
Include=
"UnityEngine.SharedInternalsModule"
>
<HintPath>
C:/Apps/Unity2018/Editor/Data/Managed/UnityEngine/UnityEngine.SharedInternalsModule.dll
</HintPath>
</Reference>
<Reference
Include=
"UnityEngine.SpatialTrackingModule"
>
<HintPath>
C:/Apps/Unity2018/Editor/Data/Managed/UnityEngine/UnityEngine.SpatialTrackingModule.dll
</HintPath>
</Reference>
<Reference
Include=
"UnityEngine.SpriteMaskModule"
>
<HintPath>
C:/Apps/Unity2018/Editor/Data/Managed/UnityEngine/UnityEngine.SpriteMaskModule.dll
</HintPath>
</Reference>
...
...
Unity/Unity.sln
浏览文件 @
c69a8a49
...
...
@@ -4,10 +4,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Model", "Unity.Model.
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.ThirdParty", "Unity.ThirdParty.csproj", "{E15BADD2-3A26-309A-AB0F-DC5B08044350}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Hotfix", "Unity.Hotfix.csproj", "{1066F652-6A89-D1C4-9881-1A19DF7AB80E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Editor", "Unity.Editor.csproj", "{CD311104-1830-B119-81B6-5DBEE2467FFB}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Hotfix", "Unity.Hotfix.csproj", "{1066F652-6A89-D1C4-9881-1A19DF7AB80E}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
...
...
@@ -22,14 +22,14 @@ Global
{E15BADD2-3A26-309A-AB0F-DC5B08044350}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E15BADD2-3A26-309A-AB0F-DC5B08044350}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E15BADD2-3A26-309A-AB0F-DC5B08044350}.Release|Any CPU.Build.0 = Release|Any CPU
{1066F652-6A89-D1C4-9881-1A19DF7AB80E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1066F652-6A89-D1C4-9881-1A19DF7AB80E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1066F652-6A89-D1C4-9881-1A19DF7AB80E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1066F652-6A89-D1C4-9881-1A19DF7AB80E}.Release|Any CPU.Build.0 = Release|Any CPU
{CD311104-1830-B119-81B6-5DBEE2467FFB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CD311104-1830-B119-81B6-5DBEE2467FFB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CD311104-1830-B119-81B6-5DBEE2467FFB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CD311104-1830-B119-81B6-5DBEE2467FFB}.Release|Any CPU.Build.0 = Release|Any CPU
{1066F652-6A89-D1C4-9881-1A19DF7AB80E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1066F652-6A89-D1C4-9881-1A19DF7AB80E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1066F652-6A89-D1C4-9881-1A19DF7AB80E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1066F652-6A89-D1C4-9881-1A19DF7AB80E}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录