fix bugs that caused x86 build problem.

This commit is contained in:
hecomi
2017-08-24 01:34:53 +09:00
parent 340e2d5194
commit 1c332ebca7
46 changed files with 274 additions and 138 deletions
@@ -1,53 +1,122 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 19d4c78204afead44b6de11427d7f2f6 guid: d3ab0ac3a3d6bb643af0a464a93be957
timeCreated: 1480693943 timeCreated: 1503496900
licenseType: Pro licenseType: Pro
PluginImporter: PluginImporter:
serializedVersion: 1 serializedVersion: 2
iconMap: {} iconMap: {}
executionOrder: {} executionOrder: {}
isPreloaded: 0 isPreloaded: 0
isOverridable: 0
platformData: platformData:
Any: data:
enabled: 1 first:
settings: {} '': Any
Editor: second:
enabled: 0 enabled: 0
settings: settings:
CPU: x86 Exclude Android: 0
DefaultValueInitialized: true Exclude Editor: 0
Linux: Exclude Linux: 0
enabled: 1 Exclude Linux64: 0
settings: Exclude LinuxUniversal: 0
CPU: x86 Exclude OSXIntel: 0
Linux64: Exclude OSXIntel64: 0
enabled: 0 Exclude OSXUniversal: 0
settings: Exclude Win: 0
CPU: None Exclude Win64: 1
LinuxUniversal: data:
enabled: 1 first:
settings: Android: Android
CPU: x86 second:
OSXIntel: enabled: 1
enabled: 1 settings:
settings: CPU: ARMv7
CPU: AnyCPU data:
OSXIntel64: first:
enabled: 0 Any:
settings: second:
CPU: None enabled: 1
OSXUniversal: settings: {}
enabled: 0 data:
settings: first:
CPU: x86 Editor: Editor
Win: second:
enabled: 1 enabled: 1
settings: settings:
CPU: AnyCPU CPU: x86
Win64: DefaultValueInitialized: true
enabled: 0 OS: Windows
settings: data:
CPU: None first:
Facebook: Win
second:
enabled: 1
settings:
CPU: AnyCPU
data:
first:
Facebook: Win64
second:
enabled: 0
settings:
CPU: None
data:
first:
Standalone: Linux
second:
enabled: 1
settings:
CPU: x86
data:
first:
Standalone: Linux64
second:
enabled: 1
settings:
CPU: None
data:
first:
Standalone: LinuxUniversal
second:
enabled: 1
settings:
CPU: AnyCPU
data:
first:
Standalone: OSXIntel
second:
enabled: 1
settings:
CPU: AnyCPU
data:
first:
Standalone: OSXIntel64
second:
enabled: 1
settings:
CPU: None
data:
first:
Standalone: OSXUniversal
second:
enabled: 1
settings:
CPU: AnyCPU
data:
first:
Standalone: Win
second:
enabled: 1
settings:
CPU: AnyCPU
data:
first:
Standalone: Win64
second:
enabled: 0
settings:
CPU: None
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
@@ -1,54 +1,98 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 02fc121822cf2ea4e82e16c4a28bf711 guid: 7cb91c9ae744dc5429005b20e11f4f37
timeCreated: 1477546714 timeCreated: 1503505907
licenseType: Pro licenseType: Pro
PluginImporter: PluginImporter:
serializedVersion: 1 serializedVersion: 2
iconMap: {} iconMap: {}
executionOrder: {} executionOrder: {}
isPreloaded: 0 isPreloaded: 0
isOverridable: 0
platformData: platformData:
Any: data:
enabled: 1 first:
settings: {} Any:
Editor: second:
enabled: 0 enabled: 1
settings: settings: {}
CPU: AnyCPU data:
DefaultValueInitialized: true first:
OS: AnyOS Editor: Editor
Linux: second:
enabled: 0 enabled: 0
settings: settings:
CPU: x86 CPU: x86_64
Linux64: DefaultValueInitialized: true
enabled: 0 data:
settings: first:
CPU: x86_64 Facebook: Win
LinuxUniversal: second:
enabled: 0 enabled: 0
settings: settings:
CPU: None CPU: None
OSXIntel: data:
enabled: 0 first:
settings: Facebook: Win64
CPU: AnyCPU second:
OSXIntel64: enabled: 1
enabled: 0 settings:
settings: CPU: AnyCPU
CPU: AnyCPU data:
OSXUniversal: first:
enabled: 0 Standalone: Linux
settings: second:
CPU: None enabled: 0
Win: settings:
enabled: 0 CPU: None
settings: data:
CPU: AnyCPU first:
Win64: Standalone: Linux64
enabled: 1 second:
settings: enabled: 1
CPU: AnyCPU settings:
CPU: x86_64
data:
first:
Standalone: LinuxUniversal
second:
enabled: 1
settings:
CPU: x86_64
data:
first:
Standalone: OSXIntel
second:
enabled: 0
settings:
CPU: None
data:
first:
Standalone: OSXIntel64
second:
enabled: 1
settings:
CPU: AnyCPU
data:
first:
Standalone: OSXUniversal
second:
enabled: 0
settings:
CPU: x86_64
data:
first:
Standalone: Win
second:
enabled: 0
settings:
CPU: None
data:
first:
Standalone: Win64
second:
enabled: 1
settings:
CPU: AnyCPU
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
@@ -271,7 +271,10 @@ public class Texture : MonoBehaviour
void RequireUpdate() void RequireUpdate()
{ {
monitor.shouldBeUpdated = true; if (monitor != null)
{
monitor.shouldBeUpdated = true;
}
} }
void Reinitialize() void Reinitialize()
@@ -283,7 +286,9 @@ public class Texture : MonoBehaviour
void UpdateMaterial() void UpdateMaterial()
{ {
width = transform.localScale.x; width = transform.localScale.x;
rotation = monitor.rotation; if (monitor != null) {
rotation = monitor.rotation;
}
material.SetVector("_ClipPositionScale", new Vector4(clipPos.x, clipPos.y, clipScale.x, clipScale.y)); material.SetVector("_ClipPositionScale", new Vector4(clipPos.x, clipPos.y, clipScale.x, clipScale.y));
} }
@@ -142,7 +142,7 @@ DsOutput domain(
float disp = length(_DispTex.SampleLevel(sampler_DispTex, o.f2TexCoord, 0)) * _DispFactor; float disp = length(_DispTex.SampleLevel(sampler_DispTex, o.f2TexCoord, 0)) * _DispFactor;
f3Position.xyz += f3Normal * disp; f3Position.xyz += f3Normal * disp;
o.f4Position = mul(UNITY_MATRIX_MVP, float4(f3Position.xyz, 1.0)); o.f4Position = UnityObjectToClipPos(float4(f3Position.xyz, 1.0));
return o; return o;
} }
@@ -0,0 +1,5 @@
LIBRARY
EXPORTS
UnityPluginLoad
UnityPluginUnload
@@ -84,6 +84,7 @@ void MonitorManager::Update()
void MonitorManager::RequireReinitilization() void MonitorManager::RequireReinitilization()
{ {
Debug::Log("MonitorManager::Reinitialize() was required.");
isReinitializationRequired_ = true; isReinitializationRequired_ = true;
} }
@@ -82,6 +82,8 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);include</IncludePath> <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);include</IncludePath>
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(Platform)\$(Configuration)\</IntDir>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile> <ClCompile>
@@ -92,6 +94,10 @@
<PostBuildEvent> <PostBuildEvent>
<Command>copy /Y "$(SolutionDir)$(Platform)\$(Configuration)\$(TargetFileName)" "$(SolutionDir)..\..\Assets\$(ProjectName)\Plugins\x86_64"</Command> <Command>copy /Y "$(SolutionDir)$(Platform)\$(Configuration)\$(TargetFileName)" "$(SolutionDir)..\..\Assets\$(ProjectName)\Plugins\x86_64"</Command>
</PostBuildEvent> </PostBuildEvent>
<Link>
<ModuleDefinitionFile>
</ModuleDefinitionFile>
</Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile> <ClCompile>
@@ -100,8 +106,11 @@
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
</ClCompile> </ClCompile>
<PostBuildEvent> <PostBuildEvent>
<Command>copy /Y "$(SolutionDir)$(Platform)\$(Configuration)\$(TargetFileName)" "$(SolutionDir)..\..\Assets\$(ProjectName)\Plugins\x86_64"</Command> <Command>copy /Y "$(SolutionDir)$(Platform)\$(Configuration)\$(TargetFileName)" "$(SolutionDir)..\..\Assets\$(ProjectName)\Plugins\x86"</Command>
</PostBuildEvent> </PostBuildEvent>
<Link>
<ModuleDefinitionFile>$(SolutionDir)$(ProjectName).def</ModuleDefinitionFile>
</Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile> <ClCompile>
@@ -115,6 +124,8 @@
<Link> <Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding> <EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences> <OptimizeReferences>true</OptimizeReferences>
<ModuleDefinitionFile>
</ModuleDefinitionFile>
</Link> </Link>
<PostBuildEvent> <PostBuildEvent>
<Command>copy /Y "$(SolutionDir)$(Platform)\$(Configuration)\$(TargetFileName)" "$(SolutionDir)..\..\Assets\$(ProjectName)\Plugins\x86_64"</Command> <Command>copy /Y "$(SolutionDir)$(Platform)\$(Configuration)\$(TargetFileName)" "$(SolutionDir)..\..\Assets\$(ProjectName)\Plugins\x86_64"</Command>
@@ -132,6 +143,7 @@
<Link> <Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding> <EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences> <OptimizeReferences>true</OptimizeReferences>
<ModuleDefinitionFile>$(SolutionDir)$(ProjectName).def</ModuleDefinitionFile>
</Link> </Link>
<PostBuildEvent> <PostBuildEvent>
<Command>copy /Y "$(SolutionDir)$(Platform)\$(Configuration)\$(TargetFileName)" "$(SolutionDir)..\..\Assets\$(ProjectName)\Plugins\x86"</Command> <Command>copy /Y "$(SolutionDir)$(Platform)\$(Configuration)\$(TargetFileName)" "$(SolutionDir)..\..\Assets\$(ProjectName)\Plugins\x86"</Command>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
+1 -1
View File
@@ -1 +1 @@
m_EditorVersion: 5.5.0f3 m_EditorVersion: 2017.1.0b5
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.