Unity engine fix
This commit is contained in:
parent
2b7b5cbd6a
commit
419497b9ba
Binary file not shown.
|
|
@ -1,38 +0,0 @@
|
||||||
fileFormatVersion: 2
|
|
||||||
guid: 3429646f5d4949efa347230fa86778b7
|
|
||||||
labels:
|
|
||||||
- gvh
|
|
||||||
- gvh_version-1.2.182
|
|
||||||
- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.182/Google.IOSResolver.dll
|
|
||||||
- gvhp_targets-editor
|
|
||||||
PluginImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
serializedVersion: 2
|
|
||||||
iconMap: {}
|
|
||||||
executionOrder: {}
|
|
||||||
defineConstraints: []
|
|
||||||
isPreloaded: 0
|
|
||||||
isOverridable: 0
|
|
||||||
isExplicitlyReferenced: 0
|
|
||||||
validateReferences: 1
|
|
||||||
platformData:
|
|
||||||
- first:
|
|
||||||
Any:
|
|
||||||
second:
|
|
||||||
enabled: 0
|
|
||||||
settings: {}
|
|
||||||
- first:
|
|
||||||
Editor: Editor
|
|
||||||
second:
|
|
||||||
enabled: 1
|
|
||||||
settings:
|
|
||||||
DefaultValueInitialized: true
|
|
||||||
- first:
|
|
||||||
Windows Store Apps: WindowsStoreApps
|
|
||||||
second:
|
|
||||||
enabled: 0
|
|
||||||
settings:
|
|
||||||
CPU: AnyCPU
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
|
|
@ -4,7 +4,7 @@ labels:
|
||||||
- gpsr
|
- gpsr
|
||||||
PluginImporter:
|
PluginImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
serializedVersion: 2
|
serializedVersion: 3
|
||||||
iconMap: {}
|
iconMap: {}
|
||||||
executionOrder: {}
|
executionOrder: {}
|
||||||
defineConstraints: []
|
defineConstraints: []
|
||||||
|
|
@ -13,14 +13,10 @@ PluginImporter:
|
||||||
isExplicitlyReferenced: 0
|
isExplicitlyReferenced: 0
|
||||||
validateReferences: 1
|
validateReferences: 1
|
||||||
platformData:
|
platformData:
|
||||||
- first:
|
Any:
|
||||||
Any:
|
|
||||||
second:
|
|
||||||
enabled: 0
|
enabled: 0
|
||||||
settings: {}
|
settings: {}
|
||||||
- first:
|
Editor:
|
||||||
Editor: Editor
|
|
||||||
second:
|
|
||||||
enabled: 1
|
enabled: 1
|
||||||
settings:
|
settings:
|
||||||
DefaultValueInitialized: true
|
DefaultValueInitialized: true
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,6 @@
|
||||||
<application>
|
<application>
|
||||||
<uses-library android:required="false" android:name="org.apache.http.legacy" />
|
<uses-library android:required="false" android:name="org.apache.http.legacy" />
|
||||||
<meta-data android:name="com.google.android.gms.ads.APPLICATION_ID" android:value="ca-app-pub-2626773788355001~6567280609" />
|
<meta-data android:name="com.google.android.gms.ads.APPLICATION_ID" android:value="ca-app-pub-2626773788355001~6567280609" />
|
||||||
<meta-data android:name="com.google.unity.ads.UNITY_VERSION" android:value="2022.3.26f1" />
|
<meta-data android:name="com.google.unity.ads.UNITY_VERSION" android:value="6000.2.8f1" />
|
||||||
</application>
|
</application>
|
||||||
</manifest>
|
</manifest>
|
||||||
|
|
@ -1,8 +1,5 @@
|
||||||
org.gradle.jvmargs=-Xmx**JVM_HEAP_SIZE**M
|
|
||||||
org.gradle.parallel=true
|
|
||||||
unityStreamingAssets=**STREAMING_ASSETS**
|
unityStreamingAssets=**STREAMING_ASSETS**
|
||||||
# Android Resolver Properties Start
|
org.gradle.jvmargs=-Xmx4096M
|
||||||
android.useAndroidX=true
|
android.useAndroidX=true
|
||||||
android.enableJetifier=true
|
android.enableJetifier=true
|
||||||
# Android Resolver Properties End
|
android.enableNative16kPageSupport=true
|
||||||
**ADDITIONAL_PROPERTIES**
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: d0aa319fe0d7b7d40a02056dc9d8d5d5
|
guid: cfbc984143839e545934d41ea98537dd
|
||||||
DefaultImporter:
|
DefaultImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
userData:
|
userData:
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,11 @@
|
||||||
apply plugin: 'com.android.library'
|
apply plugin: 'com.android.library'
|
||||||
|
apply from: '../shared/keepUnitySymbols.gradle'
|
||||||
|
apply from: '../shared/common.gradle'
|
||||||
**APPLY_PLUGINS**
|
**APPLY_PLUGINS**
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation fileTree(dir: 'libs', include: ['*.jar'])
|
implementation fileTree(dir: 'libs', include: ['*.jar'])
|
||||||
|
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
|
||||||
// Android Resolver Dependencies Start
|
// Android Resolver Dependencies Start
|
||||||
implementation 'androidx.constraintlayout:constraintlayout:2.1.4' // Assets/GoogleMobileAds/Editor/GoogleMobileAdsDependencies.xml:12
|
implementation 'androidx.constraintlayout:constraintlayout:2.1.4' // Assets/GoogleMobileAds/Editor/GoogleMobileAdsDependencies.xml:12
|
||||||
implementation 'com.google.android.gms:play-services-ads:23.2.0' // Assets/GoogleMobileAds/Editor/GoogleMobileAdsDependencies.xml:7
|
implementation 'com.google.android.gms:play-services-ads:23.2.0' // Assets/GoogleMobileAds/Editor/GoogleMobileAdsDependencies.xml:7
|
||||||
|
|
@ -16,7 +19,7 @@ dependencies {
|
||||||
|
|
||||||
// Android Resolver Exclusions Start
|
// Android Resolver Exclusions Start
|
||||||
android {
|
android {
|
||||||
packagingOptions {
|
packaging {
|
||||||
exclude ('/lib/armeabi/*' + '*')
|
exclude ('/lib/armeabi/*' + '*')
|
||||||
exclude ('/lib/mips/*' + '*')
|
exclude ('/lib/mips/*' + '*')
|
||||||
exclude ('/lib/mips64/*' + '*')
|
exclude ('/lib/mips64/*' + '*')
|
||||||
|
|
@ -26,35 +29,39 @@ android {
|
||||||
}
|
}
|
||||||
// Android Resolver Exclusions End
|
// Android Resolver Exclusions End
|
||||||
android {
|
android {
|
||||||
|
namespace "com.unity3d.player"
|
||||||
ndkPath "**NDKPATH**"
|
ndkPath "**NDKPATH**"
|
||||||
|
ndkVersion "**NDKVERSION**"
|
||||||
|
|
||||||
compileSdkVersion **APIVERSION**
|
compileSdk **APIVERSION**
|
||||||
buildToolsVersion '**BUILDTOOLS**'
|
buildToolsVersion = "**BUILDTOOLS**"
|
||||||
|
|
||||||
compileOptions {
|
compileOptions {
|
||||||
sourceCompatibility JavaVersion.VERSION_11
|
sourceCompatibility JavaVersion.VERSION_17
|
||||||
targetCompatibility JavaVersion.VERSION_11
|
targetCompatibility JavaVersion.VERSION_17
|
||||||
}
|
}
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
minSdkVersion **MINSDKVERSION**
|
minSdk **MINSDK**
|
||||||
targetSdkVersion **TARGETSDKVERSION**
|
targetSdk **TARGETSDK**
|
||||||
ndk {
|
ndk {
|
||||||
abiFilters **ABIFILTERS**
|
abiFilters **ABIFILTERS**
|
||||||
|
debugSymbolLevel **DEBUGSYMBOLLEVEL**
|
||||||
}
|
}
|
||||||
versionCode **VERSIONCODE**
|
versionCode **VERSIONCODE**
|
||||||
versionName '**VERSIONNAME**'
|
versionName '**VERSIONNAME**'
|
||||||
consumerProguardFiles 'proguard-unity.txt'**USER_PROGUARD**
|
consumerProguardFiles 'proguard-unity.txt'**USER_PROGUARD**
|
||||||
|
**DEFAULT_CONFIG_SETUP**
|
||||||
}
|
}
|
||||||
|
|
||||||
lintOptions {
|
lint {
|
||||||
abortOnError false
|
abortOnError false
|
||||||
}
|
}
|
||||||
|
|
||||||
aaptOptions {
|
androidResources {
|
||||||
noCompress = **BUILTIN_NOCOMPRESS** + unityStreamingAssets.tokenize(', ')
|
noCompress = **BUILTIN_NOCOMPRESS** + unityStreamingAssets.tokenize(', ')
|
||||||
ignoreAssetsPattern = "!.svn:!.git:!.ds_store:!*.scc:!CVS:!thumbs.db:!picasa.ini:!*~"
|
ignoreAssetsPattern = "!.svn:!.git:!.ds_store:!*.scc:!CVS:!thumbs.db:!picasa.ini:!*~"
|
||||||
}**PACKAGING_OPTIONS**
|
}**PACKAGING**
|
||||||
}
|
}
|
||||||
**IL_CPP_BUILD_SETUP**
|
**IL_CPP_BUILD_SETUP**
|
||||||
**SOURCE_BUILD_SETUP**
|
**SOURCE_BUILD_SETUP**
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: f233a949893a3e14d9121856c47312ff
|
guid: 934f8fafe9d1dd547a8dc01fe6cefd90
|
||||||
DefaultImporter:
|
DefaultImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
userData:
|
userData:
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: a36707b45f5ed0c4d8ba31576d0e8dd2
|
guid: c6b5f43004820e04f907e141ca3269d1
|
||||||
DefaultImporter:
|
DefaultImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
userData:
|
userData:
|
||||||
|
|
|
||||||
|
|
@ -1,8 +0,0 @@
|
||||||
fileFormatVersion: 2
|
|
||||||
guid: a4aeb121aa79a604b9ba2044eb93da1f
|
|
||||||
folderAsset: yes
|
|
||||||
DefaultImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
|
|
@ -1,10 +0,0 @@
|
||||||
// Copyright 2016 Google Inc. All Rights Reserved.
|
|
||||||
|
|
||||||
#import <GoogleMobileAds/GoogleMobileAds.h>
|
|
||||||
|
|
||||||
@protocol GADUAdNetworkExtras <NSObject>
|
|
||||||
|
|
||||||
- (nonnull id<GADAdNetworkExtras>)adNetworkExtrasWithDictionary:
|
|
||||||
(nonnull NSDictionary<NSString *, NSString *> *)extras;
|
|
||||||
|
|
||||||
@end
|
|
||||||
|
|
@ -1,81 +0,0 @@
|
||||||
fileFormatVersion: 2
|
|
||||||
guid: 1c0d8a6c9b36440eaa4c01518670217f
|
|
||||||
labels:
|
|
||||||
- gvh
|
|
||||||
- gvh_version-9.2.0
|
|
||||||
- gvhp_exportpath-Plugins/iOS/GADUAdNetworkExtras.h
|
|
||||||
timeCreated: 1480838400
|
|
||||||
PluginImporter:
|
|
||||||
serializedVersion: 1
|
|
||||||
iconMap: {}
|
|
||||||
executionOrder: {}
|
|
||||||
isPreloaded: 0
|
|
||||||
platformData:
|
|
||||||
Android:
|
|
||||||
enabled: 0
|
|
||||||
settings:
|
|
||||||
CPU: AnyCPU
|
|
||||||
Any:
|
|
||||||
enabled: 0
|
|
||||||
settings: {}
|
|
||||||
Editor:
|
|
||||||
enabled: 1
|
|
||||||
settings:
|
|
||||||
CPU: AnyCPU
|
|
||||||
DefaultValueInitialized: true
|
|
||||||
OS: AnyOS
|
|
||||||
Linux:
|
|
||||||
enabled: 1
|
|
||||||
settings:
|
|
||||||
CPU: x86
|
|
||||||
Linux64:
|
|
||||||
enabled: 1
|
|
||||||
settings:
|
|
||||||
CPU: x86_64
|
|
||||||
LinuxUniversal:
|
|
||||||
enabled: 1
|
|
||||||
settings:
|
|
||||||
CPU: AnyCPU
|
|
||||||
OSXIntel:
|
|
||||||
enabled: 1
|
|
||||||
settings:
|
|
||||||
CPU: x86
|
|
||||||
OSXIntel64:
|
|
||||||
enabled: 1
|
|
||||||
settings:
|
|
||||||
CPU: x86_64
|
|
||||||
OSXUniversal:
|
|
||||||
enabled: 1
|
|
||||||
settings:
|
|
||||||
CPU: AnyCPU
|
|
||||||
Web:
|
|
||||||
enabled: 0
|
|
||||||
settings: {}
|
|
||||||
WebStreamed:
|
|
||||||
enabled: 0
|
|
||||||
settings: {}
|
|
||||||
Win:
|
|
||||||
enabled: 1
|
|
||||||
settings:
|
|
||||||
CPU: x86
|
|
||||||
Win64:
|
|
||||||
enabled: 1
|
|
||||||
settings:
|
|
||||||
CPU: x86_64
|
|
||||||
WindowsStoreApps:
|
|
||||||
enabled: 0
|
|
||||||
settings:
|
|
||||||
CPU: AnyCPU
|
|
||||||
iOS:
|
|
||||||
enabled: 1
|
|
||||||
settings:
|
|
||||||
CompileFlags:
|
|
||||||
FrameworkDependencies:
|
|
||||||
tvOS:
|
|
||||||
enabled: 0
|
|
||||||
settings:
|
|
||||||
CompileFlags:
|
|
||||||
FrameworkDependencies:
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
|
|
@ -1,8 +0,0 @@
|
||||||
fileFormatVersion: 2
|
|
||||||
guid: 3f6fdd4d886bd454b8cfa4757733811f
|
|
||||||
folderAsset: yes
|
|
||||||
DefaultImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
|
|
@ -1,192 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
|
|
||||||
<device id="retina5_5" orientation="portrait" appearance="light"/>
|
|
||||||
<dependencies>
|
|
||||||
<deployment identifier="iOS"/>
|
|
||||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17125"/>
|
|
||||||
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
|
|
||||||
</dependencies>
|
|
||||||
<objects>
|
|
||||||
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="GADTMediumTemplateView"/>
|
|
||||||
<view opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" translatesAutoresizingMaskIntoConstraints="NO" id="h2X-7h-r2O" customClass="GADTTemplateView">
|
|
||||||
<rect key="frame" x="0.0" y="0.0" width="355" height="402"/>
|
|
||||||
<subviews>
|
|
||||||
<view opaque="NO" clearsContextBeforeDrawing="NO" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qZf-ej-Zxg">
|
|
||||||
<rect key="frame" x="10" y="199.66666666666663" width="335" height="202.33333333333337"/>
|
|
||||||
<subviews>
|
|
||||||
<button opaque="NO" userInteractionEnabled="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ekc-Zs-FHH">
|
|
||||||
<rect key="frame" x="0.0" y="153.33333333333334" width="335" height="39"/>
|
|
||||||
<color key="backgroundColor" red="0.25882352939999997" green="0.52156862749999999" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/>
|
|
||||||
<constraints>
|
|
||||||
<constraint firstAttribute="height" constant="39" id="y8W-B6-JKk"/>
|
|
||||||
</constraints>
|
|
||||||
<state key="normal" title="Button">
|
|
||||||
<color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
|
||||||
</state>
|
|
||||||
</button>
|
|
||||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="JRU-6T-XIW">
|
|
||||||
<rect key="frame" x="0.0" y="0.0" width="335" height="51"/>
|
|
||||||
<subviews>
|
|
||||||
<stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="dtV-H5-CUV">
|
|
||||||
<rect key="frame" x="0.0" y="0.0" width="335" height="51"/>
|
|
||||||
<subviews>
|
|
||||||
<view contentMode="scaleToFill" horizontalCompressionResistancePriority="1" verticalCompressionResistancePriority="1" translatesAutoresizingMaskIntoConstraints="NO" id="IDQ-dK-aNl">
|
|
||||||
<rect key="frame" x="0.0" y="0.0" width="51" height="51"/>
|
|
||||||
<subviews>
|
|
||||||
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="1" verticalCompressionResistancePriority="1" translatesAutoresizingMaskIntoConstraints="NO" id="tcZ-gP-ynt">
|
|
||||||
<rect key="frame" x="0.0" y="0.0" width="51" height="51"/>
|
|
||||||
</imageView>
|
|
||||||
</subviews>
|
|
||||||
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
|
||||||
<constraints>
|
|
||||||
<constraint firstItem="tcZ-gP-ynt" firstAttribute="leading" secondItem="IDQ-dK-aNl" secondAttribute="leading" id="080-xf-xNS"/>
|
|
||||||
<constraint firstItem="tcZ-gP-ynt" firstAttribute="top" secondItem="IDQ-dK-aNl" secondAttribute="top" id="7ay-A1-lkK"/>
|
|
||||||
<constraint firstAttribute="trailing" secondItem="tcZ-gP-ynt" secondAttribute="trailing" id="D58-gg-wEz"/>
|
|
||||||
<constraint firstAttribute="width" secondItem="IDQ-dK-aNl" secondAttribute="height" multiplier="1:1" id="fy0-5g-4fT"/>
|
|
||||||
<constraint firstAttribute="bottom" secondItem="tcZ-gP-ynt" secondAttribute="bottom" id="mcB-Kl-8SB"/>
|
|
||||||
</constraints>
|
|
||||||
</view>
|
|
||||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ZMg-Gj-lfR">
|
|
||||||
<rect key="frame" x="51" y="0.0" width="284" height="51"/>
|
|
||||||
<subviews>
|
|
||||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Ad" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="PfZ-cd-zxs">
|
|
||||||
<rect key="frame" x="10" y="30" width="28" height="21"/>
|
|
||||||
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
|
||||||
<constraints>
|
|
||||||
<constraint firstAttribute="height" constant="21" id="5e5-3M-FF3"/>
|
|
||||||
<constraint firstAttribute="width" constant="28" id="L2a-Ko-fWP"/>
|
|
||||||
</constraints>
|
|
||||||
<fontDescription key="fontDescription" type="system" pointSize="17"/>
|
|
||||||
<color key="textColor" red="0.2274509804" green="0.4039215686" blue="0.15686274510000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
|
||||||
<nil key="highlightedColor"/>
|
|
||||||
</label>
|
|
||||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NKU-cb-NgA">
|
|
||||||
<rect key="frame" x="10" y="0.0" width="266" height="25"/>
|
|
||||||
<constraints>
|
|
||||||
<constraint firstAttribute="height" constant="25" id="iVB-Nr-QJm"/>
|
|
||||||
</constraints>
|
|
||||||
<fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
|
|
||||||
<nil key="textColor"/>
|
|
||||||
<nil key="highlightedColor"/>
|
|
||||||
</label>
|
|
||||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ic2-4I-EtF">
|
|
||||||
<rect key="frame" x="43" y="30" width="241" height="21"/>
|
|
||||||
<fontDescription key="fontDescription" type="system" pointSize="17"/>
|
|
||||||
<color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
|
||||||
<nil key="highlightedColor"/>
|
|
||||||
</label>
|
|
||||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Nc5-4a-DC8">
|
|
||||||
<rect key="frame" x="43" y="29" width="241" height="20.333333333333329"/>
|
|
||||||
<fontDescription key="fontDescription" type="system" pointSize="17"/>
|
|
||||||
<color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
|
||||||
<nil key="highlightedColor"/>
|
|
||||||
</label>
|
|
||||||
</subviews>
|
|
||||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
|
||||||
<constraints>
|
|
||||||
<constraint firstItem="PfZ-cd-zxs" firstAttribute="top" secondItem="NKU-cb-NgA" secondAttribute="bottom" constant="5" id="8CL-eR-AJN"/>
|
|
||||||
<constraint firstAttribute="trailing" secondItem="ic2-4I-EtF" secondAttribute="trailing" id="9Ig-ff-Xy9"/>
|
|
||||||
<constraint firstItem="ic2-4I-EtF" firstAttribute="leading" secondItem="PfZ-cd-zxs" secondAttribute="trailing" constant="5" id="BvN-q8-2tx"/>
|
|
||||||
<constraint firstItem="NKU-cb-NgA" firstAttribute="leading" secondItem="ZMg-Gj-lfR" secondAttribute="leading" constant="10" id="R0a-Yh-5hA"/>
|
|
||||||
<constraint firstAttribute="bottom" secondItem="ic2-4I-EtF" secondAttribute="bottom" id="RsF-hZ-dlg"/>
|
|
||||||
<constraint firstAttribute="trailing" secondItem="NKU-cb-NgA" secondAttribute="trailing" constant="8" id="Rur-KX-Eao"/>
|
|
||||||
<constraint firstItem="Nc5-4a-DC8" firstAttribute="top" secondItem="NKU-cb-NgA" secondAttribute="bottom" constant="4" id="Vd7-ge-1KD"/>
|
|
||||||
<constraint firstItem="PfZ-cd-zxs" firstAttribute="leading" secondItem="ZMg-Gj-lfR" secondAttribute="leading" constant="10" id="XOm-ic-qzo"/>
|
|
||||||
<constraint firstItem="NKU-cb-NgA" firstAttribute="top" secondItem="ZMg-Gj-lfR" secondAttribute="top" id="XXu-i3-Bb8"/>
|
|
||||||
<constraint firstAttribute="trailing" secondItem="Nc5-4a-DC8" secondAttribute="trailing" id="fr4-RB-zCl"/>
|
|
||||||
<constraint firstItem="ic2-4I-EtF" firstAttribute="leading" secondItem="PfZ-cd-zxs" secondAttribute="trailing" constant="5" id="hI7-l2-cCQ"/>
|
|
||||||
<constraint firstAttribute="bottom" secondItem="PfZ-cd-zxs" secondAttribute="bottom" id="s9K-uZ-2fK"/>
|
|
||||||
<constraint firstItem="Nc5-4a-DC8" firstAttribute="leading" secondItem="PfZ-cd-zxs" secondAttribute="trailing" constant="5" id="uDG-1E-LGP"/>
|
|
||||||
<constraint firstItem="ic2-4I-EtF" firstAttribute="top" secondItem="NKU-cb-NgA" secondAttribute="bottom" constant="5" id="zDa-Y8-eNv"/>
|
|
||||||
</constraints>
|
|
||||||
</view>
|
|
||||||
</subviews>
|
|
||||||
<constraints>
|
|
||||||
<constraint firstAttribute="bottom" secondItem="IDQ-dK-aNl" secondAttribute="bottom" id="Pz3-Ne-UvS"/>
|
|
||||||
<constraint firstItem="IDQ-dK-aNl" firstAttribute="top" secondItem="dtV-H5-CUV" secondAttribute="top" id="Um4-Pc-PRn"/>
|
|
||||||
<constraint firstItem="IDQ-dK-aNl" firstAttribute="leading" secondItem="dtV-H5-CUV" secondAttribute="leading" id="ygw-iI-8p3"/>
|
|
||||||
</constraints>
|
|
||||||
</stackView>
|
|
||||||
</subviews>
|
|
||||||
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
|
||||||
<constraints>
|
|
||||||
<constraint firstAttribute="bottom" secondItem="dtV-H5-CUV" secondAttribute="bottom" id="JTS-sy-ZIx"/>
|
|
||||||
<constraint firstItem="dtV-H5-CUV" firstAttribute="leading" secondItem="JRU-6T-XIW" secondAttribute="leading" id="KnB-yd-LES"/>
|
|
||||||
<constraint firstAttribute="trailing" secondItem="dtV-H5-CUV" secondAttribute="trailing" id="c6Z-Wa-u8v"/>
|
|
||||||
<constraint firstItem="dtV-H5-CUV" firstAttribute="top" secondItem="JRU-6T-XIW" secondAttribute="top" id="hLc-rA-agZ"/>
|
|
||||||
</constraints>
|
|
||||||
</view>
|
|
||||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="41W-IZ-S0S">
|
|
||||||
<rect key="frame" x="0.0" y="61.000000000000021" width="335" height="82.333333333333314"/>
|
|
||||||
<constraints>
|
|
||||||
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="20.329999999999998" id="NUh-RX-SnN"/>
|
|
||||||
</constraints>
|
|
||||||
<fontDescription key="fontDescription" type="system" pointSize="17"/>
|
|
||||||
<color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
|
||||||
<nil key="highlightedColor"/>
|
|
||||||
</label>
|
|
||||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="EEy-n8-ZT9">
|
|
||||||
<rect key="frame" x="0.0" y="61.000000000000021" width="335" height="82.333333333333314"/>
|
|
||||||
<fontDescription key="fontDescription" type="system" pointSize="17"/>
|
|
||||||
<nil key="textColor"/>
|
|
||||||
<nil key="highlightedColor"/>
|
|
||||||
</label>
|
|
||||||
</subviews>
|
|
||||||
<accessibility key="accessibilityConfiguration">
|
|
||||||
<accessibilityTraits key="traits" notEnabled="YES"/>
|
|
||||||
</accessibility>
|
|
||||||
<constraints>
|
|
||||||
<constraint firstItem="EEy-n8-ZT9" firstAttribute="top" secondItem="JRU-6T-XIW" secondAttribute="bottom" constant="10" id="07C-eK-e4L"/>
|
|
||||||
<constraint firstAttribute="trailing" secondItem="EEy-n8-ZT9" secondAttribute="trailing" id="0eV-cw-Vb0"/>
|
|
||||||
<constraint firstItem="JRU-6T-XIW" firstAttribute="top" secondItem="qZf-ej-Zxg" secondAttribute="top" id="7V3-bf-fEw"/>
|
|
||||||
<constraint firstItem="JRU-6T-XIW" firstAttribute="leading" secondItem="qZf-ej-Zxg" secondAttribute="leading" id="7q0-md-byq"/>
|
|
||||||
<constraint firstItem="EEy-n8-ZT9" firstAttribute="leading" secondItem="qZf-ej-Zxg" secondAttribute="leading" id="H9Y-Xr-Mvb"/>
|
|
||||||
<constraint firstItem="Ekc-Zs-FHH" firstAttribute="top" secondItem="41W-IZ-S0S" secondAttribute="bottom" constant="10" id="Haj-5X-7Jq"/>
|
|
||||||
<constraint firstItem="41W-IZ-S0S" firstAttribute="top" secondItem="JRU-6T-XIW" secondAttribute="bottom" constant="10" id="LUq-TO-4Ri"/>
|
|
||||||
<constraint firstItem="Ekc-Zs-FHH" firstAttribute="leading" secondItem="qZf-ej-Zxg" secondAttribute="leading" id="N0d-Ud-bcH"/>
|
|
||||||
<constraint firstAttribute="trailing" secondItem="Ekc-Zs-FHH" secondAttribute="trailing" id="QEk-Nl-LP0"/>
|
|
||||||
<constraint firstAttribute="bottom" secondItem="Ekc-Zs-FHH" secondAttribute="bottom" constant="10" id="fQb-8m-kWu"/>
|
|
||||||
<constraint firstAttribute="trailing" secondItem="JRU-6T-XIW" secondAttribute="trailing" id="fpH-cd-zrf"/>
|
|
||||||
<constraint firstAttribute="trailing" secondItem="41W-IZ-S0S" secondAttribute="trailing" id="rZu-Yd-6qa"/>
|
|
||||||
<constraint firstItem="Ekc-Zs-FHH" firstAttribute="top" secondItem="EEy-n8-ZT9" secondAttribute="bottom" constant="10" id="rx0-LH-lgr"/>
|
|
||||||
<constraint firstItem="41W-IZ-S0S" firstAttribute="leading" secondItem="qZf-ej-Zxg" secondAttribute="leading" id="w16-DI-Ydj"/>
|
|
||||||
</constraints>
|
|
||||||
</view>
|
|
||||||
<view clipsSubviews="YES" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="1ne-Xk-CBH" customClass="GADMediaView">
|
|
||||||
<rect key="frame" x="0.0" y="0.0" width="355" height="199.66666666666666"/>
|
|
||||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
|
||||||
<constraints>
|
|
||||||
<constraint firstAttribute="width" secondItem="1ne-Xk-CBH" secondAttribute="height" multiplier="16:9" id="kTC-ip-nfX"/>
|
|
||||||
</constraints>
|
|
||||||
</view>
|
|
||||||
</subviews>
|
|
||||||
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
|
||||||
<accessibility key="accessibilityConfiguration">
|
|
||||||
<accessibilityTraits key="traits" notEnabled="YES"/>
|
|
||||||
</accessibility>
|
|
||||||
<constraints>
|
|
||||||
<constraint firstAttribute="trailing" secondItem="qZf-ej-Zxg" secondAttribute="trailing" constant="10" id="1Rv-ij-HDB"/>
|
|
||||||
<constraint firstItem="qZf-ej-Zxg" firstAttribute="leading" secondItem="h2X-7h-r2O" secondAttribute="leading" constant="10" id="OCX-hu-Rvd"/>
|
|
||||||
<constraint firstItem="qZf-ej-Zxg" firstAttribute="top" secondItem="1ne-Xk-CBH" secondAttribute="bottom" id="aHY-Ht-nDt"/>
|
|
||||||
<constraint firstItem="1ne-Xk-CBH" firstAttribute="leading" secondItem="h2X-7h-r2O" secondAttribute="leading" id="cj9-Mw-8MR"/>
|
|
||||||
<constraint firstAttribute="trailing" secondItem="1ne-Xk-CBH" secondAttribute="trailing" id="gLW-Sf-wcR"/>
|
|
||||||
<constraint firstItem="1ne-Xk-CBH" firstAttribute="top" secondItem="h2X-7h-r2O" secondAttribute="top" id="ipR-Fl-Mie"/>
|
|
||||||
<constraint firstAttribute="bottom" secondItem="qZf-ej-Zxg" secondAttribute="bottom" id="sWi-Jm-MXA"/>
|
|
||||||
</constraints>
|
|
||||||
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
|
|
||||||
<connections>
|
|
||||||
<outlet property="adBadge" destination="PfZ-cd-zxs" id="l4Z-NW-nRv"/>
|
|
||||||
<outlet property="advertiserView" destination="ic2-4I-EtF" id="l3s-ci-Wqi"/>
|
|
||||||
<outlet property="bodyView" destination="41W-IZ-S0S" id="Iwg-fc-zE1"/>
|
|
||||||
<outlet property="callToActionView" destination="Ekc-Zs-FHH" id="jEd-fy-AYv"/>
|
|
||||||
<outlet property="headlineView" destination="NKU-cb-NgA" id="rQk-ZH-WzT"/>
|
|
||||||
<outlet property="iconView" destination="tcZ-gP-ynt" id="v9E-Jd-ls7"/>
|
|
||||||
<outlet property="mediaView" destination="1ne-Xk-CBH" id="ym4-4P-qZ1"/>
|
|
||||||
<outlet property="starRatingView" destination="EEy-n8-ZT9" id="2zm-9R-j0T"/>
|
|
||||||
<outlet property="storeView" destination="Nc5-4a-DC8" id="hEJ-Yq-J1P"/>
|
|
||||||
</connections>
|
|
||||||
<point key="canvasLocation" x="-68.840579710144937" y="794.83695652173924"/>
|
|
||||||
</view>
|
|
||||||
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
|
|
||||||
</objects>
|
|
||||||
</document>
|
|
||||||
|
|
@ -1,81 +0,0 @@
|
||||||
fileFormatVersion: 2
|
|
||||||
guid: 766f36c9503c48e5915b2dbb1b312f64
|
|
||||||
labels:
|
|
||||||
- gvh
|
|
||||||
- gvh_version-9.2.0
|
|
||||||
- gvhp_exportpath-Plugins/iOS/NativeTemplates/GADTMediumTemplateView.xib
|
|
||||||
timeCreated: 1480838400
|
|
||||||
PluginImporter:
|
|
||||||
serializedVersion: 1
|
|
||||||
iconMap: {}
|
|
||||||
executionOrder: {}
|
|
||||||
isPreloaded: 0
|
|
||||||
platformData:
|
|
||||||
Android:
|
|
||||||
enabled: 0
|
|
||||||
settings:
|
|
||||||
CPU: AnyCPU
|
|
||||||
Any:
|
|
||||||
enabled: 0
|
|
||||||
settings: {}
|
|
||||||
Editor:
|
|
||||||
enabled: 1
|
|
||||||
settings:
|
|
||||||
CPU: AnyCPU
|
|
||||||
DefaultValueInitialized: true
|
|
||||||
OS: AnyOS
|
|
||||||
Linux:
|
|
||||||
enabled: 1
|
|
||||||
settings:
|
|
||||||
CPU: x86
|
|
||||||
Linux64:
|
|
||||||
enabled: 1
|
|
||||||
settings:
|
|
||||||
CPU: x86_64
|
|
||||||
LinuxUniversal:
|
|
||||||
enabled: 1
|
|
||||||
settings:
|
|
||||||
CPU: AnyCPU
|
|
||||||
OSXIntel:
|
|
||||||
enabled: 1
|
|
||||||
settings:
|
|
||||||
CPU: x86
|
|
||||||
OSXIntel64:
|
|
||||||
enabled: 1
|
|
||||||
settings:
|
|
||||||
CPU: x86_64
|
|
||||||
OSXUniversal:
|
|
||||||
enabled: 1
|
|
||||||
settings:
|
|
||||||
CPU: AnyCPU
|
|
||||||
Web:
|
|
||||||
enabled: 0
|
|
||||||
settings: {}
|
|
||||||
WebStreamed:
|
|
||||||
enabled: 0
|
|
||||||
settings: {}
|
|
||||||
Win:
|
|
||||||
enabled: 1
|
|
||||||
settings:
|
|
||||||
CPU: x86
|
|
||||||
Win64:
|
|
||||||
enabled: 1
|
|
||||||
settings:
|
|
||||||
CPU: x86_64
|
|
||||||
WindowsStoreApps:
|
|
||||||
enabled: 0
|
|
||||||
settings:
|
|
||||||
CPU: AnyCPU
|
|
||||||
iOS:
|
|
||||||
enabled: 1
|
|
||||||
settings:
|
|
||||||
CompileFlags:
|
|
||||||
FrameworkDependencies:
|
|
||||||
tvOS:
|
|
||||||
enabled: 0
|
|
||||||
settings:
|
|
||||||
CompileFlags:
|
|
||||||
FrameworkDependencies:
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
|
|
@ -1,119 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
|
|
||||||
<device id="retina5_5" orientation="portrait" appearance="light"/>
|
|
||||||
<dependencies>
|
|
||||||
<deployment identifier="iOS"/>
|
|
||||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17125"/>
|
|
||||||
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
|
|
||||||
</dependencies>
|
|
||||||
<objects>
|
|
||||||
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="GADTSmallTemplateView"/>
|
|
||||||
<view opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" translatesAutoresizingMaskIntoConstraints="NO" id="h2X-7h-r2O" customClass="GADTTemplateView">
|
|
||||||
<rect key="frame" x="0.0" y="0.0" width="403" height="101"/>
|
|
||||||
<subviews>
|
|
||||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="L39-RW-Fxr">
|
|
||||||
<rect key="frame" x="0.0" y="0.0" width="100.66666666666667" height="101"/>
|
|
||||||
<subviews>
|
|
||||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6ux-FJ-pGo" customClass="GADMediaView">
|
|
||||||
<rect key="frame" x="0.0" y="0.0" width="100.66666666666667" height="101"/>
|
|
||||||
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
|
||||||
</view>
|
|
||||||
</subviews>
|
|
||||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
|
||||||
<constraints>
|
|
||||||
<constraint firstItem="6ux-FJ-pGo" firstAttribute="leading" secondItem="L39-RW-Fxr" secondAttribute="leading" id="27x-eI-Vv6"/>
|
|
||||||
<constraint firstItem="6ux-FJ-pGo" firstAttribute="top" secondItem="L39-RW-Fxr" secondAttribute="top" id="ags-Wp-AEy"/>
|
|
||||||
<constraint firstAttribute="bottom" secondItem="6ux-FJ-pGo" secondAttribute="bottom" id="dPo-Dh-hjm"/>
|
|
||||||
<constraint firstAttribute="width" secondItem="L39-RW-Fxr" secondAttribute="height" multiplier="1:1" id="evj-q8-mFJ"/>
|
|
||||||
<constraint firstAttribute="trailing" secondItem="6ux-FJ-pGo" secondAttribute="trailing" id="kq2-nx-atN"/>
|
|
||||||
</constraints>
|
|
||||||
</view>
|
|
||||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9ag-e3-7oH">
|
|
||||||
<rect key="frame" x="110.66666666666666" y="60" width="282.33333333333337" height="31"/>
|
|
||||||
<color key="backgroundColor" red="0.25882352941176467" green="0.52156862745098043" blue="0.95686274509803915" alpha="1" colorSpace="calibratedRGB"/>
|
|
||||||
<state key="normal" title="Button">
|
|
||||||
<color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
|
||||||
</state>
|
|
||||||
</button>
|
|
||||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Lx5-Xt-1uw">
|
|
||||||
<rect key="frame" x="110.66666666666666" y="10" width="282.33333333333337" height="40"/>
|
|
||||||
<subviews>
|
|
||||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Headline" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DKj-id-Sm4">
|
|
||||||
<rect key="frame" x="0.0" y="0.0" width="282.33333333333331" height="16"/>
|
|
||||||
<fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
|
|
||||||
<nil key="textColor"/>
|
|
||||||
<nil key="highlightedColor"/>
|
|
||||||
</label>
|
|
||||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Zjv-ch-qcM">
|
|
||||||
<rect key="frame" x="29.999999999999986" y="21" width="252.33333333333331" height="19"/>
|
|
||||||
<fontDescription key="fontDescription" type="system" pointSize="12"/>
|
|
||||||
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
|
||||||
<nil key="highlightedColor"/>
|
|
||||||
</label>
|
|
||||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Ad" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hl4-7y-gXg">
|
|
||||||
<rect key="frame" x="0.0" y="21" width="25" height="19"/>
|
|
||||||
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
|
||||||
<constraints>
|
|
||||||
<constraint firstAttribute="height" constant="19" id="zKN-zg-1DK"/>
|
|
||||||
<constraint firstAttribute="width" constant="25" id="zzo-oJ-f7v"/>
|
|
||||||
</constraints>
|
|
||||||
<fontDescription key="fontDescription" type="system" pointSize="12"/>
|
|
||||||
<color key="textColor" red="0.2274509804" green="0.4039215686" blue="0.15686274510000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
|
||||||
<nil key="highlightedColor"/>
|
|
||||||
</label>
|
|
||||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pWT-IG-tgy">
|
|
||||||
<rect key="frame" x="29" y="18" width="245" height="24"/>
|
|
||||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
|
||||||
<fontDescription key="fontDescription" type="system" pointSize="12"/>
|
|
||||||
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
|
||||||
<nil key="highlightedColor"/>
|
|
||||||
</label>
|
|
||||||
</subviews>
|
|
||||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
|
||||||
<constraints>
|
|
||||||
<constraint firstItem="hl4-7y-gXg" firstAttribute="top" secondItem="DKj-id-Sm4" secondAttribute="bottom" constant="5" id="0Tg-39-lC8"/>
|
|
||||||
<constraint firstAttribute="bottom" secondItem="Zjv-ch-qcM" secondAttribute="bottom" id="CjG-2q-n2F"/>
|
|
||||||
<constraint firstAttribute="trailing" secondItem="DKj-id-Sm4" secondAttribute="trailing" id="UoI-a1-i42"/>
|
|
||||||
<constraint firstItem="Zjv-ch-qcM" firstAttribute="leading" secondItem="hl4-7y-gXg" secondAttribute="trailing" constant="5" id="fU5-cu-7Xt"/>
|
|
||||||
<constraint firstItem="Zjv-ch-qcM" firstAttribute="top" secondItem="DKj-id-Sm4" secondAttribute="bottom" constant="5" id="rEn-LP-hhs"/>
|
|
||||||
<constraint firstItem="DKj-id-Sm4" firstAttribute="top" secondItem="Lx5-Xt-1uw" secondAttribute="top" id="sSI-Oo-ibp"/>
|
|
||||||
<constraint firstItem="DKj-id-Sm4" firstAttribute="leading" secondItem="Lx5-Xt-1uw" secondAttribute="leading" id="syr-GK-hqO"/>
|
|
||||||
<constraint firstAttribute="bottom" secondItem="hl4-7y-gXg" secondAttribute="bottom" id="x5d-wM-uYg"/>
|
|
||||||
<constraint firstItem="hl4-7y-gXg" firstAttribute="leading" secondItem="Lx5-Xt-1uw" secondAttribute="leading" id="xIO-Ue-ETa"/>
|
|
||||||
<constraint firstAttribute="trailing" secondItem="Zjv-ch-qcM" secondAttribute="trailing" id="ygc-FQ-5ah"/>
|
|
||||||
</constraints>
|
|
||||||
</view>
|
|
||||||
</subviews>
|
|
||||||
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
|
||||||
<accessibility key="accessibilityConfiguration">
|
|
||||||
<accessibilityTraits key="traits" notEnabled="YES"/>
|
|
||||||
<bool key="isElement" value="YES"/>
|
|
||||||
</accessibility>
|
|
||||||
<constraints>
|
|
||||||
<constraint firstAttribute="trailing" secondItem="9ag-e3-7oH" secondAttribute="trailing" constant="10" id="170-UP-YGV"/>
|
|
||||||
<constraint firstItem="Lx5-Xt-1uw" firstAttribute="top" secondItem="h2X-7h-r2O" secondAttribute="top" constant="10" id="3QL-ag-qrO"/>
|
|
||||||
<constraint firstItem="Lx5-Xt-1uw" firstAttribute="height" secondItem="9ag-e3-7oH" secondAttribute="height" multiplier="1.3" id="Hdt-VV-9Kw"/>
|
|
||||||
<constraint firstItem="L39-RW-Fxr" firstAttribute="leading" secondItem="h2X-7h-r2O" secondAttribute="leading" id="ISF-wz-Ozg"/>
|
|
||||||
<constraint firstItem="L39-RW-Fxr" firstAttribute="width" relation="lessThanOrEqual" secondItem="h2X-7h-r2O" secondAttribute="width" multiplier="0.25" id="ItS-CH-KDp"/>
|
|
||||||
<constraint firstItem="Lx5-Xt-1uw" firstAttribute="leading" secondItem="L39-RW-Fxr" secondAttribute="trailing" constant="10" id="Qgh-CR-lQY"/>
|
|
||||||
<constraint firstItem="9ag-e3-7oH" firstAttribute="top" secondItem="Lx5-Xt-1uw" secondAttribute="bottom" constant="10" id="RyV-eO-eP8"/>
|
|
||||||
<constraint firstAttribute="trailing" secondItem="Lx5-Xt-1uw" secondAttribute="trailing" constant="10" id="YId-cX-a5U"/>
|
|
||||||
<constraint firstItem="9ag-e3-7oH" firstAttribute="top" secondItem="Lx5-Xt-1uw" secondAttribute="bottom" constant="10" id="b2E-4c-sl4"/>
|
|
||||||
<constraint firstItem="L39-RW-Fxr" firstAttribute="centerY" secondItem="h2X-7h-r2O" secondAttribute="centerY" id="eXQ-jP-VfJ"/>
|
|
||||||
<constraint firstItem="9ag-e3-7oH" firstAttribute="leading" secondItem="L39-RW-Fxr" secondAttribute="trailing" constant="10" id="mXy-rL-NiY"/>
|
|
||||||
<constraint firstAttribute="bottom" secondItem="9ag-e3-7oH" secondAttribute="bottom" constant="10" id="ywj-Y9-XCT"/>
|
|
||||||
</constraints>
|
|
||||||
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
|
|
||||||
<connections>
|
|
||||||
<outlet property="adBadge" destination="hl4-7y-gXg" id="Bp7-FM-VVW"/>
|
|
||||||
<outlet property="advertiserView" destination="Zjv-ch-qcM" id="Ku9-M6-SEf"/>
|
|
||||||
<outlet property="callToActionView" destination="9ag-e3-7oH" id="Uh9-xd-ccJ"/>
|
|
||||||
<outlet property="headlineView" destination="DKj-id-Sm4" id="fwg-CO-DrR"/>
|
|
||||||
<outlet property="mediaView" destination="6ux-FJ-pGo" id="aCz-rd-9bD"/>
|
|
||||||
<outlet property="storeView" destination="pWT-IG-tgy" id="f3q-8l-We7"/>
|
|
||||||
</connections>
|
|
||||||
<point key="canvasLocation" x="-50.000000000000007" y="652.58152173913049"/>
|
|
||||||
</view>
|
|
||||||
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
|
|
||||||
</objects>
|
|
||||||
</document>
|
|
||||||
|
|
@ -1,81 +0,0 @@
|
||||||
fileFormatVersion: 2
|
|
||||||
guid: 6af78782470b4da9994fc4cf04f03183
|
|
||||||
labels:
|
|
||||||
- gvh
|
|
||||||
- gvh_version-9.2.0
|
|
||||||
- gvhp_exportpath-Plugins/iOS/NativeTemplates/GADTSmallTemplateView.xib
|
|
||||||
timeCreated: 1480838400
|
|
||||||
PluginImporter:
|
|
||||||
serializedVersion: 1
|
|
||||||
iconMap: {}
|
|
||||||
executionOrder: {}
|
|
||||||
isPreloaded: 0
|
|
||||||
platformData:
|
|
||||||
Android:
|
|
||||||
enabled: 0
|
|
||||||
settings:
|
|
||||||
CPU: AnyCPU
|
|
||||||
Any:
|
|
||||||
enabled: 0
|
|
||||||
settings: {}
|
|
||||||
Editor:
|
|
||||||
enabled: 1
|
|
||||||
settings:
|
|
||||||
CPU: AnyCPU
|
|
||||||
DefaultValueInitialized: true
|
|
||||||
OS: AnyOS
|
|
||||||
Linux:
|
|
||||||
enabled: 1
|
|
||||||
settings:
|
|
||||||
CPU: x86
|
|
||||||
Linux64:
|
|
||||||
enabled: 1
|
|
||||||
settings:
|
|
||||||
CPU: x86_64
|
|
||||||
LinuxUniversal:
|
|
||||||
enabled: 1
|
|
||||||
settings:
|
|
||||||
CPU: AnyCPU
|
|
||||||
OSXIntel:
|
|
||||||
enabled: 1
|
|
||||||
settings:
|
|
||||||
CPU: x86
|
|
||||||
OSXIntel64:
|
|
||||||
enabled: 1
|
|
||||||
settings:
|
|
||||||
CPU: x86_64
|
|
||||||
OSXUniversal:
|
|
||||||
enabled: 1
|
|
||||||
settings:
|
|
||||||
CPU: AnyCPU
|
|
||||||
Web:
|
|
||||||
enabled: 0
|
|
||||||
settings: {}
|
|
||||||
WebStreamed:
|
|
||||||
enabled: 0
|
|
||||||
settings: {}
|
|
||||||
Win:
|
|
||||||
enabled: 1
|
|
||||||
settings:
|
|
||||||
CPU: x86
|
|
||||||
Win64:
|
|
||||||
enabled: 1
|
|
||||||
settings:
|
|
||||||
CPU: x86_64
|
|
||||||
WindowsStoreApps:
|
|
||||||
enabled: 0
|
|
||||||
settings:
|
|
||||||
CPU: AnyCPU
|
|
||||||
iOS:
|
|
||||||
enabled: 1
|
|
||||||
settings:
|
|
||||||
CompileFlags:
|
|
||||||
FrameworkDependencies:
|
|
||||||
tvOS:
|
|
||||||
enabled: 0
|
|
||||||
settings:
|
|
||||||
CompileFlags:
|
|
||||||
FrameworkDependencies:
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
Binary file not shown.
|
|
@ -1,81 +0,0 @@
|
||||||
fileFormatVersion: 2
|
|
||||||
guid: 56a634db3b664dd5ac9cb4e2807319dc
|
|
||||||
labels:
|
|
||||||
- gvh
|
|
||||||
- gvh_version-9.2.0
|
|
||||||
- gvhp_exportpath-Plugins/iOS/unity-plugin-library.a
|
|
||||||
timeCreated: 1480838400
|
|
||||||
PluginImporter:
|
|
||||||
serializedVersion: 1
|
|
||||||
iconMap: {}
|
|
||||||
executionOrder: {}
|
|
||||||
isPreloaded: 0
|
|
||||||
platformData:
|
|
||||||
Android:
|
|
||||||
enabled: 0
|
|
||||||
settings:
|
|
||||||
CPU: AnyCPU
|
|
||||||
Any:
|
|
||||||
enabled: 0
|
|
||||||
settings: {}
|
|
||||||
Editor:
|
|
||||||
enabled: 1
|
|
||||||
settings:
|
|
||||||
CPU: AnyCPU
|
|
||||||
DefaultValueInitialized: true
|
|
||||||
OS: AnyOS
|
|
||||||
Linux:
|
|
||||||
enabled: 1
|
|
||||||
settings:
|
|
||||||
CPU: x86
|
|
||||||
Linux64:
|
|
||||||
enabled: 1
|
|
||||||
settings:
|
|
||||||
CPU: x86_64
|
|
||||||
LinuxUniversal:
|
|
||||||
enabled: 1
|
|
||||||
settings:
|
|
||||||
CPU: AnyCPU
|
|
||||||
OSXIntel:
|
|
||||||
enabled: 1
|
|
||||||
settings:
|
|
||||||
CPU: x86
|
|
||||||
OSXIntel64:
|
|
||||||
enabled: 1
|
|
||||||
settings:
|
|
||||||
CPU: x86_64
|
|
||||||
OSXUniversal:
|
|
||||||
enabled: 1
|
|
||||||
settings:
|
|
||||||
CPU: AnyCPU
|
|
||||||
Web:
|
|
||||||
enabled: 0
|
|
||||||
settings: {}
|
|
||||||
WebStreamed:
|
|
||||||
enabled: 0
|
|
||||||
settings: {}
|
|
||||||
Win:
|
|
||||||
enabled: 1
|
|
||||||
settings:
|
|
||||||
CPU: x86
|
|
||||||
Win64:
|
|
||||||
enabled: 1
|
|
||||||
settings:
|
|
||||||
CPU: x86_64
|
|
||||||
WindowsStoreApps:
|
|
||||||
enabled: 0
|
|
||||||
settings:
|
|
||||||
CPU: AnyCPU
|
|
||||||
iOS:
|
|
||||||
enabled: 1
|
|
||||||
settings:
|
|
||||||
CompileFlags:
|
|
||||||
FrameworkDependencies:
|
|
||||||
tvOS:
|
|
||||||
enabled: 0
|
|
||||||
settings:
|
|
||||||
CompileFlags:
|
|
||||||
FrameworkDependencies:
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -2,15 +2,14 @@
|
||||||
%TAG !u! tag:unity3d.com,2011:
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
--- !u!21 &2180264
|
--- !u!21 &2180264
|
||||||
Material:
|
Material:
|
||||||
serializedVersion: 8
|
serializedVersion: 6
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_Name: LiberationSans SDF Material
|
m_Name: LiberationSans SDF Material
|
||||||
m_Shader: {fileID: 4800000, guid: fe393ace9b354375a9cb14cdbbc28be4, type: 3}
|
m_Shader: {fileID: 4800000, guid: fe393ace9b354375a9cb14cdbbc28be4, type: 3}
|
||||||
m_ValidKeywords: []
|
m_ShaderKeywords:
|
||||||
m_InvalidKeywords: []
|
|
||||||
m_LightmapFlags: 1
|
m_LightmapFlags: 1
|
||||||
m_EnableInstancingVariants: 0
|
m_EnableInstancingVariants: 0
|
||||||
m_DoubleSidedGI: 0
|
m_DoubleSidedGI: 0
|
||||||
|
|
@ -68,7 +67,6 @@ Material:
|
||||||
m_Texture: {fileID: 0}
|
m_Texture: {fileID: 0}
|
||||||
m_Scale: {x: 1, y: 1}
|
m_Scale: {x: 1, y: 1}
|
||||||
m_Offset: {x: 0, y: 0}
|
m_Offset: {x: 0, y: 0}
|
||||||
m_Ints: []
|
|
||||||
m_Floats:
|
m_Floats:
|
||||||
- _Ambient: 0.5
|
- _Ambient: 0.5
|
||||||
- _Bevel: 0.5
|
- _Bevel: 0.5
|
||||||
|
|
@ -150,7 +148,6 @@ Material:
|
||||||
- _ReflectOutlineColor: {r: 0, g: 0, b: 0, a: 1}
|
- _ReflectOutlineColor: {r: 0, g: 0, b: 0, a: 1}
|
||||||
- _SpecularColor: {r: 1, g: 1, b: 1, a: 1}
|
- _SpecularColor: {r: 1, g: 1, b: 1, a: 1}
|
||||||
- _UnderlayColor: {r: 0, g: 0, b: 0, a: 0.5}
|
- _UnderlayColor: {r: 0, g: 0, b: 0, a: 0.5}
|
||||||
m_BuildTextureStacks: []
|
|
||||||
--- !u!114 &11400000
|
--- !u!114 &11400000
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -163,21 +160,19 @@ MonoBehaviour:
|
||||||
m_Script: {fileID: 11500000, guid: 71c1514a6bd24e1e882cebbe1904ce04, type: 3}
|
m_Script: {fileID: 11500000, guid: 71c1514a6bd24e1e882cebbe1904ce04, type: 3}
|
||||||
m_Name: LiberationSans SDF - Fallback
|
m_Name: LiberationSans SDF - Fallback
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
hashCode: -1699145518
|
|
||||||
material: {fileID: 2180264}
|
|
||||||
materialHashCode: 462855346
|
|
||||||
m_Version: 1.1.0
|
m_Version: 1.1.0
|
||||||
|
m_Material: {fileID: 2180264}
|
||||||
m_SourceFontFileGUID: e3265ab4bf004d28a9537516768c1c75
|
m_SourceFontFileGUID: e3265ab4bf004d28a9537516768c1c75
|
||||||
m_SourceFontFile_EditorRef: {fileID: 12800000, guid: e3265ab4bf004d28a9537516768c1c75,
|
|
||||||
type: 3}
|
|
||||||
m_SourceFontFile: {fileID: 12800000, guid: e3265ab4bf004d28a9537516768c1c75, type: 3}
|
m_SourceFontFile: {fileID: 12800000, guid: e3265ab4bf004d28a9537516768c1c75, type: 3}
|
||||||
m_AtlasPopulationMode: 1
|
m_AtlasPopulationMode: 1
|
||||||
|
InternalDynamicOS: 0
|
||||||
m_FaceInfo:
|
m_FaceInfo:
|
||||||
m_FaceIndex: 0
|
m_FaceIndex: 0
|
||||||
m_FamilyName: Liberation Sans
|
m_FamilyName: Liberation Sans
|
||||||
m_StyleName: Regular
|
m_StyleName: Regular
|
||||||
m_PointSize: 86
|
m_PointSize: 86
|
||||||
m_Scale: 1
|
m_Scale: 1
|
||||||
|
m_UnitsPerEM: 2048
|
||||||
m_LineHeight: 98.8916
|
m_LineHeight: 98.8916
|
||||||
m_AscentLine: 77.853516
|
m_AscentLine: 77.853516
|
||||||
m_CapLine: 59
|
m_CapLine: 59
|
||||||
|
|
@ -198,7 +193,7 @@ MonoBehaviour:
|
||||||
m_AtlasTextures:
|
m_AtlasTextures:
|
||||||
- {fileID: 28268798066460806}
|
- {fileID: 28268798066460806}
|
||||||
m_AtlasTextureIndex: 0
|
m_AtlasTextureIndex: 0
|
||||||
m_IsMultiAtlasTexturesEnabled: 0
|
m_IsMultiAtlasTexturesEnabled: 1
|
||||||
m_ClearDynamicDataOnBuild: 1
|
m_ClearDynamicDataOnBuild: 1
|
||||||
m_UsedGlyphRects: []
|
m_UsedGlyphRects: []
|
||||||
m_FreeGlyphRects:
|
m_FreeGlyphRects:
|
||||||
|
|
@ -237,15 +232,21 @@ MonoBehaviour:
|
||||||
m_KerningTable:
|
m_KerningTable:
|
||||||
kerningPairs: []
|
kerningPairs: []
|
||||||
m_FontFeatureTable:
|
m_FontFeatureTable:
|
||||||
|
m_MultipleSubstitutionRecords: []
|
||||||
|
m_LigatureSubstitutionRecords: []
|
||||||
m_GlyphPairAdjustmentRecords: []
|
m_GlyphPairAdjustmentRecords: []
|
||||||
|
m_MarkToBaseAdjustmentRecords: []
|
||||||
|
m_MarkToMarkAdjustmentRecords: []
|
||||||
fallbackFontAssets: []
|
fallbackFontAssets: []
|
||||||
m_FallbackFontAssetTable: []
|
m_FallbackFontAssetTable: []
|
||||||
m_CreationSettings:
|
m_CreationSettings:
|
||||||
sourceFontFileName:
|
sourceFontFileName:
|
||||||
sourceFontFileGUID: e3265ab4bf004d28a9537516768c1c75
|
sourceFontFileGUID: e3265ab4bf004d28a9537516768c1c75
|
||||||
|
faceIndex: 0
|
||||||
pointSizeSamplingMode: 0
|
pointSizeSamplingMode: 0
|
||||||
pointSize: 86
|
pointSize: 86
|
||||||
padding: 9
|
padding: 9
|
||||||
|
paddingMode: 0
|
||||||
packingMode: 4
|
packingMode: 4
|
||||||
atlasWidth: 512
|
atlasWidth: 512
|
||||||
atlasHeight: 512
|
atlasHeight: 512
|
||||||
|
|
@ -317,20 +318,15 @@ Texture2D:
|
||||||
Hash: 00000000000000000000000000000000
|
Hash: 00000000000000000000000000000000
|
||||||
m_ForcedFallbackFormat: 4
|
m_ForcedFallbackFormat: 4
|
||||||
m_DownscaleFallback: 0
|
m_DownscaleFallback: 0
|
||||||
m_IsAlphaChannelOptional: 0
|
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
m_Width: 0
|
m_Width: 0
|
||||||
m_Height: 0
|
m_Height: 0
|
||||||
m_CompleteImageSize: 0
|
m_CompleteImageSize: 0
|
||||||
m_MipsStripped: 0
|
|
||||||
m_TextureFormat: 1
|
m_TextureFormat: 1
|
||||||
m_MipCount: 1
|
m_MipCount: 1
|
||||||
m_IsReadable: 1
|
m_IsReadable: 1
|
||||||
m_IsPreProcessed: 0
|
|
||||||
m_IgnoreMasterTextureLimit: 0
|
|
||||||
m_StreamingMipmaps: 0
|
m_StreamingMipmaps: 0
|
||||||
m_StreamingMipmapsPriority: 0
|
m_StreamingMipmapsPriority: 0
|
||||||
m_VTOnly: 0
|
|
||||||
m_AlphaIsTransparency: 0
|
m_AlphaIsTransparency: 0
|
||||||
m_ImageCount: 1
|
m_ImageCount: 1
|
||||||
m_TextureDimension: 2
|
m_TextureDimension: 2
|
||||||
|
|
@ -344,11 +340,9 @@ Texture2D:
|
||||||
m_WrapW: 0
|
m_WrapW: 0
|
||||||
m_LightmapFormat: 0
|
m_LightmapFormat: 0
|
||||||
m_ColorSpace: 0
|
m_ColorSpace: 0
|
||||||
m_PlatformBlob:
|
|
||||||
image data: 0
|
image data: 0
|
||||||
_typelessdata:
|
_typelessdata:
|
||||||
m_StreamData:
|
m_StreamData:
|
||||||
serializedVersion: 2
|
|
||||||
offset: 0
|
offset: 0
|
||||||
size: 0
|
size: 0
|
||||||
path:
|
path:
|
||||||
|
|
|
||||||
|
|
@ -3,8 +3,9 @@
|
||||||
--- !u!114 &11400000
|
--- !u!114 &11400000
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
m_PrefabParentObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInternal: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 0}
|
m_GameObject: {fileID: 0}
|
||||||
m_Enabled: 1
|
m_Enabled: 1
|
||||||
m_EditorHideFlags: 0
|
m_EditorHideFlags: 0
|
||||||
|
|
@ -12,6 +13,12 @@ MonoBehaviour:
|
||||||
m_Name: Default Style Sheet
|
m_Name: Default Style Sheet
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
m_StyleList:
|
m_StyleList:
|
||||||
|
- m_Name: Normal
|
||||||
|
m_HashCode: -1183493901
|
||||||
|
m_OpeningDefinition:
|
||||||
|
m_ClosingDefinition:
|
||||||
|
m_OpeningTagArray:
|
||||||
|
m_ClosingTagArray:
|
||||||
- m_Name: H1
|
- m_Name: H1
|
||||||
m_HashCode: 2425
|
m_HashCode: 2425
|
||||||
m_OpeningDefinition: <size=2em><b><#40ff80>*
|
m_OpeningDefinition: <size=2em><b><#40ff80>*
|
||||||
|
|
@ -19,19 +26,25 @@ MonoBehaviour:
|
||||||
m_OpeningTagArray: 3c00000073000000690000007a000000650000003d00000032000000650000006d0000003e0000003c000000620000003e0000003c000000230000003400000030000000660000006600000038000000300000003e0000002a000000
|
m_OpeningTagArray: 3c00000073000000690000007a000000650000003d00000032000000650000006d0000003e0000003c000000620000003e0000003c000000230000003400000030000000660000006600000038000000300000003e0000002a000000
|
||||||
m_ClosingTagArray: 2a0000003c0000002f00000073000000690000007a000000650000003e0000003c0000002f000000620000003e0000003c0000002f000000630000006f0000006c0000006f000000720000003e000000
|
m_ClosingTagArray: 2a0000003c0000002f00000073000000690000007a000000650000003e0000003c0000002f000000620000003e0000003c0000002f000000630000006f0000006c0000006f000000720000003e000000
|
||||||
- m_Name: Quote
|
- m_Name: Quote
|
||||||
m_HashCode: 92254330
|
m_HashCode: 93368250
|
||||||
m_OpeningDefinition: <i><size=75%><margin=10%>
|
m_OpeningDefinition: <i><size=75%><margin=10%>
|
||||||
m_ClosingDefinition: </i></size></width></margin>
|
m_ClosingDefinition: </i></size></width></margin>
|
||||||
m_OpeningTagArray: 3c000000690000003e0000003c00000073000000690000007a000000650000003d0000003700000035000000250000003e0000003c0000006d000000610000007200000067000000690000006e0000003d0000003100000030000000250000003e000000
|
m_OpeningTagArray: 3c000000690000003e0000003c00000073000000690000007a000000650000003d0000003700000035000000250000003e0000003c0000006d000000610000007200000067000000690000006e0000003d0000003100000030000000250000003e000000
|
||||||
m_ClosingTagArray: 3c0000002f000000690000003e0000003c0000002f00000073000000690000007a000000650000003e0000003c0000002f00000077000000690000006400000074000000680000003e0000003c0000002f0000006d000000610000007200000067000000690000006e0000003e000000
|
m_ClosingTagArray: 3c0000002f000000690000003e0000003c0000002f00000073000000690000007a000000650000003e0000003c0000002f00000077000000690000006400000074000000680000003e0000003c0000002f0000006d000000610000007200000067000000690000006e0000003e000000
|
||||||
|
- m_Name: A
|
||||||
|
m_HashCode: 65
|
||||||
|
m_OpeningDefinition: <color=#40a0ff><u>
|
||||||
|
m_ClosingDefinition: </u></color>
|
||||||
|
m_OpeningTagArray: 3c000000630000006f0000006c0000006f000000720000003d000000230000003400000030000000610000003000000066000000660000003e0000003c000000750000003e000000
|
||||||
|
m_ClosingTagArray: 3c0000002f000000750000003e0000003c0000002f000000630000006f0000006c0000006f000000720000003e000000
|
||||||
- m_Name: Link
|
- m_Name: Link
|
||||||
m_HashCode: 2687968
|
m_HashCode: 2656128
|
||||||
m_OpeningDefinition: <u><#40a0ff><link="ID_01">
|
m_OpeningDefinition: <u><#40a0ff><link="ID_01">
|
||||||
m_ClosingDefinition: </u></color></link>
|
m_ClosingDefinition: </u></color></link>
|
||||||
m_OpeningTagArray: 3c000000750000003e0000003c000000230000003400000030000000610000003000000066000000660000003e0000003c0000006c000000690000006e0000006b0000003d0000002200000049000000440000005f0000003000000031000000220000003e000000
|
m_OpeningTagArray: 3c000000750000003e0000003c000000230000003400000030000000610000003000000066000000660000003e0000003c0000006c000000690000006e0000006b0000003d0000002200000049000000440000005f0000003000000031000000220000003e000000
|
||||||
m_ClosingTagArray: 3c0000002f000000750000003e0000003c0000002f000000630000006f0000006c0000006f000000720000003e0000003c0000002f0000006c000000690000006e0000006b0000003e000000
|
m_ClosingTagArray: 3c0000002f000000750000003e0000003c0000002f000000630000006f0000006c0000006f000000720000003e0000003c0000002f0000006c000000690000006e0000006b0000003e000000
|
||||||
- m_Name: Title
|
- m_Name: Title
|
||||||
m_HashCode: 98732960
|
m_HashCode: 97690656
|
||||||
m_OpeningDefinition: <size=125%><b><align=center>
|
m_OpeningDefinition: <size=125%><b><align=center>
|
||||||
m_ClosingDefinition: </size></b></align>
|
m_ClosingDefinition: </size></b></align>
|
||||||
m_OpeningTagArray: 3c00000073000000690000007a000000650000003d000000310000003200000035000000250000003e0000003c000000620000003e0000003c000000610000006c00000069000000670000006e0000003d00000063000000650000006e0000007400000065000000720000003e000000
|
m_OpeningTagArray: 3c00000073000000690000007a000000650000003d000000310000003200000035000000250000003e0000003c000000620000003e0000003c000000610000006c00000069000000670000006e0000003d00000063000000650000006e0000007400000065000000720000003e000000
|
||||||
|
|
|
||||||
|
|
@ -12,14 +12,17 @@ MonoBehaviour:
|
||||||
m_Script: {fileID: 11500000, guid: 2705215ac5b84b70bacc50632be6e391, type: 3}
|
m_Script: {fileID: 11500000, guid: 2705215ac5b84b70bacc50632be6e391, type: 3}
|
||||||
m_Name: TMP Settings
|
m_Name: TMP Settings
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
m_enableWordWrapping: 1
|
assetVersion: 2
|
||||||
|
m_TextWrappingMode: 1
|
||||||
m_enableKerning: 1
|
m_enableKerning: 1
|
||||||
|
m_ActiveFontFeatures: 00000000
|
||||||
m_enableExtraPadding: 0
|
m_enableExtraPadding: 0
|
||||||
m_enableTintAllSprites: 0
|
m_enableTintAllSprites: 0
|
||||||
m_enableParseEscapeCharacters: 1
|
m_enableParseEscapeCharacters: 1
|
||||||
m_EnableRaycastTarget: 1
|
m_EnableRaycastTarget: 1
|
||||||
m_GetFontFeaturesAtRuntime: 1
|
m_GetFontFeaturesAtRuntime: 1
|
||||||
m_missingGlyphCharacter: 0
|
m_missingGlyphCharacter: 0
|
||||||
|
m_ClearDynamicDataOnBuild: 1
|
||||||
m_warningsDisabled: 0
|
m_warningsDisabled: 0
|
||||||
m_defaultFontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
m_defaultFontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||||
m_defaultFontAssetPath: Fonts & Materials/
|
m_defaultFontAssetPath: Fonts & Materials/
|
||||||
|
|
@ -29,13 +32,16 @@ MonoBehaviour:
|
||||||
m_defaultTextMeshProTextContainerSize: {x: 20, y: 5}
|
m_defaultTextMeshProTextContainerSize: {x: 20, y: 5}
|
||||||
m_defaultTextMeshProUITextContainerSize: {x: 200, y: 50}
|
m_defaultTextMeshProUITextContainerSize: {x: 200, y: 50}
|
||||||
m_autoSizeTextContainer: 0
|
m_autoSizeTextContainer: 0
|
||||||
|
m_IsTextObjectScaleStatic: 0
|
||||||
m_fallbackFontAssets: []
|
m_fallbackFontAssets: []
|
||||||
m_matchMaterialPreset: 1
|
m_matchMaterialPreset: 1
|
||||||
|
m_HideSubTextObjects: 1
|
||||||
m_defaultSpriteAsset: {fileID: 11400000, guid: c41005c129ba4d66911b75229fd70b45,
|
m_defaultSpriteAsset: {fileID: 11400000, guid: c41005c129ba4d66911b75229fd70b45,
|
||||||
type: 2}
|
type: 2}
|
||||||
m_defaultSpriteAssetPath: Sprite Assets/
|
m_defaultSpriteAssetPath: Sprite Assets/
|
||||||
m_enableEmojiSupport: 1
|
m_enableEmojiSupport: 1
|
||||||
m_MissingCharacterSpriteUnicode: 0
|
m_MissingCharacterSpriteUnicode: 0
|
||||||
|
m_EmojiFallbackTextAssets: []
|
||||||
m_defaultColorGradientPresetsPath: Color Gradient Presets/
|
m_defaultColorGradientPresetsPath: Color Gradient Presets/
|
||||||
m_defaultStyleSheet: {fileID: 11400000, guid: f952c082cb03451daed3ee968ac6c63e,
|
m_defaultStyleSheet: {fileID: 11400000, guid: f952c082cb03451daed3ee968ac6c63e,
|
||||||
type: 2}
|
type: 2}
|
||||||
|
|
|
||||||
|
|
@ -1,26 +1,26 @@
|
||||||
Shader "TextMeshPro/Bitmap Custom Atlas" {
|
Shader "TextMeshPro/Bitmap Custom Atlas" {
|
||||||
|
|
||||||
Properties {
|
Properties {
|
||||||
_MainTex ("Font Atlas", 2D) = "white" {}
|
_MainTex ("Font Atlas", 2D) = "white" {}
|
||||||
_FaceTex ("Font Texture", 2D) = "white" {}
|
_FaceTex ("Font Texture", 2D) = "white" {}
|
||||||
[HDR]_FaceColor ("Text Color", Color) = (1,1,1,1)
|
_FaceColor ("Text Color", Color) = (1,1,1,1)
|
||||||
|
|
||||||
_VertexOffsetX ("Vertex OffsetX", float) = 0
|
_VertexOffsetX ("Vertex OffsetX", float) = 0
|
||||||
_VertexOffsetY ("Vertex OffsetY", float) = 0
|
_VertexOffsetY ("Vertex OffsetY", float) = 0
|
||||||
_MaskSoftnessX ("Mask SoftnessX", float) = 0
|
_MaskSoftnessX ("Mask SoftnessX", float) = 0
|
||||||
_MaskSoftnessY ("Mask SoftnessY", float) = 0
|
_MaskSoftnessY ("Mask SoftnessY", float) = 0
|
||||||
|
|
||||||
_ClipRect("Clip Rect", vector) = (-32767, -32767, 32767, 32767)
|
_ClipRect ("Clip Rect", vector) = (-32767, -32767, 32767, 32767)
|
||||||
_Padding ("Padding", float) = 0
|
_Padding ("Padding", float) = 0
|
||||||
|
|
||||||
_StencilComp("Stencil Comparison", Float) = 8
|
_StencilComp ("Stencil Comparison", Float) = 8
|
||||||
_Stencil("Stencil ID", Float) = 0
|
_Stencil ("Stencil ID", Float) = 0
|
||||||
_StencilOp("Stencil Operation", Float) = 0
|
_StencilOp ("Stencil Operation", Float) = 0
|
||||||
_StencilWriteMask("Stencil Write Mask", Float) = 255
|
_StencilWriteMask ("Stencil Write Mask", Float) = 255
|
||||||
_StencilReadMask("Stencil Read Mask", Float) = 255
|
_StencilReadMask ("Stencil Read Mask", Float) = 255
|
||||||
|
|
||||||
_CullMode("Cull Mode", Float) = 0
|
_CullMode ("Cull Mode", Float) = 0
|
||||||
_ColorMask("Color Mask", Float) = 15
|
_ColorMask ("Color Mask", Float) = 15
|
||||||
}
|
}
|
||||||
|
|
||||||
SubShader{
|
SubShader{
|
||||||
|
|
@ -55,15 +55,18 @@ SubShader{
|
||||||
|
|
||||||
|
|
||||||
#include "UnityCG.cginc"
|
#include "UnityCG.cginc"
|
||||||
|
#include "UnityUI.cginc"
|
||||||
|
|
||||||
struct appdata_t {
|
struct appdata_t
|
||||||
|
{
|
||||||
float4 vertex : POSITION;
|
float4 vertex : POSITION;
|
||||||
fixed4 color : COLOR;
|
fixed4 color : COLOR;
|
||||||
float2 texcoord0 : TEXCOORD0;
|
float4 texcoord0 : TEXCOORD0;
|
||||||
float2 texcoord1 : TEXCOORD1;
|
float2 texcoord1 : TEXCOORD1;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct v2f {
|
struct v2f
|
||||||
|
{
|
||||||
float4 vertex : SV_POSITION;
|
float4 vertex : SV_POSITION;
|
||||||
fixed4 color : COLOR;
|
fixed4 color : COLOR;
|
||||||
float2 texcoord0 : TEXCOORD0;
|
float2 texcoord0 : TEXCOORD0;
|
||||||
|
|
@ -81,15 +84,9 @@ SubShader{
|
||||||
uniform float4 _ClipRect;
|
uniform float4 _ClipRect;
|
||||||
uniform float _MaskSoftnessX;
|
uniform float _MaskSoftnessX;
|
||||||
uniform float _MaskSoftnessY;
|
uniform float _MaskSoftnessY;
|
||||||
|
uniform float _UIMaskSoftnessX;
|
||||||
float2 UnpackUV(float uv)
|
uniform float _UIMaskSoftnessY;
|
||||||
{
|
uniform int _UIVertexColorAlwaysGammaSpace;
|
||||||
float2 output;
|
|
||||||
output.x = floor(uv / 4096);
|
|
||||||
output.y = uv - 4096 * output.x;
|
|
||||||
|
|
||||||
return output * 0.001953125;
|
|
||||||
}
|
|
||||||
|
|
||||||
v2f vert (appdata_t v)
|
v2f vert (appdata_t v)
|
||||||
{
|
{
|
||||||
|
|
@ -101,6 +98,10 @@ SubShader{
|
||||||
|
|
||||||
float4 vPosition = UnityPixelSnap(UnityObjectToClipPos(vert));
|
float4 vPosition = UnityPixelSnap(UnityObjectToClipPos(vert));
|
||||||
|
|
||||||
|
if (_UIVertexColorAlwaysGammaSpace && !IsGammaSpace())
|
||||||
|
{
|
||||||
|
v.color.rgb = UIGammaToLinear(v.color.rgb);
|
||||||
|
}
|
||||||
fixed4 faceColor = v.color;
|
fixed4 faceColor = v.color;
|
||||||
faceColor *= _FaceColor;
|
faceColor *= _FaceColor;
|
||||||
|
|
||||||
|
|
@ -108,13 +109,14 @@ SubShader{
|
||||||
OUT.vertex = vPosition;
|
OUT.vertex = vPosition;
|
||||||
OUT.color = faceColor;
|
OUT.color = faceColor;
|
||||||
OUT.texcoord0 = v.texcoord0;
|
OUT.texcoord0 = v.texcoord0;
|
||||||
OUT.texcoord1 = TRANSFORM_TEX(UnpackUV(v.texcoord1), _FaceTex);
|
OUT.texcoord1 = TRANSFORM_TEX(v.texcoord1, _FaceTex);
|
||||||
float2 pixelSize = vPosition.w;
|
float2 pixelSize = vPosition.w;
|
||||||
pixelSize /= abs(float2(_ScreenParams.x * UNITY_MATRIX_P[0][0], _ScreenParams.y * UNITY_MATRIX_P[1][1]));
|
pixelSize /= abs(float2(_ScreenParams.x * UNITY_MATRIX_P[0][0], _ScreenParams.y * UNITY_MATRIX_P[1][1]));
|
||||||
|
|
||||||
// Clamp _ClipRect to 16bit.
|
// Clamp _ClipRect to 16bit.
|
||||||
float4 clampedRect = clamp(_ClipRect, -2e10, 2e10);
|
const float4 clampedRect = clamp(_ClipRect, -2e10, 2e10);
|
||||||
OUT.mask = float4(vert.xy * 2 - clampedRect.xy - clampedRect.zw, 0.25 / (0.25 * half2(_MaskSoftnessX, _MaskSoftnessY) + pixelSize.xy));
|
const half2 maskSoftness = half2(max(_UIMaskSoftnessX, _MaskSoftnessX), max(_UIMaskSoftnessY, _MaskSoftnessY));
|
||||||
|
OUT.mask = float4(vert.xy * 2 - clampedRect.xy - clampedRect.zw, 0.25 / (0.25 * maskSoftness + pixelSize.xy));
|
||||||
|
|
||||||
return OUT;
|
return OUT;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,25 +1,25 @@
|
||||||
Shader "TextMeshPro/Mobile/Bitmap" {
|
Shader "TextMeshPro/Mobile/Bitmap" {
|
||||||
|
|
||||||
Properties {
|
Properties {
|
||||||
_MainTex ("Font Atlas", 2D) = "white" {}
|
_MainTex ("Font Atlas", 2D) = "white" {}
|
||||||
[HDR]_Color ("Text Color", Color) = (1,1,1,1)
|
_Color ("Text Color", Color) = (1,1,1,1)
|
||||||
_DiffusePower ("Diffuse Power", Range(1.0,4.0)) = 1.0
|
_DiffusePower ("Diffuse Power", Range(1.0,4.0)) = 1.0
|
||||||
|
|
||||||
_VertexOffsetX("Vertex OffsetX", float) = 0
|
_VertexOffsetX ("Vertex OffsetX", float) = 0
|
||||||
_VertexOffsetY("Vertex OffsetY", float) = 0
|
_VertexOffsetY ("Vertex OffsetY", float) = 0
|
||||||
_MaskSoftnessX("Mask SoftnessX", float) = 0
|
_MaskSoftnessX ("Mask SoftnessX", float) = 0
|
||||||
_MaskSoftnessY("Mask SoftnessY", float) = 0
|
_MaskSoftnessY ("Mask SoftnessY", float) = 0
|
||||||
|
|
||||||
_ClipRect("Clip Rect", vector) = (-32767, -32767, 32767, 32767)
|
_ClipRect ("Clip Rect", vector) = (-32767, -32767, 32767, 32767)
|
||||||
|
|
||||||
_StencilComp("Stencil Comparison", Float) = 8
|
_StencilComp ("Stencil Comparison", Float) = 8
|
||||||
_Stencil("Stencil ID", Float) = 0
|
_Stencil ("Stencil ID", Float) = 0
|
||||||
_StencilOp("Stencil Operation", Float) = 0
|
_StencilOp ("Stencil Operation", Float) = 0
|
||||||
_StencilWriteMask("Stencil Write Mask", Float) = 255
|
_StencilWriteMask ("Stencil Write Mask", Float) = 255
|
||||||
_StencilReadMask("Stencil Read Mask", Float) = 255
|
_StencilReadMask ("Stencil Read Mask", Float) = 255
|
||||||
|
|
||||||
_CullMode("Cull Mode", Float) = 0
|
_CullMode ("Cull Mode", Float) = 0
|
||||||
_ColorMask("Color Mask", Float) = 15
|
_ColorMask ("Color Mask", Float) = 15
|
||||||
}
|
}
|
||||||
|
|
||||||
SubShader {
|
SubShader {
|
||||||
|
|
@ -55,15 +55,18 @@ SubShader {
|
||||||
|
|
||||||
|
|
||||||
#include "UnityCG.cginc"
|
#include "UnityCG.cginc"
|
||||||
|
#include "UnityUI.cginc"
|
||||||
|
|
||||||
struct appdata_t {
|
struct appdata_t
|
||||||
|
{
|
||||||
float4 vertex : POSITION;
|
float4 vertex : POSITION;
|
||||||
fixed4 color : COLOR;
|
fixed4 color : COLOR;
|
||||||
float2 texcoord0 : TEXCOORD0;
|
float2 texcoord0 : TEXCOORD0;
|
||||||
float2 texcoord1 : TEXCOORD1;
|
float2 texcoord1 : TEXCOORD1;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct v2f {
|
struct v2f
|
||||||
|
{
|
||||||
float4 vertex : POSITION;
|
float4 vertex : POSITION;
|
||||||
fixed4 color : COLOR;
|
fixed4 color : COLOR;
|
||||||
float2 texcoord0 : TEXCOORD0;
|
float2 texcoord0 : TEXCOORD0;
|
||||||
|
|
@ -79,6 +82,9 @@ SubShader {
|
||||||
uniform float4 _ClipRect;
|
uniform float4 _ClipRect;
|
||||||
uniform float _MaskSoftnessX;
|
uniform float _MaskSoftnessX;
|
||||||
uniform float _MaskSoftnessY;
|
uniform float _MaskSoftnessY;
|
||||||
|
uniform float _UIMaskSoftnessX;
|
||||||
|
uniform float _UIMaskSoftnessY;
|
||||||
|
uniform int _UIVertexColorAlwaysGammaSpace;
|
||||||
|
|
||||||
v2f vert (appdata_t v)
|
v2f vert (appdata_t v)
|
||||||
{
|
{
|
||||||
|
|
@ -88,8 +94,11 @@ SubShader {
|
||||||
vert.y += _VertexOffsetY;
|
vert.y += _VertexOffsetY;
|
||||||
|
|
||||||
vert.xy += (vert.w * 0.5) / _ScreenParams.xy;
|
vert.xy += (vert.w * 0.5) / _ScreenParams.xy;
|
||||||
|
if (_UIVertexColorAlwaysGammaSpace && !IsGammaSpace())
|
||||||
OUT.vertex = UnityPixelSnap(UnityObjectToClipPos(vert));
|
{
|
||||||
|
v.color.rgb = UIGammaToLinear(v.color.rgb);
|
||||||
|
}
|
||||||
|
OUT.vertex = UnityPixelSnap(UnityObjectToClipPos(vert));
|
||||||
OUT.color = v.color;
|
OUT.color = v.color;
|
||||||
OUT.color *= _Color;
|
OUT.color *= _Color;
|
||||||
OUT.color.rgb *= _DiffusePower;
|
OUT.color.rgb *= _DiffusePower;
|
||||||
|
|
@ -99,8 +108,9 @@ SubShader {
|
||||||
//pixelSize /= abs(float2(_ScreenParams.x * UNITY_MATRIX_P[0][0], _ScreenParams.y * UNITY_MATRIX_P[1][1]));
|
//pixelSize /= abs(float2(_ScreenParams.x * UNITY_MATRIX_P[0][0], _ScreenParams.y * UNITY_MATRIX_P[1][1]));
|
||||||
|
|
||||||
// Clamp _ClipRect to 16bit.
|
// Clamp _ClipRect to 16bit.
|
||||||
float4 clampedRect = clamp(_ClipRect, -2e10, 2e10);
|
const float4 clampedRect = clamp(_ClipRect, -2e10, 2e10);
|
||||||
OUT.mask = float4(vert.xy * 2 - clampedRect.xy - clampedRect.zw, 0.25 / (0.25 * half2(_MaskSoftnessX, _MaskSoftnessY) + pixelSize.xy));
|
const half2 maskSoftness = half2(max(_UIMaskSoftnessX, _MaskSoftnessX), max(_UIMaskSoftnessY, _MaskSoftnessY));
|
||||||
|
OUT.mask = float4(vert.xy * 2 - clampedRect.xy - clampedRect.zw, 0.25 / (0.25 * maskSoftness + pixelSize.xy));
|
||||||
|
|
||||||
return OUT;
|
return OUT;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,25 +1,25 @@
|
||||||
Shader "TextMeshPro/Bitmap" {
|
Shader "TextMeshPro/Bitmap" {
|
||||||
|
|
||||||
Properties {
|
Properties {
|
||||||
_MainTex ("Font Atlas", 2D) = "white" {}
|
_MainTex ("Font Atlas", 2D) = "white" {}
|
||||||
_FaceTex ("Font Texture", 2D) = "white" {}
|
_FaceTex ("Font Texture", 2D) = "white" {}
|
||||||
[HDR]_FaceColor ("Text Color", Color) = (1,1,1,1)
|
_FaceColor ("Text Color", Color) = (1,1,1,1)
|
||||||
|
|
||||||
_VertexOffsetX ("Vertex OffsetX", float) = 0
|
_VertexOffsetX ("Vertex OffsetX", float) = 0
|
||||||
_VertexOffsetY ("Vertex OffsetY", float) = 0
|
_VertexOffsetY ("Vertex OffsetY", float) = 0
|
||||||
_MaskSoftnessX ("Mask SoftnessX", float) = 0
|
_MaskSoftnessX ("Mask SoftnessX", float) = 0
|
||||||
_MaskSoftnessY ("Mask SoftnessY", float) = 0
|
_MaskSoftnessY ("Mask SoftnessY", float) = 0
|
||||||
|
|
||||||
_ClipRect("Clip Rect", vector) = (-32767, -32767, 32767, 32767)
|
_ClipRect ("Clip Rect", vector) = (-32767, -32767, 32767, 32767)
|
||||||
|
|
||||||
_StencilComp("Stencil Comparison", Float) = 8
|
_StencilComp ("Stencil Comparison", Float) = 8
|
||||||
_Stencil("Stencil ID", Float) = 0
|
_Stencil ("Stencil ID", Float) = 0
|
||||||
_StencilOp("Stencil Operation", Float) = 0
|
_StencilOp ("Stencil Operation", Float) = 0
|
||||||
_StencilWriteMask("Stencil Write Mask", Float) = 255
|
_StencilWriteMask ("Stencil Write Mask", Float) = 255
|
||||||
_StencilReadMask("Stencil Read Mask", Float) = 255
|
_StencilReadMask ("Stencil Read Mask", Float) = 255
|
||||||
|
|
||||||
_CullMode("Cull Mode", Float) = 0
|
_CullMode ("Cull Mode", Float) = 0
|
||||||
_ColorMask("Color Mask", Float) = 15
|
_ColorMask ("Color Mask", Float) = 15
|
||||||
}
|
}
|
||||||
|
|
||||||
SubShader{
|
SubShader{
|
||||||
|
|
@ -54,15 +54,18 @@ SubShader{
|
||||||
|
|
||||||
|
|
||||||
#include "UnityCG.cginc"
|
#include "UnityCG.cginc"
|
||||||
|
#include "UnityUI.cginc"
|
||||||
|
|
||||||
struct appdata_t {
|
struct appdata_t
|
||||||
|
{
|
||||||
float4 vertex : POSITION;
|
float4 vertex : POSITION;
|
||||||
fixed4 color : COLOR;
|
fixed4 color : COLOR;
|
||||||
float2 texcoord0 : TEXCOORD0;
|
float4 texcoord0 : TEXCOORD0;
|
||||||
float2 texcoord1 : TEXCOORD1;
|
float2 texcoord1 : TEXCOORD1;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct v2f {
|
struct v2f
|
||||||
|
{
|
||||||
float4 vertex : SV_POSITION;
|
float4 vertex : SV_POSITION;
|
||||||
fixed4 color : COLOR;
|
fixed4 color : COLOR;
|
||||||
float2 texcoord0 : TEXCOORD0;
|
float2 texcoord0 : TEXCOORD0;
|
||||||
|
|
@ -80,15 +83,9 @@ SubShader{
|
||||||
uniform float4 _ClipRect;
|
uniform float4 _ClipRect;
|
||||||
uniform float _MaskSoftnessX;
|
uniform float _MaskSoftnessX;
|
||||||
uniform float _MaskSoftnessY;
|
uniform float _MaskSoftnessY;
|
||||||
|
uniform float _UIMaskSoftnessX;
|
||||||
float2 UnpackUV(float uv)
|
uniform float _UIMaskSoftnessY;
|
||||||
{
|
uniform int _UIVertexColorAlwaysGammaSpace;
|
||||||
float2 output;
|
|
||||||
output.x = floor(uv / 4096);
|
|
||||||
output.y = uv - 4096 * output.x;
|
|
||||||
|
|
||||||
return output * 0.001953125;
|
|
||||||
}
|
|
||||||
|
|
||||||
v2f vert (appdata_t v)
|
v2f vert (appdata_t v)
|
||||||
{
|
{
|
||||||
|
|
@ -100,6 +97,10 @@ SubShader{
|
||||||
|
|
||||||
float4 vPosition = UnityPixelSnap(UnityObjectToClipPos(vert));
|
float4 vPosition = UnityPixelSnap(UnityObjectToClipPos(vert));
|
||||||
|
|
||||||
|
if (_UIVertexColorAlwaysGammaSpace && !IsGammaSpace())
|
||||||
|
{
|
||||||
|
v.color.rgb = UIGammaToLinear(v.color.rgb);
|
||||||
|
}
|
||||||
fixed4 faceColor = v.color;
|
fixed4 faceColor = v.color;
|
||||||
faceColor *= _FaceColor;
|
faceColor *= _FaceColor;
|
||||||
|
|
||||||
|
|
@ -107,13 +108,14 @@ SubShader{
|
||||||
OUT.vertex = vPosition;
|
OUT.vertex = vPosition;
|
||||||
OUT.color = faceColor;
|
OUT.color = faceColor;
|
||||||
OUT.texcoord0 = v.texcoord0;
|
OUT.texcoord0 = v.texcoord0;
|
||||||
OUT.texcoord1 = TRANSFORM_TEX(UnpackUV(v.texcoord1), _FaceTex);
|
OUT.texcoord1 = TRANSFORM_TEX(v.texcoord1, _FaceTex);
|
||||||
float2 pixelSize = vPosition.w;
|
float2 pixelSize = vPosition.w;
|
||||||
pixelSize /= abs(float2(_ScreenParams.x * UNITY_MATRIX_P[0][0], _ScreenParams.y * UNITY_MATRIX_P[1][1]));
|
pixelSize /= abs(float2(_ScreenParams.x * UNITY_MATRIX_P[0][0], _ScreenParams.y * UNITY_MATRIX_P[1][1]));
|
||||||
|
|
||||||
// Clamp _ClipRect to 16bit.
|
// Clamp _ClipRect to 16bit.
|
||||||
float4 clampedRect = clamp(_ClipRect, -2e10, 2e10);
|
const float4 clampedRect = clamp(_ClipRect, -2e10, 2e10);
|
||||||
OUT.mask = float4(vert.xy * 2 - clampedRect.xy - clampedRect.zw, 0.25 / (0.25 * half2(_MaskSoftnessX, _MaskSoftnessY) + pixelSize.xy));
|
const half2 maskSoftness = half2(max(_UIMaskSoftnessX, _MaskSoftnessX), max(_UIMaskSoftnessY, _MaskSoftnessY));
|
||||||
|
OUT.mask = float4(vert.xy * 2 - clampedRect.xy - clampedRect.zw, 0.25 / (0.25 * maskSoftness + pixelSize.xy));
|
||||||
|
|
||||||
return OUT;
|
return OUT;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -4,10 +4,10 @@ Properties {
|
||||||
_FaceTex ("Face Texture", 2D) = "white" {}
|
_FaceTex ("Face Texture", 2D) = "white" {}
|
||||||
_FaceUVSpeedX ("Face UV Speed X", Range(-5, 5)) = 0.0
|
_FaceUVSpeedX ("Face UV Speed X", Range(-5, 5)) = 0.0
|
||||||
_FaceUVSpeedY ("Face UV Speed Y", Range(-5, 5)) = 0.0
|
_FaceUVSpeedY ("Face UV Speed Y", Range(-5, 5)) = 0.0
|
||||||
[HDR]_FaceColor ("Face Color", Color) = (1,1,1,1)
|
_FaceColor ("Face Color", Color) = (1,1,1,1)
|
||||||
_FaceDilate ("Face Dilate", Range(-1,1)) = 0
|
_FaceDilate ("Face Dilate", Range(-1,1)) = 0
|
||||||
|
|
||||||
[HDR]_OutlineColor ("Outline Color", Color) = (0,0,0,1)
|
_OutlineColor ("Outline Color", Color) = (0,0,0,1)
|
||||||
_OutlineTex ("Outline Texture", 2D) = "white" {}
|
_OutlineTex ("Outline Texture", 2D) = "white" {}
|
||||||
_OutlineUVSpeedX ("Outline UV Speed X", Range(-5, 5)) = 0.0
|
_OutlineUVSpeedX ("Outline UV Speed X", Range(-5, 5)) = 0.0
|
||||||
_OutlineUVSpeedY ("Outline UV Speed Y", Range(-5, 5)) = 0.0
|
_OutlineUVSpeedY ("Outline UV Speed Y", Range(-5, 5)) = 0.0
|
||||||
|
|
@ -21,7 +21,7 @@ Properties {
|
||||||
_BevelRoundness ("Bevel Roundness", Range(0,1)) = 0
|
_BevelRoundness ("Bevel Roundness", Range(0,1)) = 0
|
||||||
|
|
||||||
_LightAngle ("Light Angle", Range(0.0, 6.2831853)) = 3.1416
|
_LightAngle ("Light Angle", Range(0.0, 6.2831853)) = 3.1416
|
||||||
[HDR]_SpecularColor ("Specular", Color) = (1,1,1,1)
|
_SpecularColor ("Specular", Color) = (1,1,1,1)
|
||||||
_SpecularPower ("Specular", Range(0,4)) = 2.0
|
_SpecularPower ("Specular", Range(0,4)) = 2.0
|
||||||
_Reflectivity ("Reflectivity", Range(5.0,15.0)) = 10
|
_Reflectivity ("Reflectivity", Range(5.0,15.0)) = 10
|
||||||
_Diffuse ("Diffuse", Range(0,1)) = 0.5
|
_Diffuse ("Diffuse", Range(0,1)) = 0.5
|
||||||
|
|
@ -37,13 +37,13 @@ Properties {
|
||||||
_EnvMatrixRotation ("Texture Rotation", vector) = (0, 0, 0, 0)
|
_EnvMatrixRotation ("Texture Rotation", vector) = (0, 0, 0, 0)
|
||||||
|
|
||||||
|
|
||||||
[HDR]_UnderlayColor ("Border Color", Color) = (0,0,0, 0.5)
|
_UnderlayColor ("Border Color", Color) = (0,0,0, 0.5)
|
||||||
_UnderlayOffsetX ("Border OffsetX", Range(-1,1)) = 0
|
_UnderlayOffsetX ("Border OffsetX", Range(-1,1)) = 0
|
||||||
_UnderlayOffsetY ("Border OffsetY", Range(-1,1)) = 0
|
_UnderlayOffsetY ("Border OffsetY", Range(-1,1)) = 0
|
||||||
_UnderlayDilate ("Border Dilate", Range(-1,1)) = 0
|
_UnderlayDilate ("Border Dilate", Range(-1,1)) = 0
|
||||||
_UnderlaySoftness ("Border Softness", Range(0,1)) = 0
|
_UnderlaySoftness ("Border Softness", Range(0,1)) = 0
|
||||||
|
|
||||||
[HDR]_GlowColor ("Color", Color) = (0, 1, 0, 0.5)
|
_GlowColor ("Color", Color) = (0, 1, 0, 0.5)
|
||||||
_GlowOffset ("Offset", Range(-1,1)) = 0
|
_GlowOffset ("Offset", Range(-1,1)) = 0
|
||||||
_GlowInner ("Inner", Range(0,1)) = 0.05
|
_GlowInner ("Inner", Range(0,1)) = 0.05
|
||||||
_GlowOuter ("Outer", Range(0,1)) = 0.05
|
_GlowOuter ("Outer", Range(0,1)) = 0.05
|
||||||
|
|
@ -127,17 +127,18 @@ SubShader {
|
||||||
#include "TMPro_Properties.cginc"
|
#include "TMPro_Properties.cginc"
|
||||||
#include "TMPro.cginc"
|
#include "TMPro.cginc"
|
||||||
|
|
||||||
struct vertex_t {
|
struct vertex_t
|
||||||
|
{
|
||||||
UNITY_VERTEX_INPUT_INSTANCE_ID
|
UNITY_VERTEX_INPUT_INSTANCE_ID
|
||||||
float4 position : POSITION;
|
float4 position : POSITION;
|
||||||
float3 normal : NORMAL;
|
float3 normal : NORMAL;
|
||||||
fixed4 color : COLOR;
|
fixed4 color : COLOR;
|
||||||
float2 texcoord0 : TEXCOORD0;
|
float4 texcoord0 : TEXCOORD0;
|
||||||
float2 texcoord1 : TEXCOORD1;
|
float2 texcoord1 : TEXCOORD1;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
struct pixel_t
|
||||||
struct pixel_t {
|
{
|
||||||
UNITY_VERTEX_INPUT_INSTANCE_ID
|
UNITY_VERTEX_INPUT_INSTANCE_ID
|
||||||
UNITY_VERTEX_OUTPUT_STEREO
|
UNITY_VERTEX_OUTPUT_STEREO
|
||||||
float4 position : SV_POSITION;
|
float4 position : SV_POSITION;
|
||||||
|
|
@ -147,16 +148,20 @@ SubShader {
|
||||||
float4 mask : TEXCOORD2; // Position in object space(xy), pixel Size(zw)
|
float4 mask : TEXCOORD2; // Position in object space(xy), pixel Size(zw)
|
||||||
float3 viewDir : TEXCOORD3;
|
float3 viewDir : TEXCOORD3;
|
||||||
|
|
||||||
#if (UNDERLAY_ON || UNDERLAY_INNER)
|
#if (UNDERLAY_ON || UNDERLAY_INNER)
|
||||||
float4 texcoord2 : TEXCOORD4; // u,v, scale, bias
|
float4 texcoord2 : TEXCOORD4; // u,v, scale, bias
|
||||||
fixed4 underlayColor : COLOR1;
|
fixed4 underlayColor : COLOR1;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
float4 textures : TEXCOORD5;
|
float4 textures : TEXCOORD5;
|
||||||
};
|
};
|
||||||
|
|
||||||
// Used by Unity internally to handle Texture Tiling and Offset.
|
// Used by Unity internally to handle Texture Tiling and Offset.
|
||||||
float4 _FaceTex_ST;
|
uniform float4 _FaceTex_ST;
|
||||||
float4 _OutlineTex_ST;
|
uniform float4 _OutlineTex_ST;
|
||||||
|
uniform float _UIMaskSoftnessX;
|
||||||
|
uniform float _UIMaskSoftnessY;
|
||||||
|
uniform int _UIVertexColorAlwaysGammaSpace;
|
||||||
|
|
||||||
pixel_t VertShader(vertex_t input)
|
pixel_t VertShader(vertex_t input)
|
||||||
{
|
{
|
||||||
|
|
@ -167,7 +172,7 @@ SubShader {
|
||||||
UNITY_TRANSFER_INSTANCE_ID(input,output);
|
UNITY_TRANSFER_INSTANCE_ID(input,output);
|
||||||
UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(output);
|
UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(output);
|
||||||
|
|
||||||
float bold = step(input.texcoord1.y, 0);
|
float bold = step(input.texcoord0.w, 0);
|
||||||
|
|
||||||
float4 vert = input.position;
|
float4 vert = input.position;
|
||||||
vert.x += _VertexOffsetX;
|
vert.x += _VertexOffsetX;
|
||||||
|
|
@ -178,7 +183,7 @@ SubShader {
|
||||||
float2 pixelSize = vPosition.w;
|
float2 pixelSize = vPosition.w;
|
||||||
pixelSize /= float2(_ScaleX, _ScaleY) * abs(mul((float2x2)UNITY_MATRIX_P, _ScreenParams.xy));
|
pixelSize /= float2(_ScaleX, _ScaleY) * abs(mul((float2x2)UNITY_MATRIX_P, _ScreenParams.xy));
|
||||||
float scale = rsqrt(dot(pixelSize, pixelSize));
|
float scale = rsqrt(dot(pixelSize, pixelSize));
|
||||||
scale *= abs(input.texcoord1.y) * _GradientScale * (_Sharpness + 1);
|
scale *= abs(input.texcoord0.w) * _GradientScale * (_Sharpness + 1);
|
||||||
if (UNITY_MATRIX_P[3][3] == 0) scale = lerp(abs(scale) * (1 - _PerspectiveFilter), scale, abs(dot(UnityObjectToWorldNormal(input.normal.xyz), normalize(WorldSpaceViewDir(vert)))));
|
if (UNITY_MATRIX_P[3][3] == 0) scale = lerp(abs(scale) * (1 - _PerspectiveFilter), scale, abs(dot(UnityObjectToWorldNormal(input.normal.xyz), normalize(WorldSpaceViewDir(vert)))));
|
||||||
|
|
||||||
float weight = lerp(_WeightNormal, _WeightBold, bold) / 4.0;
|
float weight = lerp(_WeightNormal, _WeightBold, bold) / 4.0;
|
||||||
|
|
@ -188,13 +193,13 @@ SubShader {
|
||||||
|
|
||||||
float alphaClip = (1.0 - _OutlineWidth*_ScaleRatioA - _OutlineSoftness*_ScaleRatioA);
|
float alphaClip = (1.0 - _OutlineWidth*_ScaleRatioA - _OutlineSoftness*_ScaleRatioA);
|
||||||
|
|
||||||
#if GLOW_ON
|
#if GLOW_ON
|
||||||
alphaClip = min(alphaClip, 1.0 - _GlowOffset * _ScaleRatioB - _GlowOuter * _ScaleRatioB);
|
alphaClip = min(alphaClip, 1.0 - _GlowOffset * _ScaleRatioB - _GlowOuter * _ScaleRatioB);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
alphaClip = alphaClip / 2.0 - ( .5 / scale) - weight;
|
alphaClip = alphaClip / 2.0 - ( .5 / scale) - weight;
|
||||||
|
|
||||||
#if (UNDERLAY_ON || UNDERLAY_INNER)
|
#if (UNDERLAY_ON || UNDERLAY_INNER)
|
||||||
float4 underlayColor = _UnderlayColor;
|
float4 underlayColor = _UnderlayColor;
|
||||||
underlayColor.rgb *= underlayColor.a;
|
underlayColor.rgb *= underlayColor.a;
|
||||||
|
|
||||||
|
|
@ -205,23 +210,28 @@ SubShader {
|
||||||
float x = -(_UnderlayOffsetX * _ScaleRatioC) * _GradientScale / _TextureWidth;
|
float x = -(_UnderlayOffsetX * _ScaleRatioC) * _GradientScale / _TextureWidth;
|
||||||
float y = -(_UnderlayOffsetY * _ScaleRatioC) * _GradientScale / _TextureHeight;
|
float y = -(_UnderlayOffsetY * _ScaleRatioC) * _GradientScale / _TextureHeight;
|
||||||
float2 bOffset = float2(x, y);
|
float2 bOffset = float2(x, y);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Generate UV for the Masking Texture
|
// Generate UV for the Masking Texture
|
||||||
float4 clampedRect = clamp(_ClipRect, -2e10, 2e10);
|
float4 clampedRect = clamp(_ClipRect, -2e10, 2e10);
|
||||||
float2 maskUV = (vert.xy - clampedRect.xy) / (clampedRect.zw - clampedRect.xy);
|
float2 maskUV = (vert.xy - clampedRect.xy) / (clampedRect.zw - clampedRect.xy);
|
||||||
|
|
||||||
// Support for texture tiling and offset
|
// Support for texture tiling and offset
|
||||||
float2 textureUV = UnpackUV(input.texcoord1.x);
|
float2 textureUV = input.texcoord1;
|
||||||
float2 faceUV = TRANSFORM_TEX(textureUV, _FaceTex);
|
float2 faceUV = TRANSFORM_TEX(textureUV, _FaceTex);
|
||||||
float2 outlineUV = TRANSFORM_TEX(textureUV, _OutlineTex);
|
float2 outlineUV = TRANSFORM_TEX(textureUV, _OutlineTex);
|
||||||
|
|
||||||
|
|
||||||
|
if (_UIVertexColorAlwaysGammaSpace && !IsGammaSpace())
|
||||||
|
{
|
||||||
|
input.color.rgb = UIGammaToLinear(input.color.rgb);
|
||||||
|
}
|
||||||
output.position = vPosition;
|
output.position = vPosition;
|
||||||
output.color = input.color;
|
output.color = input.color;
|
||||||
output.atlas = input.texcoord0;
|
output.atlas = input.texcoord0;
|
||||||
output.param = float4(alphaClip, scale, bias, weight);
|
output.param = float4(alphaClip, scale, bias, weight);
|
||||||
output.mask = half4(vert.xy * 2 - clampedRect.xy - clampedRect.zw, 0.25 / (0.25 * half2(_MaskSoftnessX, _MaskSoftnessY) + pixelSize.xy));
|
const half2 maskSoftness = half2(max(_UIMaskSoftnessX, _MaskSoftnessX), max(_UIMaskSoftnessY, _MaskSoftnessY));
|
||||||
|
output.mask = half4(vert.xy * 2 - clampedRect.xy - clampedRect.zw, 0.25 / (0.25 * maskSoftness + pixelSize.xy));
|
||||||
output.viewDir = mul((float3x3)_EnvMatrix, _WorldSpaceCameraPos.xyz - mul(unity_ObjectToWorld, vert).xyz);
|
output.viewDir = mul((float3x3)_EnvMatrix, _WorldSpaceCameraPos.xyz - mul(unity_ObjectToWorld, vert).xyz);
|
||||||
#if (UNDERLAY_ON || UNDERLAY_INNER)
|
#if (UNDERLAY_ON || UNDERLAY_INNER)
|
||||||
output.texcoord2 = float4(input.texcoord0 + bOffset, bScale, bBias);
|
output.texcoord2 = float4(input.texcoord0 + bOffset, bScale, bBias);
|
||||||
|
|
@ -239,9 +249,9 @@ SubShader {
|
||||||
|
|
||||||
float c = tex2D(_MainTex, input.atlas).a;
|
float c = tex2D(_MainTex, input.atlas).a;
|
||||||
|
|
||||||
#ifndef UNDERLAY_ON
|
#ifndef UNDERLAY_ON
|
||||||
clip(c - input.param.x);
|
clip(c - input.param.x);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
float scale = input.param.y;
|
float scale = input.param.y;
|
||||||
float bias = input.param.z;
|
float bias = input.param.z;
|
||||||
|
|
@ -261,7 +271,7 @@ SubShader {
|
||||||
|
|
||||||
faceColor = GetColor(sd, faceColor, outlineColor, outline, softness);
|
faceColor = GetColor(sd, faceColor, outlineColor, outline, softness);
|
||||||
|
|
||||||
#if BEVEL_ON
|
#if BEVEL_ON
|
||||||
float3 dxy = float3(0.5 / _TextureWidth, 0.5 / _TextureHeight, 0);
|
float3 dxy = float3(0.5 / _TextureWidth, 0.5 / _TextureHeight, 0);
|
||||||
float3 n = GetSurfaceNormal(input.atlas, weight, dxy);
|
float3 n = GetSurfaceNormal(input.atlas, weight, dxy);
|
||||||
|
|
||||||
|
|
@ -278,36 +288,35 @@ SubShader {
|
||||||
|
|
||||||
fixed4 reflcol = texCUBE(_Cube, reflect(input.viewDir, -n));
|
fixed4 reflcol = texCUBE(_Cube, reflect(input.viewDir, -n));
|
||||||
faceColor.rgb += reflcol.rgb * lerp(_ReflectFaceColor.rgb, _ReflectOutlineColor.rgb, saturate(sd + outline * 0.5)) * faceColor.a;
|
faceColor.rgb += reflcol.rgb * lerp(_ReflectFaceColor.rgb, _ReflectOutlineColor.rgb, saturate(sd + outline * 0.5)) * faceColor.a;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if UNDERLAY_ON
|
#if UNDERLAY_ON
|
||||||
float d = tex2D(_MainTex, input.texcoord2.xy).a * input.texcoord2.z;
|
float d = tex2D(_MainTex, input.texcoord2.xy).a * input.texcoord2.z;
|
||||||
faceColor += input.underlayColor * saturate(d - input.texcoord2.w) * (1 - faceColor.a);
|
faceColor += input.underlayColor * saturate(d - input.texcoord2.w) * (1 - faceColor.a);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if UNDERLAY_INNER
|
#if UNDERLAY_INNER
|
||||||
float d = tex2D(_MainTex, input.texcoord2.xy).a * input.texcoord2.z;
|
float d = tex2D(_MainTex, input.texcoord2.xy).a * input.texcoord2.z;
|
||||||
faceColor += input.underlayColor * (1 - saturate(d - input.texcoord2.w)) * saturate(1 - sd) * (1 - faceColor.a);
|
faceColor += input.underlayColor * (1 - saturate(d - input.texcoord2.w)) * saturate(1 - sd) * (1 - faceColor.a);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if GLOW_ON
|
#if GLOW_ON
|
||||||
float4 glowColor = GetGlowColor(sd, scale);
|
float4 glowColor = GetGlowColor(sd, scale);
|
||||||
faceColor.rgb += glowColor.rgb * glowColor.a;
|
faceColor.rgb += glowColor.rgb * glowColor.a;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Alternative implementation to UnityGet2DClipping with support for softness.
|
// Alternative implementation to UnityGet2DClipping with support for softness.
|
||||||
#if UNITY_UI_CLIP_RECT
|
#if UNITY_UI_CLIP_RECT
|
||||||
half2 m = saturate((_ClipRect.zw - _ClipRect.xy - abs(input.mask.xy)) * input.mask.zw);
|
half2 m = saturate((_ClipRect.zw - _ClipRect.xy - abs(input.mask.xy)) * input.mask.zw);
|
||||||
faceColor *= m.x * m.y;
|
faceColor *= m.x * m.y;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if UNITY_UI_ALPHACLIP
|
#if UNITY_UI_ALPHACLIP
|
||||||
clip(faceColor.a - 0.001);
|
clip(faceColor.a - 0.001);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
return faceColor * input.color.a;
|
return faceColor * input.color.a;
|
||||||
}
|
}
|
||||||
|
|
||||||
ENDCG
|
ENDCG
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -4,10 +4,10 @@ Properties {
|
||||||
_FaceTex ("Face Texture", 2D) = "white" {}
|
_FaceTex ("Face Texture", 2D) = "white" {}
|
||||||
_FaceUVSpeedX ("Face UV Speed X", Range(-5, 5)) = 0.0
|
_FaceUVSpeedX ("Face UV Speed X", Range(-5, 5)) = 0.0
|
||||||
_FaceUVSpeedY ("Face UV Speed Y", Range(-5, 5)) = 0.0
|
_FaceUVSpeedY ("Face UV Speed Y", Range(-5, 5)) = 0.0
|
||||||
[HDR]_FaceColor ("Face Color", Color) = (1,1,1,1)
|
_FaceColor ("Face Color", Color) = (1,1,1,1)
|
||||||
_FaceDilate ("Face Dilate", Range(-1,1)) = 0
|
_FaceDilate ("Face Dilate", Range(-1,1)) = 0
|
||||||
|
|
||||||
[HDR]_OutlineColor ("Outline Color", Color) = (0,0,0,1)
|
_OutlineColor ("Outline Color", Color) = (0,0,0,1)
|
||||||
_OutlineTex ("Outline Texture", 2D) = "white" {}
|
_OutlineTex ("Outline Texture", 2D) = "white" {}
|
||||||
_OutlineUVSpeedX ("Outline UV Speed X", Range(-5, 5)) = 0.0
|
_OutlineUVSpeedX ("Outline UV Speed X", Range(-5, 5)) = 0.0
|
||||||
_OutlineUVSpeedY ("Outline UV Speed Y", Range(-5, 5)) = 0.0
|
_OutlineUVSpeedY ("Outline UV Speed Y", Range(-5, 5)) = 0.0
|
||||||
|
|
@ -21,7 +21,7 @@ Properties {
|
||||||
_BevelRoundness ("Bevel Roundness", Range(0,1)) = 0
|
_BevelRoundness ("Bevel Roundness", Range(0,1)) = 0
|
||||||
|
|
||||||
_LightAngle ("Light Angle", Range(0.0, 6.2831853)) = 3.1416
|
_LightAngle ("Light Angle", Range(0.0, 6.2831853)) = 3.1416
|
||||||
[HDR]_SpecularColor ("Specular", Color) = (1,1,1,1)
|
_SpecularColor ("Specular", Color) = (1,1,1,1)
|
||||||
_SpecularPower ("Specular", Range(0,4)) = 2.0
|
_SpecularPower ("Specular", Range(0,4)) = 2.0
|
||||||
_Reflectivity ("Reflectivity", Range(5.0,15.0)) = 10
|
_Reflectivity ("Reflectivity", Range(5.0,15.0)) = 10
|
||||||
_Diffuse ("Diffuse", Range(0,1)) = 0.5
|
_Diffuse ("Diffuse", Range(0,1)) = 0.5
|
||||||
|
|
@ -37,13 +37,13 @@ Properties {
|
||||||
_EnvMatrixRotation ("Texture Rotation", vector) = (0, 0, 0, 0)
|
_EnvMatrixRotation ("Texture Rotation", vector) = (0, 0, 0, 0)
|
||||||
|
|
||||||
|
|
||||||
[HDR]_UnderlayColor ("Border Color", Color) = (0,0,0, 0.5)
|
_UnderlayColor ("Border Color", Color) = (0,0,0, 0.5)
|
||||||
_UnderlayOffsetX ("Border OffsetX", Range(-1,1)) = 0
|
_UnderlayOffsetX ("Border OffsetX", Range(-1,1)) = 0
|
||||||
_UnderlayOffsetY ("Border OffsetY", Range(-1,1)) = 0
|
_UnderlayOffsetY ("Border OffsetY", Range(-1,1)) = 0
|
||||||
_UnderlayDilate ("Border Dilate", Range(-1,1)) = 0
|
_UnderlayDilate ("Border Dilate", Range(-1,1)) = 0
|
||||||
_UnderlaySoftness ("Border Softness", Range(0,1)) = 0
|
_UnderlaySoftness ("Border Softness", Range(0,1)) = 0
|
||||||
|
|
||||||
[HDR]_GlowColor ("Color", Color) = (0, 1, 0, 0.5)
|
_GlowColor ("Color", Color) = (0, 1, 0, 0.5)
|
||||||
_GlowOffset ("Offset", Range(-1,1)) = 0
|
_GlowOffset ("Offset", Range(-1,1)) = 0
|
||||||
_GlowInner ("Inner", Range(0,1)) = 0.05
|
_GlowInner ("Inner", Range(0,1)) = 0.05
|
||||||
_GlowOuter ("Outer", Range(0,1)) = 0.05
|
_GlowOuter ("Outer", Range(0,1)) = 0.05
|
||||||
|
|
@ -109,7 +109,8 @@ SubShader {
|
||||||
Blend One OneMinusSrcAlpha
|
Blend One OneMinusSrcAlpha
|
||||||
ColorMask[_ColorMask]
|
ColorMask[_ColorMask]
|
||||||
|
|
||||||
Pass {
|
Pass
|
||||||
|
{
|
||||||
CGPROGRAM
|
CGPROGRAM
|
||||||
#pragma target 3.0
|
#pragma target 3.0
|
||||||
#pragma vertex VertShader
|
#pragma vertex VertShader
|
||||||
|
|
@ -127,17 +128,18 @@ SubShader {
|
||||||
#include "TMPro_Properties.cginc"
|
#include "TMPro_Properties.cginc"
|
||||||
#include "TMPro.cginc"
|
#include "TMPro.cginc"
|
||||||
|
|
||||||
struct vertex_t {
|
struct vertex_t
|
||||||
|
{
|
||||||
UNITY_VERTEX_INPUT_INSTANCE_ID
|
UNITY_VERTEX_INPUT_INSTANCE_ID
|
||||||
float4 position : POSITION;
|
float4 position : POSITION;
|
||||||
float3 normal : NORMAL;
|
float3 normal : NORMAL;
|
||||||
float4 color : COLOR;
|
float4 color : COLOR;
|
||||||
float2 texcoord0 : TEXCOORD0;
|
float4 texcoord0 : TEXCOORD0;
|
||||||
float2 texcoord1 : TEXCOORD1;
|
float2 texcoord1 : TEXCOORD1;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
struct pixel_t
|
||||||
struct pixel_t {
|
{
|
||||||
UNITY_VERTEX_INPUT_INSTANCE_ID
|
UNITY_VERTEX_INPUT_INSTANCE_ID
|
||||||
UNITY_VERTEX_OUTPUT_STEREO
|
UNITY_VERTEX_OUTPUT_STEREO
|
||||||
float4 position : SV_POSITION;
|
float4 position : SV_POSITION;
|
||||||
|
|
@ -147,18 +149,23 @@ SubShader {
|
||||||
float2 mask : TEXCOORD2; // Position in object space(xy)
|
float2 mask : TEXCOORD2; // Position in object space(xy)
|
||||||
float3 viewDir : TEXCOORD3;
|
float3 viewDir : TEXCOORD3;
|
||||||
|
|
||||||
#if (UNDERLAY_ON || UNDERLAY_INNER)
|
#if (UNDERLAY_ON || UNDERLAY_INNER)
|
||||||
float2 texcoord2 : TEXCOORD4;
|
float2 texcoord2 : TEXCOORD4;
|
||||||
float4 underlayColor : COLOR1;
|
float4 underlayColor : COLOR1;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
float4 textures : TEXCOORD5;
|
float4 textures : TEXCOORD5;
|
||||||
};
|
};
|
||||||
|
|
||||||
// Used by Unity internally to handle Texture Tiling and Offset.
|
// Used by Unity internally to handle Texture Tiling and Offset.
|
||||||
float4 _FaceTex_ST;
|
float4 _FaceTex_ST;
|
||||||
float4 _OutlineTex_ST;
|
float4 _OutlineTex_ST;
|
||||||
|
float _UIMaskSoftnessX;
|
||||||
|
float _UIMaskSoftnessY;
|
||||||
|
int _UIVertexColorAlwaysGammaSpace;
|
||||||
|
|
||||||
float4 SRGBToLinear(float4 rgba) {
|
float4 SRGBToLinear(float4 rgba)
|
||||||
|
{
|
||||||
return float4(lerp(rgba.rgb / 12.92f, pow((rgba.rgb + 0.055f) / 1.055f, 2.4f), step(0.04045f, rgba.rgb)), rgba.a);
|
return float4(lerp(rgba.rgb / 12.92f, pow((rgba.rgb + 0.055f) / 1.055f, 2.4f), step(0.04045f, rgba.rgb)), rgba.a);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -171,7 +178,7 @@ SubShader {
|
||||||
UNITY_TRANSFER_INSTANCE_ID(input,output);
|
UNITY_TRANSFER_INSTANCE_ID(input,output);
|
||||||
UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(output);
|
UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(output);
|
||||||
|
|
||||||
float bold = step(input.texcoord1.y, 0);
|
float bold = step(input.texcoord0.w, 0);
|
||||||
|
|
||||||
float4 vert = input.position;
|
float4 vert = input.position;
|
||||||
vert.x += _VertexOffsetX;
|
vert.x += _VertexOffsetX;
|
||||||
|
|
@ -182,27 +189,31 @@ SubShader {
|
||||||
float weight = lerp(_WeightNormal, _WeightBold, bold) / 4.0;
|
float weight = lerp(_WeightNormal, _WeightBold, bold) / 4.0;
|
||||||
weight = (weight + _FaceDilate) * _ScaleRatioA * 0.5;
|
weight = (weight + _FaceDilate) * _ScaleRatioA * 0.5;
|
||||||
|
|
||||||
#if (UNDERLAY_ON || UNDERLAY_INNER)
|
#if (UNDERLAY_ON || UNDERLAY_INNER)
|
||||||
float4 underlayColor = _UnderlayColor;
|
float4 underlayColor = _UnderlayColor;
|
||||||
underlayColor.rgb *= underlayColor.a;
|
underlayColor.rgb *= underlayColor.a;
|
||||||
|
|
||||||
float x = -(_UnderlayOffsetX * _ScaleRatioC) * _GradientScale / _TextureWidth;
|
float x = -(_UnderlayOffsetX * _ScaleRatioC) * _GradientScale / _TextureWidth;
|
||||||
float y = -(_UnderlayOffsetY * _ScaleRatioC) * _GradientScale / _TextureHeight;
|
float y = -(_UnderlayOffsetY * _ScaleRatioC) * _GradientScale / _TextureHeight;
|
||||||
float2 bOffset = float2(x, y);
|
float2 bOffset = float2(x, y);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Generate UV for the Masking Texture
|
// Generate UV for the Masking Texture
|
||||||
float4 clampedRect = clamp(_ClipRect, -2e10, 2e10);
|
float4 clampedRect = clamp(_ClipRect, -2e10, 2e10);
|
||||||
|
|
||||||
// Support for texture tiling and offset
|
// Support for texture tiling and offset
|
||||||
float2 textureUV = UnpackUV(input.texcoord1.x);
|
float2 textureUV = input.texcoord1;
|
||||||
float2 faceUV = TRANSFORM_TEX(textureUV, _FaceTex);
|
float2 faceUV = TRANSFORM_TEX(textureUV, _FaceTex);
|
||||||
float2 outlineUV = TRANSFORM_TEX(textureUV, _OutlineTex);
|
float2 outlineUV = TRANSFORM_TEX(textureUV, _OutlineTex);
|
||||||
|
|
||||||
|
if (_UIVertexColorAlwaysGammaSpace && !IsGammaSpace())
|
||||||
|
{
|
||||||
|
input.color.rgb = UIGammaToLinear(input.color.rgb);
|
||||||
|
}
|
||||||
float4 color = input.color;
|
float4 color = input.color;
|
||||||
#if (FORCE_LINEAR && !UNITY_COLORSPACE_GAMMA)
|
#if (FORCE_LINEAR && !UNITY_COLORSPACE_GAMMA)
|
||||||
color = SRGBToLinear(input.color);
|
color = SRGBToLinear(input.color);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
output.position = vPosition;
|
output.position = vPosition;
|
||||||
output.color = color;
|
output.color = color;
|
||||||
|
|
@ -210,10 +221,10 @@ SubShader {
|
||||||
output.weight = weight;
|
output.weight = weight;
|
||||||
output.mask = half2(vert.xy * 2 - clampedRect.xy - clampedRect.zw);
|
output.mask = half2(vert.xy * 2 - clampedRect.xy - clampedRect.zw);
|
||||||
output.viewDir = mul((float3x3)_EnvMatrix, _WorldSpaceCameraPos.xyz - mul(unity_ObjectToWorld, vert).xyz);
|
output.viewDir = mul((float3x3)_EnvMatrix, _WorldSpaceCameraPos.xyz - mul(unity_ObjectToWorld, vert).xyz);
|
||||||
#if (UNDERLAY_ON || UNDERLAY_INNER)
|
#if (UNDERLAY_ON || UNDERLAY_INNER)
|
||||||
output.texcoord2 = input.texcoord0 + bOffset;
|
output.texcoord2 = input.texcoord0 + bOffset;
|
||||||
output.underlayColor = underlayColor;
|
output.underlayColor = underlayColor;
|
||||||
#endif
|
#endif
|
||||||
output.textures = float4(faceUV, outlineUV);
|
output.textures = float4(faceUV, outlineUV);
|
||||||
|
|
||||||
return output;
|
return output;
|
||||||
|
|
@ -226,9 +237,9 @@ SubShader {
|
||||||
|
|
||||||
float c = tex2D(_MainTex, input.atlas).a;
|
float c = tex2D(_MainTex, input.atlas).a;
|
||||||
|
|
||||||
float2 pixelSize = float2(ddx(input.atlas.y), ddy(input.atlas.y));
|
float pixelSize = abs(ddx(input.atlas.y)) + abs(ddy(input.atlas.y));
|
||||||
pixelSize *= _TextureWidth * .75;
|
pixelSize *= _TextureHeight * 0.75;
|
||||||
float scale = rsqrt(dot(pixelSize, pixelSize)) * _GradientScale * (_Sharpness + 1);
|
float scale = 1 / pixelSize * _GradientScale * (_Sharpness + 1);
|
||||||
|
|
||||||
float weight = input.weight;
|
float weight = input.weight;
|
||||||
float bias = (.5 - weight) + (.5 / scale);
|
float bias = (.5 - weight) + (.5 / scale);
|
||||||
|
|
@ -247,7 +258,7 @@ SubShader {
|
||||||
|
|
||||||
faceColor = GetColor(sd, faceColor, outlineColor, outline, softness);
|
faceColor = GetColor(sd, faceColor, outlineColor, outline, softness);
|
||||||
|
|
||||||
#if BEVEL_ON
|
#if BEVEL_ON
|
||||||
float3 dxy = float3(0.5 / _TextureWidth, 0.5 / _TextureHeight, 0);
|
float3 dxy = float3(0.5 / _TextureWidth, 0.5 / _TextureHeight, 0);
|
||||||
float3 n = GetSurfaceNormal(input.atlas, weight, dxy);
|
float3 n = GetSurfaceNormal(input.atlas, weight, dxy);
|
||||||
|
|
||||||
|
|
@ -264,45 +275,45 @@ SubShader {
|
||||||
|
|
||||||
fixed4 reflcol = texCUBE(_Cube, reflect(input.viewDir, -n));
|
fixed4 reflcol = texCUBE(_Cube, reflect(input.viewDir, -n));
|
||||||
faceColor.rgb += reflcol.rgb * lerp(_ReflectFaceColor.rgb, _ReflectOutlineColor.rgb, saturate(sd + outline * 0.5)) * faceColor.a;
|
faceColor.rgb += reflcol.rgb * lerp(_ReflectFaceColor.rgb, _ReflectOutlineColor.rgb, saturate(sd + outline * 0.5)) * faceColor.a;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if (UNDERLAY_ON || UNDERLAY_INNER)
|
#if (UNDERLAY_ON || UNDERLAY_INNER)
|
||||||
float bScale = scale;
|
float bScale = scale;
|
||||||
bScale /= 1 + ((_UnderlaySoftness * _ScaleRatioC) * bScale);
|
bScale /= 1 + ((_UnderlaySoftness * _ScaleRatioC) * bScale);
|
||||||
float bBias = (0.5 - weight) * bScale - 0.5 - ((_UnderlayDilate * _ScaleRatioC) * 0.5 * bScale);
|
float bBias = (0.5 - weight) * bScale - 0.5 - ((_UnderlayDilate * _ScaleRatioC) * 0.5 * bScale);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if UNDERLAY_ON
|
#if UNDERLAY_ON
|
||||||
float d = tex2D(_MainTex, input.texcoord2.xy).a * bScale;
|
float d = tex2D(_MainTex, input.texcoord2.xy).a * bScale;
|
||||||
faceColor += input.underlayColor * saturate(d - bBias) * (1 - faceColor.a);
|
faceColor += input.underlayColor * saturate(d - bBias) * (1 - faceColor.a);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if UNDERLAY_INNER
|
#if UNDERLAY_INNER
|
||||||
float d = tex2D(_MainTex, input.texcoord2.xy).a * bScale;
|
float d = tex2D(_MainTex, input.texcoord2.xy).a * bScale;
|
||||||
faceColor += input.underlayColor * (1 - saturate(d - bBias)) * saturate(1 - sd) * (1 - faceColor.a);
|
faceColor += input.underlayColor * (1 - saturate(d - bBias)) * saturate(1 - sd) * (1 - faceColor.a);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if GLOW_ON
|
#if GLOW_ON
|
||||||
float4 glowColor = GetGlowColor(sd, scale);
|
float4 glowColor = GetGlowColor(sd, scale);
|
||||||
faceColor.rgb += glowColor.rgb * glowColor.a;
|
faceColor.rgb += glowColor.rgb * glowColor.a;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Alternative implementation to UnityGet2DClipping with support for softness.
|
// Alternative implementation to UnityGet2DClipping with support for softness.
|
||||||
#if UNITY_UI_CLIP_RECT
|
#if UNITY_UI_CLIP_RECT
|
||||||
float2 maskZW = 0.25 / (0.25 * half2(_MaskSoftnessX, _MaskSoftnessY) + (1 / scale));
|
half2 maskSoftness = half2(max(_UIMaskSoftnessX, _MaskSoftnessX), max(_UIMaskSoftnessY, _MaskSoftnessY));
|
||||||
|
float2 maskZW = 0.25 / (0.25 * maskSoftness + 1 / scale);
|
||||||
half2 m = saturate((_ClipRect.zw - _ClipRect.xy - abs(input.mask.xy)) * maskZW);
|
half2 m = saturate((_ClipRect.zw - _ClipRect.xy - abs(input.mask.xy)) * maskZW);
|
||||||
faceColor *= m.x * m.y;
|
faceColor *= m.x * m.y;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if UNITY_UI_ALPHACLIP
|
#if UNITY_UI_ALPHACLIP
|
||||||
clip(faceColor.a - 0.001);
|
clip(faceColor.a - 0.001);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
return faceColor * input.color.a;
|
return faceColor * input.color.a;
|
||||||
}
|
|
||||||
|
|
||||||
ENDCG
|
|
||||||
}
|
}
|
||||||
|
ENDCG
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Fallback "TextMeshPro/Mobile/Distance Field"
|
Fallback "TextMeshPro/Mobile/Distance Field"
|
||||||
|
|
|
||||||
|
|
@ -6,14 +6,14 @@
|
||||||
Shader "TextMeshPro/Mobile/Distance Field - Masking" {
|
Shader "TextMeshPro/Mobile/Distance Field - Masking" {
|
||||||
|
|
||||||
Properties {
|
Properties {
|
||||||
[HDR]_FaceColor ("Face Color", Color) = (1,1,1,1)
|
_FaceColor ("Face Color", Color) = (1,1,1,1)
|
||||||
_FaceDilate ("Face Dilate", Range(-1,1)) = 0
|
_FaceDilate ("Face Dilate", Range(-1,1)) = 0
|
||||||
|
|
||||||
[HDR]_OutlineColor ("Outline Color", Color) = (0,0,0,1)
|
_OutlineColor ("Outline Color", Color) = (0,0,0,1)
|
||||||
_OutlineWidth ("Outline Thickness", Range(0,1)) = 0
|
_OutlineWidth ("Outline Thickness", Range(0,1)) = 0
|
||||||
_OutlineSoftness ("Outline Softness", Range(0,1)) = 0
|
_OutlineSoftness ("Outline Softness", Range(0,1)) = 0
|
||||||
|
|
||||||
[HDR]_UnderlayColor ("Border Color", Color) = (0,0,0,.5)
|
_UnderlayColor ("Border Color", Color) = (0,0,0,.5)
|
||||||
_UnderlayOffsetX ("Border OffsetX", Range(-1,1)) = 0
|
_UnderlayOffsetX ("Border OffsetX", Range(-1,1)) = 0
|
||||||
_UnderlayOffsetY ("Border OffsetY", Range(-1,1)) = 0
|
_UnderlayOffsetY ("Border OffsetY", Range(-1,1)) = 0
|
||||||
_UnderlayDilate ("Border Dilate", Range(-1,1)) = 0
|
_UnderlayDilate ("Border Dilate", Range(-1,1)) = 0
|
||||||
|
|
@ -99,35 +99,41 @@ SubShader {
|
||||||
#include "UnityUI.cginc"
|
#include "UnityUI.cginc"
|
||||||
#include "TMPro_Properties.cginc"
|
#include "TMPro_Properties.cginc"
|
||||||
|
|
||||||
struct vertex_t {
|
struct vertex_t
|
||||||
|
{
|
||||||
float4 vertex : POSITION;
|
float4 vertex : POSITION;
|
||||||
float3 normal : NORMAL;
|
float3 normal : NORMAL;
|
||||||
fixed4 color : COLOR;
|
fixed4 color : COLOR;
|
||||||
float2 texcoord0 : TEXCOORD0;
|
float4 texcoord0 : TEXCOORD0;
|
||||||
float2 texcoord1 : TEXCOORD1;
|
float2 texcoord1 : TEXCOORD1;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct pixel_t {
|
struct pixel_t
|
||||||
|
{
|
||||||
float4 vertex : SV_POSITION;
|
float4 vertex : SV_POSITION;
|
||||||
fixed4 faceColor : COLOR;
|
fixed4 faceColor : COLOR;
|
||||||
fixed4 outlineColor : COLOR1;
|
fixed4 outlineColor : COLOR1;
|
||||||
float4 texcoord0 : TEXCOORD0; // Texture UV, Mask UV
|
float4 texcoord0 : TEXCOORD0; // Texture UV, Mask UV
|
||||||
half4 param : TEXCOORD1; // Scale(x), BiasIn(y), BiasOut(z), Bias(w)
|
half4 param : TEXCOORD1; // Scale(x), BiasIn(y), BiasOut(z), Bias(w)
|
||||||
half4 mask : TEXCOORD2; // Position in clip space(xy), Softness(zw)
|
half4 mask : TEXCOORD2; // Position in clip space(xy), Softness(zw)
|
||||||
#if (UNDERLAY_ON | UNDERLAY_INNER)
|
|
||||||
|
#if (UNDERLAY_ON | UNDERLAY_INNER)
|
||||||
float4 texcoord1 : TEXCOORD3; // Texture UV, alpha, reserved
|
float4 texcoord1 : TEXCOORD3; // Texture UV, alpha, reserved
|
||||||
half2 underlayParam : TEXCOORD4; // Scale(x), Bias(y)
|
half2 underlayParam : TEXCOORD4; // Scale(x), Bias(y)
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
float _MaskWipeControl;
|
float _MaskWipeControl;
|
||||||
float _MaskEdgeSoftness;
|
float _MaskEdgeSoftness;
|
||||||
fixed4 _MaskEdgeColor;
|
fixed4 _MaskEdgeColor;
|
||||||
bool _MaskInverse;
|
bool _MaskInverse;
|
||||||
|
float _UIMaskSoftnessX;
|
||||||
|
float _UIMaskSoftnessY;
|
||||||
|
int _UIVertexColorAlwaysGammaSpace;
|
||||||
|
|
||||||
pixel_t VertShader(vertex_t input)
|
pixel_t VertShader(vertex_t input)
|
||||||
{
|
{
|
||||||
float bold = step(input.texcoord1.y, 0);
|
float bold = step(input.texcoord0.w, 0);
|
||||||
|
|
||||||
float4 vert = input.vertex;
|
float4 vert = input.vertex;
|
||||||
vert.x += _VertexOffsetX;
|
vert.x += _VertexOffsetX;
|
||||||
|
|
@ -138,7 +144,7 @@ SubShader {
|
||||||
pixelSize /= float2(_ScaleX, _ScaleY) * abs(mul((float2x2)UNITY_MATRIX_P, _ScreenParams.xy));
|
pixelSize /= float2(_ScaleX, _ScaleY) * abs(mul((float2x2)UNITY_MATRIX_P, _ScreenParams.xy));
|
||||||
|
|
||||||
float scale = rsqrt(dot(pixelSize, pixelSize));
|
float scale = rsqrt(dot(pixelSize, pixelSize));
|
||||||
scale *= abs(input.texcoord1.y) * _GradientScale * (_Sharpness + 1);
|
scale *= abs(input.texcoord0.w) * _GradientScale * (_Sharpness + 1);
|
||||||
if(UNITY_MATRIX_P[3][3] == 0) scale = lerp(abs(scale) * (1 - _PerspectiveFilter), scale, abs(dot(UnityObjectToWorldNormal(input.normal.xyz), normalize(WorldSpaceViewDir(vert)))));
|
if(UNITY_MATRIX_P[3][3] == 0) scale = lerp(abs(scale) * (1 - _PerspectiveFilter), scale, abs(dot(UnityObjectToWorldNormal(input.normal.xyz), normalize(WorldSpaceViewDir(vert)))));
|
||||||
|
|
||||||
float weight = lerp(_WeightNormal, _WeightBold, bold) / 4.0;
|
float weight = lerp(_WeightNormal, _WeightBold, bold) / 4.0;
|
||||||
|
|
@ -150,6 +156,10 @@ SubShader {
|
||||||
float bias = (0.5 - weight) * scale - 0.5;
|
float bias = (0.5 - weight) * scale - 0.5;
|
||||||
float outline = _OutlineWidth * _ScaleRatioA * 0.5 * scale;
|
float outline = _OutlineWidth * _ScaleRatioA * 0.5 * scale;
|
||||||
|
|
||||||
|
if (_UIVertexColorAlwaysGammaSpace && !IsGammaSpace())
|
||||||
|
{
|
||||||
|
input.color.rgb = UIGammaToLinear(input.color.rgb);
|
||||||
|
}
|
||||||
float opacity = input.color.a;
|
float opacity = input.color.a;
|
||||||
#if (UNDERLAY_ON | UNDERLAY_INNER)
|
#if (UNDERLAY_ON | UNDERLAY_INNER)
|
||||||
opacity = 1.0;
|
opacity = 1.0;
|
||||||
|
|
@ -163,7 +173,7 @@ SubShader {
|
||||||
outlineColor.rgb *= outlineColor.a;
|
outlineColor.rgb *= outlineColor.a;
|
||||||
outlineColor = lerp(faceColor, outlineColor, sqrt(min(1.0, (outline * 2))));
|
outlineColor = lerp(faceColor, outlineColor, sqrt(min(1.0, (outline * 2))));
|
||||||
|
|
||||||
#if (UNDERLAY_ON | UNDERLAY_INNER)
|
#if (UNDERLAY_ON | UNDERLAY_INNER)
|
||||||
|
|
||||||
layerScale /= 1 + ((_UnderlaySoftness * _ScaleRatioC) * layerScale);
|
layerScale /= 1 + ((_UnderlaySoftness * _ScaleRatioC) * layerScale);
|
||||||
float layerBias = (.5 - weight) * layerScale - .5 - ((_UnderlayDilate * _ScaleRatioC) * .5 * layerScale);
|
float layerBias = (.5 - weight) * layerScale - .5 - ((_UnderlayDilate * _ScaleRatioC) * .5 * layerScale);
|
||||||
|
|
@ -171,11 +181,12 @@ SubShader {
|
||||||
float x = -(_UnderlayOffsetX * _ScaleRatioC) * _GradientScale / _TextureWidth;
|
float x = -(_UnderlayOffsetX * _ScaleRatioC) * _GradientScale / _TextureWidth;
|
||||||
float y = -(_UnderlayOffsetY * _ScaleRatioC) * _GradientScale / _TextureHeight;
|
float y = -(_UnderlayOffsetY * _ScaleRatioC) * _GradientScale / _TextureHeight;
|
||||||
float2 layerOffset = float2(x, y);
|
float2 layerOffset = float2(x, y);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Generate UV for the Masking Texture
|
// Generate UV for the Masking Texture
|
||||||
float4 clampedRect = clamp(_ClipRect, -2e10, 2e10);
|
float4 clampedRect = clamp(_ClipRect, -2e10, 2e10);
|
||||||
float2 maskUV = (vert.xy - clampedRect.xy) / (clampedRect.zw - clampedRect.xy);
|
float2 maskUV = (vert.xy - clampedRect.xy) / (clampedRect.zw - clampedRect.xy);
|
||||||
|
const half2 maskSoftness = half2(max(_UIMaskSoftnessX, _MaskSoftnessX), max(_UIMaskSoftnessY, _MaskSoftnessY));
|
||||||
|
|
||||||
// Structure for pixel shader
|
// Structure for pixel shader
|
||||||
pixel_t output = {
|
pixel_t output = {
|
||||||
|
|
@ -184,11 +195,11 @@ SubShader {
|
||||||
outlineColor,
|
outlineColor,
|
||||||
float4(input.texcoord0.x, input.texcoord0.y, maskUV.x, maskUV.y),
|
float4(input.texcoord0.x, input.texcoord0.y, maskUV.x, maskUV.y),
|
||||||
half4(scale, bias - outline, bias + outline, bias),
|
half4(scale, bias - outline, bias + outline, bias),
|
||||||
half4(vert.xy * 2 - clampedRect.xy - clampedRect.zw, 0.25 / (0.25 * half2(_MaskSoftnessX, _MaskSoftnessY) + pixelSize.xy)),
|
half4(vert.xy * 2 - clampedRect.xy - clampedRect.zw, 0.25 / (0.25 * maskSoftness + pixelSize.xy)),
|
||||||
#if (UNDERLAY_ON | UNDERLAY_INNER)
|
#if (UNDERLAY_ON | UNDERLAY_INNER)
|
||||||
float4(input.texcoord0 + layerOffset, input.color.a, 0),
|
float4(input.texcoord0 + layerOffset, input.color.a, 0),
|
||||||
half2(layerScale, layerBias),
|
half2(layerScale, layerBias),
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
return output;
|
return output;
|
||||||
|
|
@ -201,41 +212,41 @@ SubShader {
|
||||||
half d = tex2D(_MainTex, input.texcoord0.xy).a * input.param.x;
|
half d = tex2D(_MainTex, input.texcoord0.xy).a * input.param.x;
|
||||||
half4 c = input.faceColor * saturate(d - input.param.w);
|
half4 c = input.faceColor * saturate(d - input.param.w);
|
||||||
|
|
||||||
#ifdef OUTLINE_ON
|
#ifdef OUTLINE_ON
|
||||||
c = lerp(input.outlineColor, input.faceColor, saturate(d - input.param.z));
|
c = lerp(input.outlineColor, input.faceColor, saturate(d - input.param.z));
|
||||||
c *= saturate(d - input.param.y);
|
c *= saturate(d - input.param.y);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if UNDERLAY_ON
|
#if UNDERLAY_ON
|
||||||
d = tex2D(_MainTex, input.texcoord1.xy).a * input.underlayParam.x;
|
d = tex2D(_MainTex, input.texcoord1.xy).a * input.underlayParam.x;
|
||||||
c += float4(_UnderlayColor.rgb * _UnderlayColor.a, _UnderlayColor.a) * saturate(d - input.underlayParam.y) * (1 - c.a);
|
c += float4(_UnderlayColor.rgb * _UnderlayColor.a, _UnderlayColor.a) * saturate(d - input.underlayParam.y) * (1 - c.a);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if UNDERLAY_INNER
|
#if UNDERLAY_INNER
|
||||||
half sd = saturate(d - input.param.z);
|
half sd = saturate(d - input.param.z);
|
||||||
d = tex2D(_MainTex, input.texcoord1.xy).a * input.underlayParam.x;
|
d = tex2D(_MainTex, input.texcoord1.xy).a * input.underlayParam.x;
|
||||||
c += float4(_UnderlayColor.rgb * _UnderlayColor.a, _UnderlayColor.a) * (1 - saturate(d - input.underlayParam.y)) * sd * (1 - c.a);
|
c += float4(_UnderlayColor.rgb * _UnderlayColor.a, _UnderlayColor.a) * (1 - saturate(d - input.underlayParam.y)) * sd * (1 - c.a);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Alternative implementation to UnityGet2DClipping with support for softness.
|
// Alternative implementation to UnityGet2DClipping with support for softness.
|
||||||
//#if UNITY_UI_CLIP_RECT
|
//#if UNITY_UI_CLIP_RECT
|
||||||
half2 m = saturate((_ClipRect.zw - _ClipRect.xy - abs(input.mask.xy)) * input.mask.zw);
|
half2 m = saturate((_ClipRect.zw - _ClipRect.xy - abs(input.mask.xy)) * input.mask.zw);
|
||||||
c *= m.x * m.y;
|
c *= m.x * m.y;
|
||||||
//#endif
|
//#endif
|
||||||
|
|
||||||
float a = abs(_MaskInverse - tex2D(_MaskTex, input.texcoord0.zw).a);
|
float a = abs(_MaskInverse - tex2D(_MaskTex, input.texcoord0.zw).a);
|
||||||
float t = a + (1 - _MaskWipeControl) * _MaskEdgeSoftness - _MaskWipeControl;
|
float t = a + (1 - _MaskWipeControl) * _MaskEdgeSoftness - _MaskWipeControl;
|
||||||
a = saturate(t / _MaskEdgeSoftness);
|
a = saturate(t / _MaskEdgeSoftness);
|
||||||
c.rgb = lerp(_MaskEdgeColor.rgb*c.a, c.rgb, a);
|
c.rgb = lerp(_MaskEdgeColor.rgb*c.a, c.rgb, a);
|
||||||
c *= a;
|
c *= a;
|
||||||
|
|
||||||
#if (UNDERLAY_ON | UNDERLAY_INNER)
|
#if (UNDERLAY_ON | UNDERLAY_INNER)
|
||||||
c *= input.texcoord1.z;
|
c *= input.texcoord1.z;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if UNITY_UI_ALPHACLIP
|
#if UNITY_UI_ALPHACLIP
|
||||||
clip(c.a - 0.001);
|
clip(c.a - 0.001);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
return c;
|
return c;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -6,14 +6,14 @@
|
||||||
Shader "TextMeshPro/Mobile/Distance Field Overlay" {
|
Shader "TextMeshPro/Mobile/Distance Field Overlay" {
|
||||||
|
|
||||||
Properties {
|
Properties {
|
||||||
[HDR]_FaceColor ("Face Color", Color) = (1,1,1,1)
|
_FaceColor ("Face Color", Color) = (1,1,1,1)
|
||||||
_FaceDilate ("Face Dilate", Range(-1,1)) = 0
|
_FaceDilate ("Face Dilate", Range(-1,1)) = 0
|
||||||
|
|
||||||
[HDR]_OutlineColor ("Outline Color", Color) = (0,0,0,1)
|
_OutlineColor ("Outline Color", Color) = (0,0,0,1)
|
||||||
_OutlineWidth ("Outline Thickness", Range(0,1)) = 0
|
_OutlineWidth ("Outline Thickness", Range(0,1)) = 0
|
||||||
_OutlineSoftness ("Outline Softness", Range(0,1)) = 0
|
_OutlineSoftness ("Outline Softness", Range(0,1)) = 0
|
||||||
|
|
||||||
[HDR]_UnderlayColor ("Border Color", Color) = (0,0,0,.5)
|
_UnderlayColor ("Border Color", Color) = (0,0,0,.5)
|
||||||
_UnderlayOffsetX ("Border OffsetX", Range(-1,1)) = 0
|
_UnderlayOffsetX ("Border OffsetX", Range(-1,1)) = 0
|
||||||
_UnderlayOffsetY ("Border OffsetY", Range(-1,1)) = 0
|
_UnderlayOffsetY ("Border OffsetY", Range(-1,1)) = 0
|
||||||
_UnderlayDilate ("Border Dilate", Range(-1,1)) = 0
|
_UnderlayDilate ("Border Dilate", Range(-1,1)) = 0
|
||||||
|
|
@ -93,16 +93,18 @@ SubShader {
|
||||||
#include "UnityUI.cginc"
|
#include "UnityUI.cginc"
|
||||||
#include "TMPro_Properties.cginc"
|
#include "TMPro_Properties.cginc"
|
||||||
|
|
||||||
struct vertex_t {
|
struct vertex_t
|
||||||
|
{
|
||||||
UNITY_VERTEX_INPUT_INSTANCE_ID
|
UNITY_VERTEX_INPUT_INSTANCE_ID
|
||||||
float4 vertex : POSITION;
|
float4 vertex : POSITION;
|
||||||
float3 normal : NORMAL;
|
float3 normal : NORMAL;
|
||||||
fixed4 color : COLOR;
|
fixed4 color : COLOR;
|
||||||
float2 texcoord0 : TEXCOORD0;
|
float4 texcoord0 : TEXCOORD0;
|
||||||
float2 texcoord1 : TEXCOORD1;
|
float2 texcoord1 : TEXCOORD1;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct pixel_t {
|
struct pixel_t
|
||||||
|
{
|
||||||
UNITY_VERTEX_INPUT_INSTANCE_ID
|
UNITY_VERTEX_INPUT_INSTANCE_ID
|
||||||
UNITY_VERTEX_OUTPUT_STEREO
|
UNITY_VERTEX_OUTPUT_STEREO
|
||||||
float4 vertex : SV_POSITION;
|
float4 vertex : SV_POSITION;
|
||||||
|
|
@ -111,12 +113,17 @@ SubShader {
|
||||||
float4 texcoord0 : TEXCOORD0; // Texture UV, Mask UV
|
float4 texcoord0 : TEXCOORD0; // Texture UV, Mask UV
|
||||||
half4 param : TEXCOORD1; // Scale(x), BiasIn(y), BiasOut(z), Bias(w)
|
half4 param : TEXCOORD1; // Scale(x), BiasIn(y), BiasOut(z), Bias(w)
|
||||||
half4 mask : TEXCOORD2; // Position in clip space(xy), Softness(zw)
|
half4 mask : TEXCOORD2; // Position in clip space(xy), Softness(zw)
|
||||||
#if (UNDERLAY_ON | UNDERLAY_INNER)
|
|
||||||
|
#if (UNDERLAY_ON | UNDERLAY_INNER)
|
||||||
float4 texcoord1 : TEXCOORD3; // Texture UV, alpha, reserved
|
float4 texcoord1 : TEXCOORD3; // Texture UV, alpha, reserved
|
||||||
half2 underlayParam : TEXCOORD4; // Scale(x), Bias(y)
|
half2 underlayParam : TEXCOORD4; // Scale(x), Bias(y)
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
|
float _UIMaskSoftnessX;
|
||||||
|
float _UIMaskSoftnessY;
|
||||||
|
int _UIVertexColorAlwaysGammaSpace;
|
||||||
|
|
||||||
|
|
||||||
pixel_t VertShader(vertex_t input)
|
pixel_t VertShader(vertex_t input)
|
||||||
{
|
{
|
||||||
|
|
@ -127,7 +134,7 @@ SubShader {
|
||||||
UNITY_TRANSFER_INSTANCE_ID(input, output);
|
UNITY_TRANSFER_INSTANCE_ID(input, output);
|
||||||
UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(output);
|
UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(output);
|
||||||
|
|
||||||
float bold = step(input.texcoord1.y, 0);
|
float bold = step(input.texcoord0.w, 0);
|
||||||
|
|
||||||
float4 vert = input.vertex;
|
float4 vert = input.vertex;
|
||||||
vert.x += _VertexOffsetX;
|
vert.x += _VertexOffsetX;
|
||||||
|
|
@ -138,7 +145,7 @@ SubShader {
|
||||||
pixelSize /= float2(_ScaleX, _ScaleY) * abs(mul((float2x2)UNITY_MATRIX_P, _ScreenParams.xy));
|
pixelSize /= float2(_ScaleX, _ScaleY) * abs(mul((float2x2)UNITY_MATRIX_P, _ScreenParams.xy));
|
||||||
|
|
||||||
float scale = rsqrt(dot(pixelSize, pixelSize));
|
float scale = rsqrt(dot(pixelSize, pixelSize));
|
||||||
scale *= abs(input.texcoord1.y) * _GradientScale * (_Sharpness + 1);
|
scale *= abs(input.texcoord0.w) * _GradientScale * (_Sharpness + 1);
|
||||||
if(UNITY_MATRIX_P[3][3] == 0) scale = lerp(abs(scale) * (1 - _PerspectiveFilter), scale, abs(dot(UnityObjectToWorldNormal(input.normal.xyz), normalize(WorldSpaceViewDir(vert)))));
|
if(UNITY_MATRIX_P[3][3] == 0) scale = lerp(abs(scale) * (1 - _PerspectiveFilter), scale, abs(dot(UnityObjectToWorldNormal(input.normal.xyz), normalize(WorldSpaceViewDir(vert)))));
|
||||||
|
|
||||||
float weight = lerp(_WeightNormal, _WeightBold, bold) / 4.0;
|
float weight = lerp(_WeightNormal, _WeightBold, bold) / 4.0;
|
||||||
|
|
@ -150,10 +157,14 @@ SubShader {
|
||||||
float bias = (0.5 - weight) * scale - 0.5;
|
float bias = (0.5 - weight) * scale - 0.5;
|
||||||
float outline = _OutlineWidth * _ScaleRatioA * 0.5 * scale;
|
float outline = _OutlineWidth * _ScaleRatioA * 0.5 * scale;
|
||||||
|
|
||||||
|
if (_UIVertexColorAlwaysGammaSpace && !IsGammaSpace())
|
||||||
|
{
|
||||||
|
input.color.rgb = UIGammaToLinear(input.color.rgb);
|
||||||
|
}
|
||||||
float opacity = input.color.a;
|
float opacity = input.color.a;
|
||||||
#if (UNDERLAY_ON | UNDERLAY_INNER)
|
#if (UNDERLAY_ON | UNDERLAY_INNER)
|
||||||
opacity = 1.0;
|
opacity = 1.0;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
fixed4 faceColor = fixed4(input.color.rgb, opacity) * _FaceColor;
|
fixed4 faceColor = fixed4(input.color.rgb, opacity) * _FaceColor;
|
||||||
faceColor.rgb *= faceColor.a;
|
faceColor.rgb *= faceColor.a;
|
||||||
|
|
@ -163,14 +174,14 @@ SubShader {
|
||||||
outlineColor.rgb *= outlineColor.a;
|
outlineColor.rgb *= outlineColor.a;
|
||||||
outlineColor = lerp(faceColor, outlineColor, sqrt(min(1.0, (outline * 2))));
|
outlineColor = lerp(faceColor, outlineColor, sqrt(min(1.0, (outline * 2))));
|
||||||
|
|
||||||
#if (UNDERLAY_ON | UNDERLAY_INNER)
|
#if (UNDERLAY_ON | UNDERLAY_INNER)
|
||||||
layerScale /= 1 + ((_UnderlaySoftness * _ScaleRatioC) * layerScale);
|
layerScale /= 1 + ((_UnderlaySoftness * _ScaleRatioC) * layerScale);
|
||||||
float layerBias = (.5 - weight) * layerScale - .5 - ((_UnderlayDilate * _ScaleRatioC) * .5 * layerScale);
|
float layerBias = (.5 - weight) * layerScale - .5 - ((_UnderlayDilate * _ScaleRatioC) * .5 * layerScale);
|
||||||
|
|
||||||
float x = -(_UnderlayOffsetX * _ScaleRatioC) * _GradientScale / _TextureWidth;
|
float x = -(_UnderlayOffsetX * _ScaleRatioC) * _GradientScale / _TextureWidth;
|
||||||
float y = -(_UnderlayOffsetY * _ScaleRatioC) * _GradientScale / _TextureHeight;
|
float y = -(_UnderlayOffsetY * _ScaleRatioC) * _GradientScale / _TextureHeight;
|
||||||
float2 layerOffset = float2(x, y);
|
float2 layerOffset = float2(x, y);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Generate UV for the Masking Texture
|
// Generate UV for the Masking Texture
|
||||||
float4 clampedRect = clamp(_ClipRect, -2e10, 2e10);
|
float4 clampedRect = clamp(_ClipRect, -2e10, 2e10);
|
||||||
|
|
@ -182,7 +193,8 @@ SubShader {
|
||||||
output.outlineColor = outlineColor;
|
output.outlineColor = outlineColor;
|
||||||
output.texcoord0 = float4(input.texcoord0.x, input.texcoord0.y, maskUV.x, maskUV.y);
|
output.texcoord0 = float4(input.texcoord0.x, input.texcoord0.y, maskUV.x, maskUV.y);
|
||||||
output.param = half4(scale, bias - outline, bias + outline, bias);
|
output.param = half4(scale, bias - outline, bias + outline, bias);
|
||||||
output.mask = half4(vert.xy * 2 - clampedRect.xy - clampedRect.zw, 0.25 / (0.25 * half2(_MaskSoftnessX, _MaskSoftnessY) + pixelSize.xy));
|
const half2 maskSoftness = half2(max(_UIMaskSoftnessX, _MaskSoftnessX), max(_UIMaskSoftnessY, _MaskSoftnessY));
|
||||||
|
output.mask = half4(vert.xy * 2 - clampedRect.xy - clampedRect.zw, 0.25 / (0.25 * maskSoftness + pixelSize.xy));
|
||||||
#if (UNDERLAY_ON || UNDERLAY_INNER)
|
#if (UNDERLAY_ON || UNDERLAY_INNER)
|
||||||
output.texcoord1 = float4(input.texcoord0 + layerOffset, input.color.a, 0);
|
output.texcoord1 = float4(input.texcoord0 + layerOffset, input.color.a, 0);
|
||||||
output.underlayParam = half2(layerScale, layerBias);
|
output.underlayParam = half2(layerScale, layerBias);
|
||||||
|
|
@ -200,35 +212,35 @@ SubShader {
|
||||||
half d = tex2D(_MainTex, input.texcoord0.xy).a * input.param.x;
|
half d = tex2D(_MainTex, input.texcoord0.xy).a * input.param.x;
|
||||||
half4 c = input.faceColor * saturate(d - input.param.w);
|
half4 c = input.faceColor * saturate(d - input.param.w);
|
||||||
|
|
||||||
#ifdef OUTLINE_ON
|
#ifdef OUTLINE_ON
|
||||||
c = lerp(input.outlineColor, input.faceColor, saturate(d - input.param.z));
|
c = lerp(input.outlineColor, input.faceColor, saturate(d - input.param.z));
|
||||||
c *= saturate(d - input.param.y);
|
c *= saturate(d - input.param.y);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if UNDERLAY_ON
|
#if UNDERLAY_ON
|
||||||
d = tex2D(_MainTex, input.texcoord1.xy).a * input.underlayParam.x;
|
d = tex2D(_MainTex, input.texcoord1.xy).a * input.underlayParam.x;
|
||||||
c += float4(_UnderlayColor.rgb * _UnderlayColor.a, _UnderlayColor.a) * saturate(d - input.underlayParam.y) * (1 - c.a);
|
c += float4(_UnderlayColor.rgb * _UnderlayColor.a, _UnderlayColor.a) * saturate(d - input.underlayParam.y) * (1 - c.a);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if UNDERLAY_INNER
|
#if UNDERLAY_INNER
|
||||||
half sd = saturate(d - input.param.z);
|
half sd = saturate(d - input.param.z);
|
||||||
d = tex2D(_MainTex, input.texcoord1.xy).a * input.underlayParam.x;
|
d = tex2D(_MainTex, input.texcoord1.xy).a * input.underlayParam.x;
|
||||||
c += float4(_UnderlayColor.rgb * _UnderlayColor.a, _UnderlayColor.a) * (1 - saturate(d - input.underlayParam.y)) * sd * (1 - c.a);
|
c += float4(_UnderlayColor.rgb * _UnderlayColor.a, _UnderlayColor.a) * (1 - saturate(d - input.underlayParam.y)) * sd * (1 - c.a);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Alternative implementation to UnityGet2DClipping with support for softness.
|
// Alternative implementation to UnityGet2DClipping with support for softness.
|
||||||
#if UNITY_UI_CLIP_RECT
|
#if UNITY_UI_CLIP_RECT
|
||||||
half2 m = saturate((_ClipRect.zw - _ClipRect.xy - abs(input.mask.xy)) * input.mask.zw);
|
half2 m = saturate((_ClipRect.zw - _ClipRect.xy - abs(input.mask.xy)) * input.mask.zw);
|
||||||
c *= m.x * m.y;
|
c *= m.x * m.y;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if (UNDERLAY_ON | UNDERLAY_INNER)
|
#if (UNDERLAY_ON | UNDERLAY_INNER)
|
||||||
c *= input.texcoord1.z;
|
c *= input.texcoord1.z;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if UNITY_UI_ALPHACLIP
|
#if UNITY_UI_ALPHACLIP
|
||||||
clip(c.a - 0.001);
|
clip(c.a - 0.001);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
return c;
|
return c;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -6,14 +6,14 @@
|
||||||
Shader "TextMeshPro/Mobile/Distance Field SSD" {
|
Shader "TextMeshPro/Mobile/Distance Field SSD" {
|
||||||
|
|
||||||
Properties {
|
Properties {
|
||||||
[HDR]_FaceColor ("Face Color", Color) = (1,1,1,1)
|
_FaceColor ("Face Color", Color) = (1,1,1,1)
|
||||||
_FaceDilate ("Face Dilate", Range(-1,1)) = 0
|
_FaceDilate ("Face Dilate", Range(-1,1)) = 0
|
||||||
|
|
||||||
[HDR]_OutlineColor ("Outline Color", Color) = (0,0,0,1)
|
_OutlineColor ("Outline Color", Color) = (0,0,0,1)
|
||||||
_OutlineWidth ("Outline Thickness", Range(0,1)) = 0
|
_OutlineWidth ("Outline Thickness", Range(0,1)) = 0
|
||||||
_OutlineSoftness ("Outline Softness", Range(0,1)) = 0
|
_OutlineSoftness ("Outline Softness", Range(0,1)) = 0
|
||||||
|
|
||||||
[HDR]_UnderlayColor ("Border Color", Color) = (0,0,0,.5)
|
_UnderlayColor ("Border Color", Color) = (0,0,0,.5)
|
||||||
_UnderlayOffsetX ("Border OffsetX", Range(-1,1)) = 0
|
_UnderlayOffsetX ("Border OffsetX", Range(-1,1)) = 0
|
||||||
_UnderlayOffsetY ("Border OffsetY", Range(-1,1)) = 0
|
_UnderlayOffsetY ("Border OffsetY", Range(-1,1)) = 0
|
||||||
_UnderlayDilate ("Border Dilate", Range(-1,1)) = 0
|
_UnderlayDilate ("Border Dilate", Range(-1,1)) = 0
|
||||||
|
|
|
||||||
|
|
@ -6,14 +6,14 @@
|
||||||
Shader "TextMeshPro/Mobile/Distance Field" {
|
Shader "TextMeshPro/Mobile/Distance Field" {
|
||||||
|
|
||||||
Properties {
|
Properties {
|
||||||
[HDR]_FaceColor ("Face Color", Color) = (1,1,1,1)
|
_FaceColor ("Face Color", Color) = (1,1,1,1)
|
||||||
_FaceDilate ("Face Dilate", Range(-1,1)) = 0
|
_FaceDilate ("Face Dilate", Range(-1,1)) = 0
|
||||||
|
|
||||||
[HDR]_OutlineColor ("Outline Color", Color) = (0,0,0,1)
|
_OutlineColor ("Outline Color", Color) = (0,0,0,1)
|
||||||
_OutlineWidth ("Outline Thickness", Range(0,1)) = 0
|
_OutlineWidth ("Outline Thickness", Range(0,1)) = 0
|
||||||
_OutlineSoftness ("Outline Softness", Range(0,1)) = 0
|
_OutlineSoftness ("Outline Softness", Range(0,1)) = 0
|
||||||
|
|
||||||
[HDR]_UnderlayColor ("Border Color", Color) = (0,0,0,.5)
|
_UnderlayColor ("Border Color", Color) = (0,0,0,.5)
|
||||||
_UnderlayOffsetX ("Border OffsetX", Range(-1,1)) = 0
|
_UnderlayOffsetX ("Border OffsetX", Range(-1,1)) = 0
|
||||||
_UnderlayOffsetY ("Border OffsetY", Range(-1,1)) = 0
|
_UnderlayOffsetY ("Border OffsetY", Range(-1,1)) = 0
|
||||||
_UnderlayDilate ("Border Dilate", Range(-1,1)) = 0
|
_UnderlayDilate ("Border Dilate", Range(-1,1)) = 0
|
||||||
|
|
@ -81,6 +81,7 @@ SubShader {
|
||||||
|
|
||||||
Pass {
|
Pass {
|
||||||
CGPROGRAM
|
CGPROGRAM
|
||||||
|
#pragma enable_d3d11_debug_symbols
|
||||||
#pragma vertex VertShader
|
#pragma vertex VertShader
|
||||||
#pragma fragment PixShader
|
#pragma fragment PixShader
|
||||||
#pragma shader_feature __ OUTLINE_ON
|
#pragma shader_feature __ OUTLINE_ON
|
||||||
|
|
@ -98,7 +99,7 @@ SubShader {
|
||||||
float4 vertex : POSITION;
|
float4 vertex : POSITION;
|
||||||
float3 normal : NORMAL;
|
float3 normal : NORMAL;
|
||||||
fixed4 color : COLOR;
|
fixed4 color : COLOR;
|
||||||
float2 texcoord0 : TEXCOORD0;
|
float4 texcoord0 : TEXCOORD0;
|
||||||
float2 texcoord1 : TEXCOORD1;
|
float2 texcoord1 : TEXCOORD1;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -117,6 +118,9 @@ SubShader {
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
|
float _UIMaskSoftnessX;
|
||||||
|
float _UIMaskSoftnessY;
|
||||||
|
int _UIVertexColorAlwaysGammaSpace;
|
||||||
|
|
||||||
pixel_t VertShader(vertex_t input)
|
pixel_t VertShader(vertex_t input)
|
||||||
{
|
{
|
||||||
|
|
@ -127,7 +131,7 @@ SubShader {
|
||||||
UNITY_TRANSFER_INSTANCE_ID(input, output);
|
UNITY_TRANSFER_INSTANCE_ID(input, output);
|
||||||
UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(output);
|
UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(output);
|
||||||
|
|
||||||
float bold = step(input.texcoord1.y, 0);
|
float bold = step(input.texcoord0.w, 0);
|
||||||
|
|
||||||
float4 vert = input.vertex;
|
float4 vert = input.vertex;
|
||||||
vert.x += _VertexOffsetX;
|
vert.x += _VertexOffsetX;
|
||||||
|
|
@ -138,7 +142,7 @@ SubShader {
|
||||||
pixelSize /= float2(_ScaleX, _ScaleY) * abs(mul((float2x2)UNITY_MATRIX_P, _ScreenParams.xy));
|
pixelSize /= float2(_ScaleX, _ScaleY) * abs(mul((float2x2)UNITY_MATRIX_P, _ScreenParams.xy));
|
||||||
|
|
||||||
float scale = rsqrt(dot(pixelSize, pixelSize));
|
float scale = rsqrt(dot(pixelSize, pixelSize));
|
||||||
scale *= abs(input.texcoord1.y) * _GradientScale * (_Sharpness + 1);
|
scale *= abs(input.texcoord0.w) * _GradientScale * (_Sharpness + 1);
|
||||||
if(UNITY_MATRIX_P[3][3] == 0) scale = lerp(abs(scale) * (1 - _PerspectiveFilter), scale, abs(dot(UnityObjectToWorldNormal(input.normal.xyz), normalize(WorldSpaceViewDir(vert)))));
|
if(UNITY_MATRIX_P[3][3] == 0) scale = lerp(abs(scale) * (1 - _PerspectiveFilter), scale, abs(dot(UnityObjectToWorldNormal(input.normal.xyz), normalize(WorldSpaceViewDir(vert)))));
|
||||||
|
|
||||||
float weight = lerp(_WeightNormal, _WeightBold, bold) / 4.0;
|
float weight = lerp(_WeightNormal, _WeightBold, bold) / 4.0;
|
||||||
|
|
@ -150,7 +154,11 @@ SubShader {
|
||||||
float bias = (0.5 - weight) * scale - 0.5;
|
float bias = (0.5 - weight) * scale - 0.5;
|
||||||
float outline = _OutlineWidth * _ScaleRatioA * 0.5 * scale;
|
float outline = _OutlineWidth * _ScaleRatioA * 0.5 * scale;
|
||||||
|
|
||||||
float opacity = input.color.a;
|
if (_UIVertexColorAlwaysGammaSpace && !IsGammaSpace())
|
||||||
|
{
|
||||||
|
input.color.rgb = UIGammaToLinear(input.color.rgb);
|
||||||
|
}
|
||||||
|
float opacity = input.color.a;
|
||||||
#if (UNDERLAY_ON | UNDERLAY_INNER)
|
#if (UNDERLAY_ON | UNDERLAY_INNER)
|
||||||
opacity = 1.0;
|
opacity = 1.0;
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -182,7 +190,9 @@ SubShader {
|
||||||
output.outlineColor = outlineColor;
|
output.outlineColor = outlineColor;
|
||||||
output.texcoord0 = float4(input.texcoord0.x, input.texcoord0.y, maskUV.x, maskUV.y);
|
output.texcoord0 = float4(input.texcoord0.x, input.texcoord0.y, maskUV.x, maskUV.y);
|
||||||
output.param = half4(scale, bias - outline, bias + outline, bias);
|
output.param = half4(scale, bias - outline, bias + outline, bias);
|
||||||
output.mask = half4(vert.xy * 2 - clampedRect.xy - clampedRect.zw, 0.25 / (0.25 * half2(_MaskSoftnessX, _MaskSoftnessY) + pixelSize.xy));
|
|
||||||
|
const half2 maskSoftness = half2(max(_UIMaskSoftnessX, _MaskSoftnessX), max(_UIMaskSoftnessY, _MaskSoftnessY));
|
||||||
|
output.mask = half4(vert.xy * 2 - clampedRect.xy - clampedRect.zw, 0.25 / (0.25 * maskSoftness + pixelSize.xy));
|
||||||
#if (UNDERLAY_ON || UNDERLAY_INNER)
|
#if (UNDERLAY_ON || UNDERLAY_INNER)
|
||||||
output.texcoord1 = float4(input.texcoord0 + layerOffset, input.color.a, 0);
|
output.texcoord1 = float4(input.texcoord0 + layerOffset, input.color.a, 0);
|
||||||
output.underlayParam = half2(layerScale, layerBias);
|
output.underlayParam = half2(layerScale, layerBias);
|
||||||
|
|
|
||||||
|
|
@ -7,15 +7,15 @@ Shader "TextMeshPro/Mobile/Distance Field (Surface)" {
|
||||||
|
|
||||||
Properties {
|
Properties {
|
||||||
_FaceTex ("Fill Texture", 2D) = "white" {}
|
_FaceTex ("Fill Texture", 2D) = "white" {}
|
||||||
[HDR]_FaceColor ("Fill Color", Color) = (1,1,1,1)
|
_FaceColor ("Fill Color", Color) = (1,1,1,1)
|
||||||
_FaceDilate ("Face Dilate", Range(-1,1)) = 0
|
_FaceDilate ("Face Dilate", Range(-1,1)) = 0
|
||||||
|
|
||||||
[HDR]_OutlineColor ("Outline Color", Color) = (0,0,0,1)
|
_OutlineColor ("Outline Color", Color) = (0,0,0,1)
|
||||||
_OutlineTex ("Outline Texture", 2D) = "white" {}
|
_OutlineTex ("Outline Texture", 2D) = "white" {}
|
||||||
_OutlineWidth ("Outline Thickness", Range(0, 1)) = 0
|
_OutlineWidth ("Outline Thickness", Range(0, 1)) = 0
|
||||||
_OutlineSoftness ("Outline Softness", Range(0,1)) = 0
|
_OutlineSoftness ("Outline Softness", Range(0,1)) = 0
|
||||||
|
|
||||||
[HDR]_GlowColor ("Color", Color) = (0, 1, 0, 0.5)
|
_GlowColor ("Color", Color) = (0, 1, 0, 0.5)
|
||||||
_GlowOffset ("Offset", Range(-1,1)) = 0
|
_GlowOffset ("Offset", Range(-1,1)) = 0
|
||||||
_GlowInner ("Inner", Range(0,1)) = 0.05
|
_GlowInner ("Inner", Range(0,1)) = 0.05
|
||||||
_GlowOuter ("Outer", Range(0,1)) = 0.05
|
_GlowOuter ("Outer", Range(0,1)) = 0.05
|
||||||
|
|
@ -99,7 +99,8 @@ SubShader {
|
||||||
#pragma multi_compile_shadowcaster
|
#pragma multi_compile_shadowcaster
|
||||||
#include "UnityCG.cginc"
|
#include "UnityCG.cginc"
|
||||||
|
|
||||||
struct v2f {
|
struct v2f
|
||||||
|
{
|
||||||
V2F_SHADOW_CASTER;
|
V2F_SHADOW_CASTER;
|
||||||
float2 uv : TEXCOORD1;
|
float2 uv : TEXCOORD1;
|
||||||
float2 uv2 : TEXCOORD3;
|
float2 uv2 : TEXCOORD3;
|
||||||
|
|
|
||||||
|
|
@ -4,10 +4,10 @@ Properties {
|
||||||
_FaceTex ("Fill Texture", 2D) = "white" {}
|
_FaceTex ("Fill Texture", 2D) = "white" {}
|
||||||
_FaceUVSpeedX ("Face UV Speed X", Range(-5, 5)) = 0.0
|
_FaceUVSpeedX ("Face UV Speed X", Range(-5, 5)) = 0.0
|
||||||
_FaceUVSpeedY ("Face UV Speed Y", Range(-5, 5)) = 0.0
|
_FaceUVSpeedY ("Face UV Speed Y", Range(-5, 5)) = 0.0
|
||||||
[HDR]_FaceColor ("Fill Color", Color) = (1,1,1,1)
|
_FaceColor ("Fill Color", Color) = (1,1,1,1)
|
||||||
_FaceDilate ("Face Dilate", Range(-1,1)) = 0
|
_FaceDilate ("Face Dilate", Range(-1,1)) = 0
|
||||||
|
|
||||||
[HDR]_OutlineColor ("Outline Color", Color) = (0,0,0,1)
|
_OutlineColor ("Outline Color", Color) = (0,0,0,1)
|
||||||
_OutlineTex ("Outline Texture", 2D) = "white" {}
|
_OutlineTex ("Outline Texture", 2D) = "white" {}
|
||||||
_OutlineUVSpeedX ("Outline UV Speed X", Range(-5, 5)) = 0.0
|
_OutlineUVSpeedX ("Outline UV Speed X", Range(-5, 5)) = 0.0
|
||||||
_OutlineUVSpeedY ("Outline UV Speed Y", Range(-5, 5)) = 0.0
|
_OutlineUVSpeedY ("Outline UV Speed Y", Range(-5, 5)) = 0.0
|
||||||
|
|
@ -28,12 +28,12 @@ Properties {
|
||||||
_ReflectOutlineColor ("Outline Color", Color) = (0,0,0,1)
|
_ReflectOutlineColor ("Outline Color", Color) = (0,0,0,1)
|
||||||
_Cube ("Reflection Cubemap", Cube) = "black" { /* TexGen CubeReflect */ }
|
_Cube ("Reflection Cubemap", Cube) = "black" { /* TexGen CubeReflect */ }
|
||||||
_EnvMatrixRotation ("Texture Rotation", vector) = (0, 0, 0, 0)
|
_EnvMatrixRotation ("Texture Rotation", vector) = (0, 0, 0, 0)
|
||||||
[HDR]_SpecColor ("Specular Color", Color) = (0,0,0,1)
|
_SpecColor ("Specular Color", Color) = (0,0,0,1)
|
||||||
|
|
||||||
_FaceShininess ("Face Shininess", Range(0,1)) = 0
|
_FaceShininess ("Face Shininess", Range(0,1)) = 0
|
||||||
_OutlineShininess ("Outline Shininess", Range(0,1)) = 0
|
_OutlineShininess ("Outline Shininess", Range(0,1)) = 0
|
||||||
|
|
||||||
[HDR]_GlowColor ("Color", Color) = (0, 1, 0, 0.5)
|
_GlowColor ("Color", Color) = (0, 1, 0, 0.5)
|
||||||
_GlowOffset ("Offset", Range(-1,1)) = 0
|
_GlowOffset ("Offset", Range(-1,1)) = 0
|
||||||
_GlowInner ("Inner", Range(0,1)) = 0.05
|
_GlowInner ("Inner", Range(0,1)) = 0.05
|
||||||
_GlowOuter ("Outer", Range(0,1)) = 0.05
|
_GlowOuter ("Outer", Range(0,1)) = 0.05
|
||||||
|
|
@ -118,7 +118,8 @@ SubShader {
|
||||||
#pragma multi_compile_shadowcaster
|
#pragma multi_compile_shadowcaster
|
||||||
#include "UnityCG.cginc"
|
#include "UnityCG.cginc"
|
||||||
|
|
||||||
struct v2f {
|
struct v2f
|
||||||
|
{
|
||||||
V2F_SHADOW_CASTER;
|
V2F_SHADOW_CASTER;
|
||||||
float2 uv : TEXCOORD1;
|
float2 uv : TEXCOORD1;
|
||||||
float2 uv2 : TEXCOORD3;
|
float2 uv2 : TEXCOORD3;
|
||||||
|
|
|
||||||
|
|
@ -4,10 +4,10 @@ Properties {
|
||||||
_FaceTex ("Face Texture", 2D) = "white" {}
|
_FaceTex ("Face Texture", 2D) = "white" {}
|
||||||
_FaceUVSpeedX ("Face UV Speed X", Range(-5, 5)) = 0.0
|
_FaceUVSpeedX ("Face UV Speed X", Range(-5, 5)) = 0.0
|
||||||
_FaceUVSpeedY ("Face UV Speed Y", Range(-5, 5)) = 0.0
|
_FaceUVSpeedY ("Face UV Speed Y", Range(-5, 5)) = 0.0
|
||||||
[HDR]_FaceColor ("Face Color", Color) = (1,1,1,1)
|
_FaceColor ("Face Color", Color) = (1,1,1,1)
|
||||||
_FaceDilate ("Face Dilate", Range(-1,1)) = 0
|
_FaceDilate ("Face Dilate", Range(-1,1)) = 0
|
||||||
|
|
||||||
[HDR]_OutlineColor ("Outline Color", Color) = (0,0,0,1)
|
_OutlineColor ("Outline Color", Color) = (0,0,0,1)
|
||||||
_OutlineTex ("Outline Texture", 2D) = "white" {}
|
_OutlineTex ("Outline Texture", 2D) = "white" {}
|
||||||
_OutlineUVSpeedX ("Outline UV Speed X", Range(-5, 5)) = 0.0
|
_OutlineUVSpeedX ("Outline UV Speed X", Range(-5, 5)) = 0.0
|
||||||
_OutlineUVSpeedY ("Outline UV Speed Y", Range(-5, 5)) = 0.0
|
_OutlineUVSpeedY ("Outline UV Speed Y", Range(-5, 5)) = 0.0
|
||||||
|
|
@ -21,7 +21,7 @@ Properties {
|
||||||
_BevelRoundness ("Bevel Roundness", Range(0,1)) = 0
|
_BevelRoundness ("Bevel Roundness", Range(0,1)) = 0
|
||||||
|
|
||||||
_LightAngle ("Light Angle", Range(0.0, 6.2831853)) = 3.1416
|
_LightAngle ("Light Angle", Range(0.0, 6.2831853)) = 3.1416
|
||||||
[HDR]_SpecularColor ("Specular", Color) = (1,1,1,1)
|
_SpecularColor ("Specular", Color) = (1,1,1,1)
|
||||||
_SpecularPower ("Specular", Range(0,4)) = 2.0
|
_SpecularPower ("Specular", Range(0,4)) = 2.0
|
||||||
_Reflectivity ("Reflectivity", Range(5.0,15.0)) = 10
|
_Reflectivity ("Reflectivity", Range(5.0,15.0)) = 10
|
||||||
_Diffuse ("Diffuse", Range(0,1)) = 0.5
|
_Diffuse ("Diffuse", Range(0,1)) = 0.5
|
||||||
|
|
@ -37,13 +37,13 @@ Properties {
|
||||||
_EnvMatrixRotation ("Texture Rotation", vector) = (0, 0, 0, 0)
|
_EnvMatrixRotation ("Texture Rotation", vector) = (0, 0, 0, 0)
|
||||||
|
|
||||||
|
|
||||||
[HDR]_UnderlayColor ("Border Color", Color) = (0,0,0, 0.5)
|
_UnderlayColor ("Border Color", Color) = (0,0,0, 0.5)
|
||||||
_UnderlayOffsetX ("Border OffsetX", Range(-1,1)) = 0
|
_UnderlayOffsetX ("Border OffsetX", Range(-1,1)) = 0
|
||||||
_UnderlayOffsetY ("Border OffsetY", Range(-1,1)) = 0
|
_UnderlayOffsetY ("Border OffsetY", Range(-1,1)) = 0
|
||||||
_UnderlayDilate ("Border Dilate", Range(-1,1)) = 0
|
_UnderlayDilate ("Border Dilate", Range(-1,1)) = 0
|
||||||
_UnderlaySoftness ("Border Softness", Range(0,1)) = 0
|
_UnderlaySoftness ("Border Softness", Range(0,1)) = 0
|
||||||
|
|
||||||
[HDR]_GlowColor ("Color", Color) = (0, 1, 0, 0.5)
|
_GlowColor ("Color", Color) = (0, 1, 0, 0.5)
|
||||||
_GlowOffset ("Offset", Range(-1,1)) = 0
|
_GlowOffset ("Offset", Range(-1,1)) = 0
|
||||||
_GlowInner ("Inner", Range(0,1)) = 0.05
|
_GlowInner ("Inner", Range(0,1)) = 0.05
|
||||||
_GlowOuter ("Outer", Range(0,1)) = 0.05
|
_GlowOuter ("Outer", Range(0,1)) = 0.05
|
||||||
|
|
@ -127,17 +127,18 @@ SubShader {
|
||||||
#include "TMPro_Properties.cginc"
|
#include "TMPro_Properties.cginc"
|
||||||
#include "TMPro.cginc"
|
#include "TMPro.cginc"
|
||||||
|
|
||||||
struct vertex_t {
|
struct vertex_t
|
||||||
|
{
|
||||||
UNITY_VERTEX_INPUT_INSTANCE_ID
|
UNITY_VERTEX_INPUT_INSTANCE_ID
|
||||||
float4 position : POSITION;
|
float4 position : POSITION;
|
||||||
float3 normal : NORMAL;
|
float3 normal : NORMAL;
|
||||||
fixed4 color : COLOR;
|
fixed4 color : COLOR;
|
||||||
float2 texcoord0 : TEXCOORD0;
|
float4 texcoord0 : TEXCOORD0;
|
||||||
float2 texcoord1 : TEXCOORD1;
|
float2 texcoord1 : TEXCOORD1;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
struct pixel_t
|
||||||
struct pixel_t {
|
{
|
||||||
UNITY_VERTEX_INPUT_INSTANCE_ID
|
UNITY_VERTEX_INPUT_INSTANCE_ID
|
||||||
UNITY_VERTEX_OUTPUT_STEREO
|
UNITY_VERTEX_OUTPUT_STEREO
|
||||||
float4 position : SV_POSITION;
|
float4 position : SV_POSITION;
|
||||||
|
|
@ -147,16 +148,20 @@ SubShader {
|
||||||
float4 mask : TEXCOORD2; // Position in object space(xy), pixel Size(zw)
|
float4 mask : TEXCOORD2; // Position in object space(xy), pixel Size(zw)
|
||||||
float3 viewDir : TEXCOORD3;
|
float3 viewDir : TEXCOORD3;
|
||||||
|
|
||||||
#if (UNDERLAY_ON || UNDERLAY_INNER)
|
#if (UNDERLAY_ON || UNDERLAY_INNER)
|
||||||
float4 texcoord2 : TEXCOORD4; // u,v, scale, bias
|
float4 texcoord2 : TEXCOORD4; // u,v, scale, bias
|
||||||
fixed4 underlayColor : COLOR1;
|
fixed4 underlayColor : COLOR1;
|
||||||
#endif
|
#endif
|
||||||
float4 textures : TEXCOORD5;
|
|
||||||
|
float4 textures : TEXCOORD5;
|
||||||
};
|
};
|
||||||
|
|
||||||
// Used by Unity internally to handle Texture Tiling and Offset.
|
// Used by Unity internally to handle Texture Tiling and Offset.
|
||||||
float4 _FaceTex_ST;
|
float4 _FaceTex_ST;
|
||||||
float4 _OutlineTex_ST;
|
float4 _OutlineTex_ST;
|
||||||
|
float _UIMaskSoftnessX;
|
||||||
|
float _UIMaskSoftnessY;
|
||||||
|
int _UIVertexColorAlwaysGammaSpace;
|
||||||
|
|
||||||
pixel_t VertShader(vertex_t input)
|
pixel_t VertShader(vertex_t input)
|
||||||
{
|
{
|
||||||
|
|
@ -167,7 +172,7 @@ SubShader {
|
||||||
UNITY_TRANSFER_INSTANCE_ID(input,output);
|
UNITY_TRANSFER_INSTANCE_ID(input,output);
|
||||||
UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(output);
|
UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(output);
|
||||||
|
|
||||||
float bold = step(input.texcoord1.y, 0);
|
float bold = step(input.texcoord0.w, 0);
|
||||||
|
|
||||||
float4 vert = input.position;
|
float4 vert = input.position;
|
||||||
vert.x += _VertexOffsetX;
|
vert.x += _VertexOffsetX;
|
||||||
|
|
@ -178,7 +183,7 @@ SubShader {
|
||||||
float2 pixelSize = vPosition.w;
|
float2 pixelSize = vPosition.w;
|
||||||
pixelSize /= float2(_ScaleX, _ScaleY) * abs(mul((float2x2)UNITY_MATRIX_P, _ScreenParams.xy));
|
pixelSize /= float2(_ScaleX, _ScaleY) * abs(mul((float2x2)UNITY_MATRIX_P, _ScreenParams.xy));
|
||||||
float scale = rsqrt(dot(pixelSize, pixelSize));
|
float scale = rsqrt(dot(pixelSize, pixelSize));
|
||||||
scale *= abs(input.texcoord1.y) * _GradientScale * (_Sharpness + 1);
|
scale *= abs(input.texcoord0.w) * _GradientScale * (_Sharpness + 1);
|
||||||
if (UNITY_MATRIX_P[3][3] == 0) scale = lerp(abs(scale) * (1 - _PerspectiveFilter), scale, abs(dot(UnityObjectToWorldNormal(input.normal.xyz), normalize(WorldSpaceViewDir(vert)))));
|
if (UNITY_MATRIX_P[3][3] == 0) scale = lerp(abs(scale) * (1 - _PerspectiveFilter), scale, abs(dot(UnityObjectToWorldNormal(input.normal.xyz), normalize(WorldSpaceViewDir(vert)))));
|
||||||
|
|
||||||
float weight = lerp(_WeightNormal, _WeightBold, bold) / 4.0;
|
float weight = lerp(_WeightNormal, _WeightBold, bold) / 4.0;
|
||||||
|
|
@ -188,13 +193,13 @@ SubShader {
|
||||||
|
|
||||||
float alphaClip = (1.0 - _OutlineWidth * _ScaleRatioA - _OutlineSoftness * _ScaleRatioA);
|
float alphaClip = (1.0 - _OutlineWidth * _ScaleRatioA - _OutlineSoftness * _ScaleRatioA);
|
||||||
|
|
||||||
#if GLOW_ON
|
#if GLOW_ON
|
||||||
alphaClip = min(alphaClip, 1.0 - _GlowOffset * _ScaleRatioB - _GlowOuter * _ScaleRatioB);
|
alphaClip = min(alphaClip, 1.0 - _GlowOffset * _ScaleRatioB - _GlowOuter * _ScaleRatioB);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
alphaClip = alphaClip / 2.0 - ( .5 / scale) - weight;
|
alphaClip = alphaClip / 2.0 - ( .5 / scale) - weight;
|
||||||
|
|
||||||
#if (UNDERLAY_ON || UNDERLAY_INNER)
|
#if (UNDERLAY_ON || UNDERLAY_INNER)
|
||||||
float4 underlayColor = _UnderlayColor;
|
float4 underlayColor = _UnderlayColor;
|
||||||
underlayColor.rgb *= underlayColor.a;
|
underlayColor.rgb *= underlayColor.a;
|
||||||
|
|
||||||
|
|
@ -205,23 +210,28 @@ SubShader {
|
||||||
float x = -(_UnderlayOffsetX * _ScaleRatioC) * _GradientScale / _TextureWidth;
|
float x = -(_UnderlayOffsetX * _ScaleRatioC) * _GradientScale / _TextureWidth;
|
||||||
float y = -(_UnderlayOffsetY * _ScaleRatioC) * _GradientScale / _TextureHeight;
|
float y = -(_UnderlayOffsetY * _ScaleRatioC) * _GradientScale / _TextureHeight;
|
||||||
float2 bOffset = float2(x, y);
|
float2 bOffset = float2(x, y);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Generate UV for the Masking Texture
|
// Generate UV for the Masking Texture
|
||||||
float4 clampedRect = clamp(_ClipRect, -2e10, 2e10);
|
float4 clampedRect = clamp(_ClipRect, -2e10, 2e10);
|
||||||
float2 maskUV = (vert.xy - clampedRect.xy) / (clampedRect.zw - clampedRect.xy);
|
float2 maskUV = (vert.xy - clampedRect.xy) / (clampedRect.zw - clampedRect.xy);
|
||||||
|
|
||||||
// Support for texture tiling and offset
|
// Support for texture tiling and offset
|
||||||
float2 textureUV = UnpackUV(input.texcoord1.x);
|
float2 textureUV = input.texcoord1;
|
||||||
float2 faceUV = TRANSFORM_TEX(textureUV, _FaceTex);
|
float2 faceUV = TRANSFORM_TEX(textureUV, _FaceTex);
|
||||||
float2 outlineUV = TRANSFORM_TEX(textureUV, _OutlineTex);
|
float2 outlineUV = TRANSFORM_TEX(textureUV, _OutlineTex);
|
||||||
|
|
||||||
|
|
||||||
|
if (_UIVertexColorAlwaysGammaSpace && !IsGammaSpace())
|
||||||
|
{
|
||||||
|
input.color.rgb = UIGammaToLinear(input.color.rgb);
|
||||||
|
}
|
||||||
output.position = vPosition;
|
output.position = vPosition;
|
||||||
output.color = input.color;
|
output.color = input.color;
|
||||||
output.atlas = input.texcoord0;
|
output.atlas = input.texcoord0;
|
||||||
output.param = float4(alphaClip, scale, bias, weight);
|
output.param = float4(alphaClip, scale, bias, weight);
|
||||||
output.mask = half4(vert.xy * 2 - clampedRect.xy - clampedRect.zw, 0.25 / (0.25 * half2(_MaskSoftnessX, _MaskSoftnessY) + pixelSize.xy));
|
const half2 maskSoftness = half2(max(_UIMaskSoftnessX, _MaskSoftnessX), max(_UIMaskSoftnessY, _MaskSoftnessY));
|
||||||
|
output.mask = half4(vert.xy * 2 - clampedRect.xy - clampedRect.zw, 0.25 / (0.25 * maskSoftness + pixelSize.xy));
|
||||||
output.viewDir = mul((float3x3)_EnvMatrix, _WorldSpaceCameraPos.xyz - mul(unity_ObjectToWorld, vert).xyz);
|
output.viewDir = mul((float3x3)_EnvMatrix, _WorldSpaceCameraPos.xyz - mul(unity_ObjectToWorld, vert).xyz);
|
||||||
#if (UNDERLAY_ON || UNDERLAY_INNER)
|
#if (UNDERLAY_ON || UNDERLAY_INNER)
|
||||||
output.texcoord2 = float4(input.texcoord0 + bOffset, bScale, bBias);
|
output.texcoord2 = float4(input.texcoord0 + bOffset, bScale, bBias);
|
||||||
|
|
@ -239,9 +249,9 @@ SubShader {
|
||||||
|
|
||||||
float c = tex2D(_MainTex, input.atlas).a;
|
float c = tex2D(_MainTex, input.atlas).a;
|
||||||
|
|
||||||
#ifndef UNDERLAY_ON
|
#ifndef UNDERLAY_ON
|
||||||
clip(c - input.param.x);
|
clip(c - input.param.x);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
float scale = input.param.y;
|
float scale = input.param.y;
|
||||||
float bias = input.param.z;
|
float bias = input.param.z;
|
||||||
|
|
@ -261,7 +271,7 @@ SubShader {
|
||||||
|
|
||||||
faceColor = GetColor(sd, faceColor, outlineColor, outline, softness);
|
faceColor = GetColor(sd, faceColor, outlineColor, outline, softness);
|
||||||
|
|
||||||
#if BEVEL_ON
|
#if BEVEL_ON
|
||||||
float3 dxy = float3(0.5 / _TextureWidth, 0.5 / _TextureHeight, 0);
|
float3 dxy = float3(0.5 / _TextureWidth, 0.5 / _TextureHeight, 0);
|
||||||
float3 n = GetSurfaceNormal(input.atlas, weight, dxy);
|
float3 n = GetSurfaceNormal(input.atlas, weight, dxy);
|
||||||
|
|
||||||
|
|
@ -278,36 +288,35 @@ SubShader {
|
||||||
|
|
||||||
fixed4 reflcol = texCUBE(_Cube, reflect(input.viewDir, -n));
|
fixed4 reflcol = texCUBE(_Cube, reflect(input.viewDir, -n));
|
||||||
faceColor.rgb += reflcol.rgb * lerp(_ReflectFaceColor.rgb, _ReflectOutlineColor.rgb, saturate(sd + outline * 0.5)) * faceColor.a;
|
faceColor.rgb += reflcol.rgb * lerp(_ReflectFaceColor.rgb, _ReflectOutlineColor.rgb, saturate(sd + outline * 0.5)) * faceColor.a;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if UNDERLAY_ON
|
#if UNDERLAY_ON
|
||||||
float d = tex2D(_MainTex, input.texcoord2.xy).a * input.texcoord2.z;
|
float d = tex2D(_MainTex, input.texcoord2.xy).a * input.texcoord2.z;
|
||||||
faceColor += input.underlayColor * saturate(d - input.texcoord2.w) * (1 - faceColor.a);
|
faceColor += input.underlayColor * saturate(d - input.texcoord2.w) * (1 - faceColor.a);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if UNDERLAY_INNER
|
#if UNDERLAY_INNER
|
||||||
float d = tex2D(_MainTex, input.texcoord2.xy).a * input.texcoord2.z;
|
float d = tex2D(_MainTex, input.texcoord2.xy).a * input.texcoord2.z;
|
||||||
faceColor += input.underlayColor * (1 - saturate(d - input.texcoord2.w)) * saturate(1 - sd) * (1 - faceColor.a);
|
faceColor += input.underlayColor * (1 - saturate(d - input.texcoord2.w)) * saturate(1 - sd) * (1 - faceColor.a);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if GLOW_ON
|
#if GLOW_ON
|
||||||
float4 glowColor = GetGlowColor(sd, scale);
|
float4 glowColor = GetGlowColor(sd, scale);
|
||||||
faceColor.rgb += glowColor.rgb * glowColor.a;
|
faceColor.rgb += glowColor.rgb * glowColor.a;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Alternative implementation to UnityGet2DClipping with support for softness.
|
// Alternative implementation to UnityGet2DClipping with support for softness.
|
||||||
#if UNITY_UI_CLIP_RECT
|
#if UNITY_UI_CLIP_RECT
|
||||||
half2 m = saturate((_ClipRect.zw - _ClipRect.xy - abs(input.mask.xy)) * input.mask.zw);
|
half2 m = saturate((_ClipRect.zw - _ClipRect.xy - abs(input.mask.xy)) * input.mask.zw);
|
||||||
faceColor *= m.x * m.y;
|
faceColor *= m.x * m.y;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if UNITY_UI_ALPHACLIP
|
#if UNITY_UI_ALPHACLIP
|
||||||
clip(faceColor.a - 0.001);
|
clip(faceColor.a - 0.001);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
return faceColor * input.color.a;
|
return faceColor * input.color.a;
|
||||||
}
|
}
|
||||||
|
|
||||||
ENDCG
|
ENDCG
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -2,18 +2,18 @@ Shader "TextMeshPro/Sprite"
|
||||||
{
|
{
|
||||||
Properties
|
Properties
|
||||||
{
|
{
|
||||||
[PerRendererData] _MainTex ("Sprite Texture", 2D) = "white" {}
|
_MainTex ("Sprite Texture", 2D) = "white" {}
|
||||||
_Color ("Tint", Color) = (1,1,1,1)
|
_Color ("Tint", Color) = (1,1,1,1)
|
||||||
|
|
||||||
_StencilComp ("Stencil Comparison", Float) = 8
|
_StencilComp ("Stencil Comparison", Float) = 8
|
||||||
_Stencil ("Stencil ID", Float) = 0
|
_Stencil ("Stencil ID", Float) = 0
|
||||||
_StencilOp ("Stencil Operation", Float) = 0
|
_StencilOp ("Stencil Operation", Float) = 0
|
||||||
_StencilWriteMask ("Stencil Write Mask", Float) = 255
|
_StencilWriteMask ("Stencil Write Mask", Float) = 255
|
||||||
_StencilReadMask ("Stencil Read Mask", Float) = 255
|
_StencilReadMask ("Stencil Read Mask", Float) = 255
|
||||||
|
|
||||||
_CullMode ("Cull Mode", Float) = 0
|
_CullMode ("Cull Mode", Float) = 0
|
||||||
_ColorMask ("Color Mask", Float) = 15
|
_ColorMask ("Color Mask", Float) = 15
|
||||||
_ClipRect ("Clip Rect", vector) = (-32767, -32767, 32767, 32767)
|
_ClipRect ("Clip Rect", vector) = (-32767, -32767, 32767, 32767)
|
||||||
|
|
||||||
[Toggle(UNITY_UI_ALPHACLIP)] _UseUIAlphaClip ("Use Alpha Clip", Float) = 0
|
[Toggle(UNITY_UI_ALPHACLIP)] _UseUIAlphaClip ("Use Alpha Clip", Float) = 0
|
||||||
}
|
}
|
||||||
|
|
@ -21,19 +21,19 @@ Shader "TextMeshPro/Sprite"
|
||||||
SubShader
|
SubShader
|
||||||
{
|
{
|
||||||
Tags
|
Tags
|
||||||
{
|
{
|
||||||
"Queue"="Transparent"
|
"Queue"="Transparent"
|
||||||
"IgnoreProjector"="True"
|
"IgnoreProjector"="True"
|
||||||
"RenderType"="Transparent"
|
"RenderType"="Transparent"
|
||||||
"PreviewType"="Plane"
|
"PreviewType"="Plane"
|
||||||
"CanUseSpriteAtlas"="True"
|
"CanUseSpriteAtlas"="True"
|
||||||
}
|
}
|
||||||
|
|
||||||
Stencil
|
Stencil
|
||||||
{
|
{
|
||||||
Ref [_Stencil]
|
Ref [_Stencil]
|
||||||
Comp [_StencilComp]
|
Comp [_StencilComp]
|
||||||
Pass [_StencilOp]
|
Pass [_StencilOp]
|
||||||
ReadMask [_StencilReadMask]
|
ReadMask [_StencilReadMask]
|
||||||
WriteMask [_StencilWriteMask]
|
WriteMask [_StencilWriteMask]
|
||||||
}
|
}
|
||||||
|
|
@ -58,7 +58,7 @@ Shader "TextMeshPro/Sprite"
|
||||||
|
|
||||||
#pragma multi_compile __ UNITY_UI_CLIP_RECT
|
#pragma multi_compile __ UNITY_UI_CLIP_RECT
|
||||||
#pragma multi_compile __ UNITY_UI_ALPHACLIP
|
#pragma multi_compile __ UNITY_UI_ALPHACLIP
|
||||||
|
|
||||||
struct appdata_t
|
struct appdata_t
|
||||||
{
|
{
|
||||||
float4 vertex : POSITION;
|
float4 vertex : POSITION;
|
||||||
|
|
@ -69,29 +69,43 @@ Shader "TextMeshPro/Sprite"
|
||||||
|
|
||||||
struct v2f
|
struct v2f
|
||||||
{
|
{
|
||||||
float4 vertex : SV_POSITION;
|
float4 vertex : SV_POSITION;
|
||||||
fixed4 color : COLOR;
|
fixed4 color : COLOR;
|
||||||
float2 texcoord : TEXCOORD0;
|
float2 texcoord : TEXCOORD0;
|
||||||
float4 worldPosition : TEXCOORD1;
|
float4 worldPosition : TEXCOORD1;
|
||||||
|
float4 mask : TEXCOORD2;
|
||||||
UNITY_VERTEX_OUTPUT_STEREO
|
UNITY_VERTEX_OUTPUT_STEREO
|
||||||
};
|
};
|
||||||
|
|
||||||
sampler2D _MainTex;
|
sampler2D _MainTex;
|
||||||
fixed4 _Color;
|
fixed4 _Color;
|
||||||
fixed4 _TextureSampleAdd;
|
fixed4 _TextureSampleAdd;
|
||||||
float4 _ClipRect;
|
float4 _ClipRect;
|
||||||
float4 _MainTex_ST;
|
float4 _MainTex_ST;
|
||||||
|
float _UIMaskSoftnessX;
|
||||||
|
float _UIMaskSoftnessY;
|
||||||
|
int _UIVertexColorAlwaysGammaSpace;
|
||||||
|
|
||||||
v2f vert(appdata_t v)
|
v2f vert(appdata_t v)
|
||||||
{
|
{
|
||||||
v2f OUT;
|
v2f OUT;
|
||||||
UNITY_SETUP_INSTANCE_ID(v);
|
UNITY_SETUP_INSTANCE_ID(v);
|
||||||
UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(OUT);
|
UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(OUT);
|
||||||
OUT.worldPosition = v.vertex;
|
float4 vPosition = UnityObjectToClipPos(v.vertex);
|
||||||
OUT.vertex = UnityObjectToClipPos(OUT.worldPosition);
|
OUT.worldPosition = v.vertex;
|
||||||
|
OUT.vertex = vPosition;
|
||||||
|
|
||||||
|
float2 pixelSize = vPosition.w;
|
||||||
|
pixelSize /= abs(mul((float2x2)UNITY_MATRIX_P, _ScreenParams.xy));
|
||||||
|
|
||||||
|
float4 clampedRect = clamp(_ClipRect, -2e10, 2e10);
|
||||||
OUT.texcoord = TRANSFORM_TEX(v.texcoord, _MainTex);
|
OUT.texcoord = TRANSFORM_TEX(v.texcoord, _MainTex);
|
||||||
|
OUT.mask = half4(v.vertex.xy * 2 - clampedRect.xy - clampedRect.zw, 0.25 / (0.25 * half2(_UIMaskSoftnessX, _UIMaskSoftnessY) + abs(pixelSize.xy)));
|
||||||
|
|
||||||
|
if (_UIVertexColorAlwaysGammaSpace && !IsGammaSpace())
|
||||||
|
{
|
||||||
|
v.color.rgb = UIGammaToLinear(v.color.rgb);
|
||||||
|
}
|
||||||
OUT.color = v.color * _Color;
|
OUT.color = v.color * _Color;
|
||||||
return OUT;
|
return OUT;
|
||||||
}
|
}
|
||||||
|
|
@ -99,9 +113,10 @@ Shader "TextMeshPro/Sprite"
|
||||||
fixed4 frag(v2f IN) : SV_Target
|
fixed4 frag(v2f IN) : SV_Target
|
||||||
{
|
{
|
||||||
half4 color = (tex2D(_MainTex, IN.texcoord) + _TextureSampleAdd) * IN.color;
|
half4 color = (tex2D(_MainTex, IN.texcoord) + _TextureSampleAdd) * IN.color;
|
||||||
|
|
||||||
#ifdef UNITY_UI_CLIP_RECT
|
#if UNITY_UI_CLIP_RECT
|
||||||
color.a *= UnityGet2DClipping(IN.worldPosition.xy, _ClipRect);
|
half2 m = saturate((_ClipRect.zw - _ClipRect.xy - abs(IN.mask.xy)) * IN.mask.zw);
|
||||||
|
color *= m.x * m.y;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef UNITY_UI_ALPHACLIP
|
#ifdef UNITY_UI_ALPHACLIP
|
||||||
|
|
@ -110,7 +125,7 @@ Shader "TextMeshPro/Sprite"
|
||||||
|
|
||||||
return color;
|
return color;
|
||||||
}
|
}
|
||||||
ENDCG
|
ENDCG
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,6 @@ ShaderImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
defaultTextures: []
|
defaultTextures: []
|
||||||
nonModifiableTextures: []
|
nonModifiableTextures: []
|
||||||
userData:
|
userData: Version 2.0
|
||||||
assetBundleName:
|
assetBundleName:
|
||||||
assetBundleVariant:
|
assetBundleVariant:
|
||||||
|
|
|
||||||
|
|
@ -1,20 +1,22 @@
|
||||||
struct vertex_t {
|
struct vertex_t
|
||||||
|
{
|
||||||
UNITY_VERTEX_INPUT_INSTANCE_ID
|
UNITY_VERTEX_INPUT_INSTANCE_ID
|
||||||
float4 position : POSITION;
|
float4 position : POSITION;
|
||||||
float3 normal : NORMAL;
|
float3 normal : NORMAL;
|
||||||
float4 color : COLOR;
|
float4 color : COLOR;
|
||||||
float2 texcoord0 : TEXCOORD0;
|
float4 texcoord0 : TEXCOORD0;
|
||||||
float2 texcoord1 : TEXCOORD1;
|
float2 texcoord1 : TEXCOORD1;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct pixel_t {
|
struct pixel_t
|
||||||
|
{
|
||||||
UNITY_VERTEX_INPUT_INSTANCE_ID
|
UNITY_VERTEX_INPUT_INSTANCE_ID
|
||||||
UNITY_VERTEX_OUTPUT_STEREO
|
UNITY_VERTEX_OUTPUT_STEREO
|
||||||
float4 position : SV_POSITION;
|
float4 position : SV_POSITION;
|
||||||
float4 faceColor : COLOR;
|
float4 faceColor : COLOR;
|
||||||
float4 outlineColor : COLOR1;
|
float4 outlineColor : COLOR1;
|
||||||
float4 texcoord0 : TEXCOORD0;
|
float4 texcoord0 : TEXCOORD0;
|
||||||
float4 param : TEXCOORD1; // weight, scaleRatio
|
float4 param : TEXCOORD1; // x = weight, y = no longer used
|
||||||
float2 mask : TEXCOORD2;
|
float2 mask : TEXCOORD2;
|
||||||
#if (UNDERLAY_ON || UNDERLAY_INNER)
|
#if (UNDERLAY_ON || UNDERLAY_INNER)
|
||||||
float4 texcoord2 : TEXCOORD3;
|
float4 texcoord2 : TEXCOORD3;
|
||||||
|
|
@ -22,10 +24,14 @@ struct pixel_t {
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
float4 SRGBToLinear(float4 rgba) {
|
float4 SRGBToLinear(float4 rgba)
|
||||||
|
{
|
||||||
return float4(lerp(rgba.rgb / 12.92f, pow((rgba.rgb + 0.055f) / 1.055f, 2.4f), step(0.04045f, rgba.rgb)), rgba.a);
|
return float4(lerp(rgba.rgb / 12.92f, pow((rgba.rgb + 0.055f) / 1.055f, 2.4f), step(0.04045f, rgba.rgb)), rgba.a);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
float _UIMaskSoftnessX;
|
||||||
|
float _UIMaskSoftnessY;
|
||||||
|
|
||||||
pixel_t VertShader(vertex_t input)
|
pixel_t VertShader(vertex_t input)
|
||||||
{
|
{
|
||||||
pixel_t output;
|
pixel_t output;
|
||||||
|
|
@ -35,7 +41,7 @@ pixel_t VertShader(vertex_t input)
|
||||||
UNITY_TRANSFER_INSTANCE_ID(input, output);
|
UNITY_TRANSFER_INSTANCE_ID(input, output);
|
||||||
UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(output);
|
UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(output);
|
||||||
|
|
||||||
float bold = step(input.texcoord1.y, 0);
|
float bold = step(input.texcoord0.w, 0);
|
||||||
|
|
||||||
float4 vert = input.position;
|
float4 vert = input.position;
|
||||||
vert.x += _VertexOffsetX;
|
vert.x += _VertexOffsetX;
|
||||||
|
|
@ -71,7 +77,7 @@ pixel_t VertShader(vertex_t input)
|
||||||
output.faceColor = faceColor;
|
output.faceColor = faceColor;
|
||||||
output.outlineColor = outlineColor;
|
output.outlineColor = outlineColor;
|
||||||
output.texcoord0 = float4(input.texcoord0.xy, maskUV.xy);
|
output.texcoord0 = float4(input.texcoord0.xy, maskUV.xy);
|
||||||
output.param = float4(0.5 - weight, 1.3333 * _GradientScale * (_Sharpness + 1) / _TextureWidth, _OutlineWidth * _ScaleRatioA * 0.5, 0);
|
output.param = float4(0.5 - weight, 0, _OutlineWidth * _ScaleRatioA * 0.5, 0);
|
||||||
|
|
||||||
float2 mask = float2(0, 0);
|
float2 mask = float2(0, 0);
|
||||||
#if UNITY_UI_CLIP_RECT
|
#if UNITY_UI_CLIP_RECT
|
||||||
|
|
@ -99,8 +105,9 @@ float4 PixShader(pixel_t input) : SV_Target
|
||||||
|
|
||||||
float d = tex2D(_MainTex, input.texcoord0.xy).a;
|
float d = tex2D(_MainTex, input.texcoord0.xy).a;
|
||||||
|
|
||||||
float2 UV = input.texcoord0.xy;
|
float pixelSize = abs(ddx(input.texcoord0.y)) + abs(ddy(input.texcoord0.y));
|
||||||
float scale = rsqrt(abs(ddx(UV.x) * ddy(UV.y) - ddy(UV.x) * ddx(UV.y))) * input.param.y;
|
pixelSize *= _TextureHeight * 0.75;
|
||||||
|
float scale = 1 / pixelSize * _GradientScale * (_Sharpness + 1);
|
||||||
|
|
||||||
#if (UNDERLAY_ON | UNDERLAY_INNER)
|
#if (UNDERLAY_ON | UNDERLAY_INNER)
|
||||||
float layerScale = scale;
|
float layerScale = scale;
|
||||||
|
|
@ -112,7 +119,7 @@ float4 PixShader(pixel_t input) : SV_Target
|
||||||
|
|
||||||
float4 faceColor = input.faceColor * saturate((d - input.param.x) * scale + 0.5);
|
float4 faceColor = input.faceColor * saturate((d - input.param.x) * scale + 0.5);
|
||||||
|
|
||||||
#ifdef OUTLINE_ON
|
#if OUTLINE_ON
|
||||||
float4 outlineColor = lerp(input.faceColor, input.outlineColor, sqrt(min(1.0, input.param.z * scale * 2)));
|
float4 outlineColor = lerp(input.faceColor, input.outlineColor, sqrt(min(1.0, input.param.z * scale * 2)));
|
||||||
faceColor = lerp(outlineColor, input.faceColor, saturate((d - input.param.x - input.param.z) * scale + 0.5));
|
faceColor = lerp(outlineColor, input.faceColor, saturate((d - input.param.x - input.param.z) * scale + 0.5));
|
||||||
faceColor *= saturate((d - input.param.x + input.param.z) * scale + 0.5);
|
faceColor *= saturate((d - input.param.x + input.param.z) * scale + 0.5);
|
||||||
|
|
@ -130,7 +137,7 @@ float4 PixShader(pixel_t input) : SV_Target
|
||||||
faceColor += float4(_UnderlayColor.rgb * _UnderlayColor.a, _UnderlayColor.a) * (1 - saturate(d - layerBias)) * sd * (1 - faceColor.a);
|
faceColor += float4(_UnderlayColor.rgb * _UnderlayColor.a, _UnderlayColor.a) * (1 - saturate(d - layerBias)) * sd * (1 - faceColor.a);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef MASKING
|
#if MASKING
|
||||||
float a = abs(_MaskInverse - tex2D(_MaskTex, input.texcoord0.zw).a);
|
float a = abs(_MaskInverse - tex2D(_MaskTex, input.texcoord0.zw).a);
|
||||||
float t = a + (1 - _MaskWipeControl) * _MaskEdgeSoftness - _MaskWipeControl;
|
float t = a + (1 - _MaskWipeControl) * _MaskEdgeSoftness - _MaskWipeControl;
|
||||||
a = saturate(t / _MaskEdgeSoftness);
|
a = saturate(t / _MaskEdgeSoftness);
|
||||||
|
|
@ -140,7 +147,8 @@ float4 PixShader(pixel_t input) : SV_Target
|
||||||
|
|
||||||
// Alternative implementation to UnityGet2DClipping with support for softness
|
// Alternative implementation to UnityGet2DClipping with support for softness
|
||||||
#if UNITY_UI_CLIP_RECT
|
#if UNITY_UI_CLIP_RECT
|
||||||
float2 maskZW = 0.25 / (0.25 * half2(_MaskSoftnessX, _MaskSoftnessY) + (1 / scale));
|
half2 maskSoftness = half2(max(_UIMaskSoftnessX, _MaskSoftnessX), max(_UIMaskSoftnessY, _MaskSoftnessY));
|
||||||
|
float2 maskZW = 0.25 / (0.25 * maskSoftness + 1 / scale);
|
||||||
float2 m = saturate((_ClipRect.zw - _ClipRect.xy - abs(input.mask.xy)) * maskZW);
|
float2 m = saturate((_ClipRect.zw - _ClipRect.xy - abs(input.mask.xy)) * maskZW);
|
||||||
faceColor *= m.x * m.y;
|
faceColor *= m.x * m.y;
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
|
|
@ -66,11 +66,6 @@ uniform float _MaskID;
|
||||||
uniform sampler2D _MaskTex;
|
uniform sampler2D _MaskTex;
|
||||||
uniform float4 _MaskCoord;
|
uniform float4 _MaskCoord;
|
||||||
uniform float4 _ClipRect; // bottom left(x,y) : top right(z,w)
|
uniform float4 _ClipRect; // bottom left(x,y) : top right(z,w)
|
||||||
//uniform float _MaskWipeControl;
|
|
||||||
//uniform float _MaskEdgeSoftness;
|
|
||||||
//uniform fixed4 _MaskEdgeColor;
|
|
||||||
//uniform bool _MaskInverse;
|
|
||||||
|
|
||||||
uniform float _MaskSoftnessX;
|
uniform float _MaskSoftnessX;
|
||||||
uniform float _MaskSoftnessY;
|
uniform float _MaskSoftnessY;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@ void VertShader(inout appdata_full v, out Input data)
|
||||||
|
|
||||||
UNITY_INITIALIZE_OUTPUT(Input, data);
|
UNITY_INITIALIZE_OUTPUT(Input, data);
|
||||||
|
|
||||||
float bold = step(v.texcoord1.y, 0);
|
float bold = step(v.texcoord.w, 0);
|
||||||
|
|
||||||
// Generate normal for backface
|
// Generate normal for backface
|
||||||
float3 view = ObjSpaceViewDir(v.vertex);
|
float3 view = ObjSpaceViewDir(v.vertex);
|
||||||
|
|
@ -20,14 +20,12 @@ void VertShader(inout appdata_full v, out Input data)
|
||||||
|
|
||||||
pixelSize /= float2(_ScaleX, _ScaleY) * mul((float2x2)UNITY_MATRIX_P, _ScreenParams.xy);
|
pixelSize /= float2(_ScaleX, _ScaleY) * mul((float2x2)UNITY_MATRIX_P, _ScreenParams.xy);
|
||||||
float scale = rsqrt(dot(pixelSize, pixelSize));
|
float scale = rsqrt(dot(pixelSize, pixelSize));
|
||||||
scale *= abs(v.texcoord1.y) * _GradientScale * (_Sharpness + 1);
|
scale *= abs(v.texcoord.w) * _GradientScale * (_Sharpness + 1);
|
||||||
scale = lerp(scale * (1 - _PerspectiveFilter), scale, abs(dot(UnityObjectToWorldNormal(v.normal.xyz), normalize(WorldSpaceViewDir(vert)))));
|
scale = lerp(scale * (1 - _PerspectiveFilter), scale, abs(dot(UnityObjectToWorldNormal(v.normal.xyz), normalize(WorldSpaceViewDir(vert)))));
|
||||||
data.param.y = scale;
|
data.param.y = scale;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
data.param.x = (lerp(_WeightNormal, _WeightBold, bold) / 4.0 + _FaceDilate) * _ScaleRatioA * 0.5; //
|
data.param.x = (lerp(_WeightNormal, _WeightBold, bold) / 4.0 + _FaceDilate) * _ScaleRatioA * 0.5; //
|
||||||
|
|
||||||
v.texcoord1.xy = UnpackUV(v.texcoord1.x);
|
|
||||||
data.viewDirEnv = mul((float3x3)_EnvMatrix, WorldSpaceViewDir(v.vertex));
|
data.viewDirEnv = mul((float3x3)_EnvMatrix, WorldSpaceViewDir(v.vertex));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -82,7 +80,7 @@ void PixShader(Input input, inout SurfaceOutput o)
|
||||||
float3 n = float3(0, 0, -1);
|
float3 n = float3(0, 0, -1);
|
||||||
float3 emission = float3(0, 0, 0);
|
float3 emission = float3(0, 0, 0);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if GLOW_ON
|
#if GLOW_ON
|
||||||
float4 glowColor = GetGlowColor(sd, scale);
|
float4 glowColor = GetGlowColor(sd, scale);
|
||||||
glowColor.a *= input.color.a;
|
glowColor.a *= input.color.a;
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,15 @@
|
||||||
{
|
{
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"com.unity.2d.sprite": "1.0.0",
|
"com.unity.2d.sprite": "1.0.0",
|
||||||
"com.unity.collab-proxy": "2.3.1",
|
"com.unity.collab-proxy": "2.9.3",
|
||||||
"com.unity.ide.visualstudio": "2.0.22",
|
"com.unity.ide.visualstudio": "2.0.23",
|
||||||
"com.unity.mobile.android-logcat": "1.4.1",
|
"com.unity.mobile.android-logcat": "1.4.6",
|
||||||
"com.unity.recorder": "4.0.3",
|
"com.unity.multiplayer.center": "1.0.0",
|
||||||
"com.unity.test-framework": "1.1.33",
|
"com.unity.recorder": "5.1.2",
|
||||||
"com.unity.textmeshpro": "3.0.6",
|
"com.unity.test-framework": "1.6.0",
|
||||||
"com.unity.timeline": "1.7.6",
|
"com.unity.timeline": "1.8.9",
|
||||||
"com.unity.ugui": "1.0.0",
|
"com.unity.ugui": "2.0.0",
|
||||||
|
"com.unity.modules.accessibility": "1.0.0",
|
||||||
"com.unity.modules.ai": "1.0.0",
|
"com.unity.modules.ai": "1.0.0",
|
||||||
"com.unity.modules.androidjni": "1.0.0",
|
"com.unity.modules.androidjni": "1.0.0",
|
||||||
"com.unity.modules.animation": "1.0.0",
|
"com.unity.modules.animation": "1.0.0",
|
||||||
|
|
|
||||||
|
|
@ -6,22 +6,53 @@
|
||||||
"source": "builtin",
|
"source": "builtin",
|
||||||
"dependencies": {}
|
"dependencies": {}
|
||||||
},
|
},
|
||||||
|
"com.unity.bindings.openimageio": {
|
||||||
|
"version": "1.0.0",
|
||||||
|
"depth": 1,
|
||||||
|
"source": "registry",
|
||||||
|
"dependencies": {
|
||||||
|
"com.unity.collections": "1.0.0"
|
||||||
|
},
|
||||||
|
"url": "https://packages.unity.com"
|
||||||
|
},
|
||||||
|
"com.unity.burst": {
|
||||||
|
"version": "1.8.25",
|
||||||
|
"depth": 2,
|
||||||
|
"source": "registry",
|
||||||
|
"dependencies": {
|
||||||
|
"com.unity.mathematics": "1.2.1",
|
||||||
|
"com.unity.modules.jsonserialize": "1.0.0"
|
||||||
|
},
|
||||||
|
"url": "https://packages.unity.com"
|
||||||
|
},
|
||||||
"com.unity.collab-proxy": {
|
"com.unity.collab-proxy": {
|
||||||
"version": "2.3.1",
|
"version": "2.9.3",
|
||||||
"depth": 0,
|
"depth": 0,
|
||||||
"source": "registry",
|
"source": "registry",
|
||||||
"dependencies": {},
|
"dependencies": {},
|
||||||
"url": "https://packages.unity.com"
|
"url": "https://packages.unity.com"
|
||||||
},
|
},
|
||||||
"com.unity.ext.nunit": {
|
"com.unity.collections": {
|
||||||
"version": "1.0.6",
|
"version": "2.5.7",
|
||||||
"depth": 1,
|
"depth": 1,
|
||||||
"source": "registry",
|
"source": "registry",
|
||||||
"dependencies": {},
|
"dependencies": {
|
||||||
|
"com.unity.burst": "1.8.19",
|
||||||
|
"com.unity.mathematics": "1.3.2",
|
||||||
|
"com.unity.test-framework": "1.4.6",
|
||||||
|
"com.unity.nuget.mono-cecil": "1.11.5",
|
||||||
|
"com.unity.test-framework.performance": "3.0.3"
|
||||||
|
},
|
||||||
"url": "https://packages.unity.com"
|
"url": "https://packages.unity.com"
|
||||||
},
|
},
|
||||||
|
"com.unity.ext.nunit": {
|
||||||
|
"version": "2.0.5",
|
||||||
|
"depth": 1,
|
||||||
|
"source": "builtin",
|
||||||
|
"dependencies": {}
|
||||||
|
},
|
||||||
"com.unity.ide.visualstudio": {
|
"com.unity.ide.visualstudio": {
|
||||||
"version": "2.0.22",
|
"version": "2.0.23",
|
||||||
"depth": 0,
|
"depth": 0,
|
||||||
"source": "registry",
|
"source": "registry",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
|
@ -29,44 +60,68 @@
|
||||||
},
|
},
|
||||||
"url": "https://packages.unity.com"
|
"url": "https://packages.unity.com"
|
||||||
},
|
},
|
||||||
|
"com.unity.mathematics": {
|
||||||
|
"version": "1.3.2",
|
||||||
|
"depth": 2,
|
||||||
|
"source": "registry",
|
||||||
|
"dependencies": {},
|
||||||
|
"url": "https://packages.unity.com"
|
||||||
|
},
|
||||||
"com.unity.mobile.android-logcat": {
|
"com.unity.mobile.android-logcat": {
|
||||||
"version": "1.4.1",
|
"version": "1.4.6",
|
||||||
"depth": 0,
|
"depth": 0,
|
||||||
"source": "registry",
|
"source": "registry",
|
||||||
"dependencies": {},
|
"dependencies": {},
|
||||||
"url": "https://packages.unity.com"
|
"url": "https://packages.unity.com"
|
||||||
},
|
},
|
||||||
|
"com.unity.multiplayer.center": {
|
||||||
|
"version": "1.0.0",
|
||||||
|
"depth": 0,
|
||||||
|
"source": "builtin",
|
||||||
|
"dependencies": {
|
||||||
|
"com.unity.modules.uielements": "1.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"com.unity.nuget.mono-cecil": {
|
||||||
|
"version": "1.11.5",
|
||||||
|
"depth": 2,
|
||||||
|
"source": "registry",
|
||||||
|
"dependencies": {},
|
||||||
|
"url": "https://packages.unity.com"
|
||||||
|
},
|
||||||
"com.unity.recorder": {
|
"com.unity.recorder": {
|
||||||
"version": "4.0.3",
|
"version": "5.1.2",
|
||||||
"depth": 0,
|
"depth": 0,
|
||||||
"source": "registry",
|
"source": "registry",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"com.unity.timeline": "1.0.0"
|
"com.unity.timeline": "1.8.7",
|
||||||
|
"com.unity.collections": "1.2.4",
|
||||||
|
"com.unity.bindings.openimageio": "1.0.0"
|
||||||
},
|
},
|
||||||
"url": "https://packages.unity.com"
|
"url": "https://packages.unity.com"
|
||||||
},
|
},
|
||||||
"com.unity.test-framework": {
|
"com.unity.test-framework": {
|
||||||
"version": "1.1.33",
|
"version": "1.6.0",
|
||||||
"depth": 0,
|
"depth": 0,
|
||||||
|
"source": "builtin",
|
||||||
|
"dependencies": {
|
||||||
|
"com.unity.ext.nunit": "2.0.3",
|
||||||
|
"com.unity.modules.imgui": "1.0.0",
|
||||||
|
"com.unity.modules.jsonserialize": "1.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"com.unity.test-framework.performance": {
|
||||||
|
"version": "3.2.0",
|
||||||
|
"depth": 2,
|
||||||
"source": "registry",
|
"source": "registry",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"com.unity.ext.nunit": "1.0.6",
|
"com.unity.test-framework": "1.1.33",
|
||||||
"com.unity.modules.imgui": "1.0.0",
|
|
||||||
"com.unity.modules.jsonserialize": "1.0.0"
|
"com.unity.modules.jsonserialize": "1.0.0"
|
||||||
},
|
},
|
||||||
"url": "https://packages.unity.com"
|
"url": "https://packages.unity.com"
|
||||||
},
|
},
|
||||||
"com.unity.textmeshpro": {
|
|
||||||
"version": "3.0.6",
|
|
||||||
"depth": 0,
|
|
||||||
"source": "registry",
|
|
||||||
"dependencies": {
|
|
||||||
"com.unity.ugui": "1.0.0"
|
|
||||||
},
|
|
||||||
"url": "https://packages.unity.com"
|
|
||||||
},
|
|
||||||
"com.unity.timeline": {
|
"com.unity.timeline": {
|
||||||
"version": "1.7.6",
|
"version": "1.8.9",
|
||||||
"depth": 0,
|
"depth": 0,
|
||||||
"source": "registry",
|
"source": "registry",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
|
@ -78,7 +133,7 @@
|
||||||
"url": "https://packages.unity.com"
|
"url": "https://packages.unity.com"
|
||||||
},
|
},
|
||||||
"com.unity.ugui": {
|
"com.unity.ugui": {
|
||||||
"version": "1.0.0",
|
"version": "2.0.0",
|
||||||
"depth": 0,
|
"depth": 0,
|
||||||
"source": "builtin",
|
"source": "builtin",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
|
@ -86,6 +141,12 @@
|
||||||
"com.unity.modules.imgui": "1.0.0"
|
"com.unity.modules.imgui": "1.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"com.unity.modules.accessibility": {
|
||||||
|
"version": "1.0.0",
|
||||||
|
"depth": 0,
|
||||||
|
"source": "builtin",
|
||||||
|
"dependencies": {}
|
||||||
|
},
|
||||||
"com.unity.modules.ai": {
|
"com.unity.modules.ai": {
|
||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
"depth": 0,
|
"depth": 0,
|
||||||
|
|
@ -133,6 +194,12 @@
|
||||||
"com.unity.modules.animation": "1.0.0"
|
"com.unity.modules.animation": "1.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"com.unity.modules.hierarchycore": {
|
||||||
|
"version": "1.0.0",
|
||||||
|
"depth": 1,
|
||||||
|
"source": "builtin",
|
||||||
|
"dependencies": {}
|
||||||
|
},
|
||||||
"com.unity.modules.imageconversion": {
|
"com.unity.modules.imageconversion": {
|
||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
"depth": 0,
|
"depth": 0,
|
||||||
|
|
@ -221,7 +288,9 @@
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"com.unity.modules.ui": "1.0.0",
|
"com.unity.modules.ui": "1.0.0",
|
||||||
"com.unity.modules.imgui": "1.0.0",
|
"com.unity.modules.imgui": "1.0.0",
|
||||||
"com.unity.modules.jsonserialize": "1.0.0"
|
"com.unity.modules.jsonserialize": "1.0.0",
|
||||||
|
"com.unity.modules.hierarchycore": "1.0.0",
|
||||||
|
"com.unity.modules.physics": "1.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"com.unity.modules.umbra": {
|
"com.unity.modules.umbra": {
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
--- !u!129 &1
|
--- !u!129 &1
|
||||||
PlayerSettings:
|
PlayerSettings:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
serializedVersion: 26
|
serializedVersion: 28
|
||||||
productGUID: 4bb4ad412f4a1ce4180d43338d7afb40
|
productGUID: 4bb4ad412f4a1ce4180d43338d7afb40
|
||||||
AndroidProfiler: 0
|
AndroidProfiler: 0
|
||||||
AndroidFilterTouchesWhenObscured: 0
|
AndroidFilterTouchesWhenObscured: 0
|
||||||
|
|
@ -52,6 +52,7 @@ PlayerSettings:
|
||||||
m_StereoRenderingPath: 0
|
m_StereoRenderingPath: 0
|
||||||
m_ActiveColorSpace: 0
|
m_ActiveColorSpace: 0
|
||||||
unsupportedMSAAFallback: 0
|
unsupportedMSAAFallback: 0
|
||||||
|
m_SpriteBatchMaxVertexCount: 65535
|
||||||
m_SpriteBatchVertexThreshold: 300
|
m_SpriteBatchVertexThreshold: 300
|
||||||
m_MTRendering: 1
|
m_MTRendering: 1
|
||||||
mipStripping: 0
|
mipStripping: 0
|
||||||
|
|
@ -72,21 +73,24 @@ PlayerSettings:
|
||||||
androidStartInFullscreen: 1
|
androidStartInFullscreen: 1
|
||||||
androidRenderOutsideSafeArea: 1
|
androidRenderOutsideSafeArea: 1
|
||||||
androidUseSwappy: 0
|
androidUseSwappy: 0
|
||||||
|
androidDisplayOptions: 1
|
||||||
androidBlitType: 0
|
androidBlitType: 0
|
||||||
androidResizableWindow: 0
|
androidResizeableActivity: 0
|
||||||
androidDefaultWindowWidth: 1920
|
androidDefaultWindowWidth: 1920
|
||||||
androidDefaultWindowHeight: 1080
|
androidDefaultWindowHeight: 1080
|
||||||
androidMinimumWindowWidth: 400
|
androidMinimumWindowWidth: 400
|
||||||
androidMinimumWindowHeight: 300
|
androidMinimumWindowHeight: 300
|
||||||
androidFullscreenMode: 1
|
androidFullscreenMode: 1
|
||||||
androidAutoRotationBehavior: 1
|
androidAutoRotationBehavior: 1
|
||||||
|
androidPredictiveBackSupport: 1
|
||||||
|
androidApplicationEntry: 1
|
||||||
defaultIsNativeResolution: 1
|
defaultIsNativeResolution: 1
|
||||||
macRetinaSupport: 1
|
macRetinaSupport: 1
|
||||||
runInBackground: 1
|
runInBackground: 1
|
||||||
captureSingleScreen: 0
|
|
||||||
muteOtherAudioSources: 0
|
muteOtherAudioSources: 0
|
||||||
Prepare IOS For Recording: 0
|
Prepare IOS For Recording: 0
|
||||||
Force IOS Speakers When Recording: 0
|
Force IOS Speakers When Recording: 0
|
||||||
|
audioSpatialExperience: 0
|
||||||
deferSystemGesturesMode: 0
|
deferSystemGesturesMode: 0
|
||||||
hideHomeButton: 0
|
hideHomeButton: 0
|
||||||
submitAnalytics: 1
|
submitAnalytics: 1
|
||||||
|
|
@ -99,6 +103,7 @@ PlayerSettings:
|
||||||
useMacAppStoreValidation: 0
|
useMacAppStoreValidation: 0
|
||||||
macAppStoreCategory: public.app-category.games
|
macAppStoreCategory: public.app-category.games
|
||||||
gpuSkinning: 1
|
gpuSkinning: 1
|
||||||
|
meshDeformation: 2
|
||||||
xboxPIXTextureCapture: 0
|
xboxPIXTextureCapture: 0
|
||||||
xboxEnableAvatar: 0
|
xboxEnableAvatar: 0
|
||||||
xboxEnableKinect: 0
|
xboxEnableKinect: 0
|
||||||
|
|
@ -130,10 +135,9 @@ PlayerSettings:
|
||||||
switchAllowGpuScratchShrinking: 0
|
switchAllowGpuScratchShrinking: 0
|
||||||
switchNVNMaxPublicTextureIDCount: 0
|
switchNVNMaxPublicTextureIDCount: 0
|
||||||
switchNVNMaxPublicSamplerIDCount: 0
|
switchNVNMaxPublicSamplerIDCount: 0
|
||||||
switchNVNGraphicsFirmwareMemory: 32
|
|
||||||
switchMaxWorkerMultiple: 8
|
switchMaxWorkerMultiple: 8
|
||||||
stadiaPresentMode: 0
|
switchNVNGraphicsFirmwareMemory: 32
|
||||||
stadiaTargetFramerate: 0
|
switchGraphicsJobsSyncAfterKick: 1
|
||||||
vulkanNumSwapchainBuffers: 3
|
vulkanNumSwapchainBuffers: 3
|
||||||
vulkanEnableSetSRGBWrite: 0
|
vulkanEnableSetSRGBWrite: 0
|
||||||
vulkanEnablePreTransform: 0
|
vulkanEnablePreTransform: 0
|
||||||
|
|
@ -142,7 +146,7 @@ PlayerSettings:
|
||||||
loadStoreDebugModeEnabled: 0
|
loadStoreDebugModeEnabled: 0
|
||||||
visionOSBundleVersion: 1.0
|
visionOSBundleVersion: 1.0
|
||||||
tvOSBundleVersion: 1.0
|
tvOSBundleVersion: 1.0
|
||||||
bundleVersion: 0.3.24
|
bundleVersion: 0.3.27
|
||||||
preloadedAssets: []
|
preloadedAssets: []
|
||||||
metroInputSource: 0
|
metroInputSource: 0
|
||||||
wsaTransparentSwapchain: 0
|
wsaTransparentSwapchain: 0
|
||||||
|
|
@ -163,6 +167,7 @@ PlayerSettings:
|
||||||
resetResolutionOnWindowResize: 0
|
resetResolutionOnWindowResize: 0
|
||||||
androidSupportedAspectRatio: 1
|
androidSupportedAspectRatio: 1
|
||||||
androidMaxAspectRatio: 2.1
|
androidMaxAspectRatio: 2.1
|
||||||
|
androidMinAspectRatio: 1
|
||||||
applicationIdentifier:
|
applicationIdentifier:
|
||||||
Android: com.MoxiFoxi.PlaneRun
|
Android: com.MoxiFoxi.PlaneRun
|
||||||
buildNumber:
|
buildNumber:
|
||||||
|
|
@ -171,9 +176,9 @@ PlayerSettings:
|
||||||
iPhone: 0
|
iPhone: 0
|
||||||
tvOS: 0
|
tvOS: 0
|
||||||
overrideDefaultApplicationIdentifier: 0
|
overrideDefaultApplicationIdentifier: 0
|
||||||
AndroidBundleVersionCode: 28
|
AndroidBundleVersionCode: 30
|
||||||
AndroidMinSdkVersion: 30
|
AndroidMinSdkVersion: 30
|
||||||
AndroidTargetSdkVersion: 34
|
AndroidTargetSdkVersion: 36
|
||||||
AndroidPreferredInstallLocation: 1
|
AndroidPreferredInstallLocation: 1
|
||||||
aotOptions:
|
aotOptions:
|
||||||
stripEngineCode: 1
|
stripEngineCode: 1
|
||||||
|
|
@ -182,16 +187,18 @@ PlayerSettings:
|
||||||
ForceInternetPermission: 0
|
ForceInternetPermission: 0
|
||||||
ForceSDCardPermission: 0
|
ForceSDCardPermission: 0
|
||||||
CreateWallpaper: 0
|
CreateWallpaper: 0
|
||||||
APKExpansionFiles: 0
|
androidSplitApplicationBinary: 0
|
||||||
keepLoadedShadersAlive: 0
|
keepLoadedShadersAlive: 0
|
||||||
StripUnusedMeshComponents: 1
|
StripUnusedMeshComponents: 1
|
||||||
strictShaderVariantMatching: 0
|
strictShaderVariantMatching: 0
|
||||||
VertexChannelCompressionMask: 4054
|
VertexChannelCompressionMask: 4054
|
||||||
iPhoneSdkVersion: 988
|
iPhoneSdkVersion: 988
|
||||||
iOSTargetOSVersionString: 12.0
|
iOSSimulatorArchitecture: 0
|
||||||
|
iOSTargetOSVersionString: 13.0
|
||||||
tvOSSdkVersion: 0
|
tvOSSdkVersion: 0
|
||||||
|
tvOSSimulatorArchitecture: 0
|
||||||
tvOSRequireExtendedGameController: 0
|
tvOSRequireExtendedGameController: 0
|
||||||
tvOSTargetOSVersionString: 12.0
|
tvOSTargetOSVersionString: 13.0
|
||||||
VisionOSSdkVersion: 0
|
VisionOSSdkVersion: 0
|
||||||
VisionOSTargetOSVersionString: 1.0
|
VisionOSTargetOSVersionString: 1.0
|
||||||
uIPrerenderedIcon: 0
|
uIPrerenderedIcon: 0
|
||||||
|
|
@ -218,7 +225,6 @@ PlayerSettings:
|
||||||
rgba: 0
|
rgba: 0
|
||||||
iOSLaunchScreenFillPct: 100
|
iOSLaunchScreenFillPct: 100
|
||||||
iOSLaunchScreenSize: 100
|
iOSLaunchScreenSize: 100
|
||||||
iOSLaunchScreenCustomXibPath:
|
|
||||||
iOSLaunchScreeniPadType: 0
|
iOSLaunchScreeniPadType: 0
|
||||||
iOSLaunchScreeniPadImage: {fileID: 0}
|
iOSLaunchScreeniPadImage: {fileID: 0}
|
||||||
iOSLaunchScreeniPadBackgroundColor:
|
iOSLaunchScreeniPadBackgroundColor:
|
||||||
|
|
@ -226,7 +232,6 @@ PlayerSettings:
|
||||||
rgba: 0
|
rgba: 0
|
||||||
iOSLaunchScreeniPadFillPct: 100
|
iOSLaunchScreeniPadFillPct: 100
|
||||||
iOSLaunchScreeniPadSize: 100
|
iOSLaunchScreeniPadSize: 100
|
||||||
iOSLaunchScreeniPadCustomXibPath:
|
|
||||||
iOSLaunchScreenCustomStoryboardPath:
|
iOSLaunchScreenCustomStoryboardPath:
|
||||||
iOSLaunchScreeniPadCustomStoryboardPath:
|
iOSLaunchScreeniPadCustomStoryboardPath:
|
||||||
iOSDeviceRequirements: []
|
iOSDeviceRequirements: []
|
||||||
|
|
@ -236,6 +241,7 @@ PlayerSettings:
|
||||||
iOSMetalForceHardShadows: 0
|
iOSMetalForceHardShadows: 0
|
||||||
metalEditorSupport: 1
|
metalEditorSupport: 1
|
||||||
metalAPIValidation: 1
|
metalAPIValidation: 1
|
||||||
|
metalCompileShaderBinary: 0
|
||||||
iOSRenderExtraFrameOnPause: 0
|
iOSRenderExtraFrameOnPause: 0
|
||||||
iosCopyPluginsCodeInsteadOfSymlink: 0
|
iosCopyPluginsCodeInsteadOfSymlink: 0
|
||||||
appleDeveloperTeamID:
|
appleDeveloperTeamID:
|
||||||
|
|
@ -262,15 +268,18 @@ PlayerSettings:
|
||||||
useCustomGradleSettingsTemplate: 1
|
useCustomGradleSettingsTemplate: 1
|
||||||
useCustomProguardFile: 0
|
useCustomProguardFile: 0
|
||||||
AndroidTargetArchitectures: 3
|
AndroidTargetArchitectures: 3
|
||||||
AndroidTargetDevices: 0
|
|
||||||
AndroidSplashScreenScale: 0
|
AndroidSplashScreenScale: 0
|
||||||
androidSplashScreen: {fileID: 0}
|
androidSplashScreen: {fileID: 0}
|
||||||
AndroidKeystoreName: '{inproject}: user.keystore'
|
AndroidKeystoreName: '{inproject}: user.keystore'
|
||||||
AndroidKeyaliasName: plane run
|
AndroidKeyaliasName: plane run
|
||||||
AndroidEnableArmv9SecurityFeatures: 0
|
AndroidEnableArmv9SecurityFeatures: 0
|
||||||
|
AndroidEnableArm64MTE: 0
|
||||||
AndroidBuildApkPerCpuArchitecture: 0
|
AndroidBuildApkPerCpuArchitecture: 0
|
||||||
AndroidTVCompatibility: 0
|
AndroidTVCompatibility: 0
|
||||||
AndroidIsGame: 1
|
AndroidIsGame: 1
|
||||||
|
androidAppCategory: 3
|
||||||
|
useAndroidAppCategory: 1
|
||||||
|
androidAppCategoryOther:
|
||||||
AndroidEnableTango: 0
|
AndroidEnableTango: 0
|
||||||
androidEnableBanner: 1
|
androidEnableBanner: 1
|
||||||
androidUseLowAccuracyLocation: 0
|
androidUseLowAccuracyLocation: 0
|
||||||
|
|
@ -280,11 +289,12 @@ PlayerSettings:
|
||||||
height: 180
|
height: 180
|
||||||
banner: {fileID: 0}
|
banner: {fileID: 0}
|
||||||
androidGamepadSupportLevel: 0
|
androidGamepadSupportLevel: 0
|
||||||
chromeosInputEmulation: 1
|
|
||||||
AndroidMinifyRelease: 0
|
AndroidMinifyRelease: 0
|
||||||
AndroidMinifyDebug: 0
|
AndroidMinifyDebug: 0
|
||||||
AndroidValidateAppBundleSize: 1
|
AndroidValidateAppBundleSize: 1
|
||||||
AndroidAppBundleSizeToValidate: 150
|
AndroidAppBundleSizeToValidate: 150
|
||||||
|
AndroidReportGooglePlayAppDependencies: 1
|
||||||
|
androidSymbolsSizeThreshold: 800
|
||||||
m_BuildTargetIcons:
|
m_BuildTargetIcons:
|
||||||
- m_BuildTarget:
|
- m_BuildTarget:
|
||||||
m_Icons:
|
m_Icons:
|
||||||
|
|
@ -559,6 +569,9 @@ PlayerSettings:
|
||||||
- m_BuildTarget: WebGLSupport
|
- m_BuildTarget: WebGLSupport
|
||||||
m_APIs: 0b000000
|
m_APIs: 0b000000
|
||||||
m_Automatic: 1
|
m_Automatic: 1
|
||||||
|
- m_BuildTarget: WindowsStandaloneSupport
|
||||||
|
m_APIs: 0200000012000000
|
||||||
|
m_Automatic: 0
|
||||||
m_BuildTargetVRSettings:
|
m_BuildTargetVRSettings:
|
||||||
- m_BuildTarget: Standalone
|
- m_BuildTarget: Standalone
|
||||||
m_Enabled: 0
|
m_Enabled: 0
|
||||||
|
|
@ -580,10 +593,14 @@ PlayerSettings:
|
||||||
m_BuildTargetGroupLightmapSettings: []
|
m_BuildTargetGroupLightmapSettings: []
|
||||||
m_BuildTargetGroupLoadStoreDebugModeSettings: []
|
m_BuildTargetGroupLoadStoreDebugModeSettings: []
|
||||||
m_BuildTargetNormalMapEncoding: []
|
m_BuildTargetNormalMapEncoding: []
|
||||||
m_BuildTargetDefaultTextureCompressionFormat: []
|
m_BuildTargetDefaultTextureCompressionFormat:
|
||||||
|
- serializedVersion: 3
|
||||||
|
m_BuildTarget: Android
|
||||||
|
m_Formats: 01000000
|
||||||
playModeTestRunnerEnabled: 0
|
playModeTestRunnerEnabled: 0
|
||||||
runPlayModeTestAsEditModeTest: 0
|
runPlayModeTestAsEditModeTest: 0
|
||||||
actionOnDotNetUnhandledException: 1
|
actionOnDotNetUnhandledException: 1
|
||||||
|
editorGfxJobOverride: 1
|
||||||
enableInternalProfiler: 0
|
enableInternalProfiler: 0
|
||||||
logObjCUncaughtExceptions: 1
|
logObjCUncaughtExceptions: 1
|
||||||
enableCrashReportAPI: 0
|
enableCrashReportAPI: 0
|
||||||
|
|
@ -591,7 +608,7 @@ PlayerSettings:
|
||||||
locationUsageDescription:
|
locationUsageDescription:
|
||||||
microphoneUsageDescription:
|
microphoneUsageDescription:
|
||||||
bluetoothUsageDescription:
|
bluetoothUsageDescription:
|
||||||
macOSTargetOSVersion: 10.13.0
|
macOSTargetOSVersion: 11.0
|
||||||
switchNMETAOverride:
|
switchNMETAOverride:
|
||||||
switchNetLibKey:
|
switchNetLibKey:
|
||||||
switchSocketMemoryPoolSize: 6144
|
switchSocketMemoryPoolSize: 6144
|
||||||
|
|
@ -729,12 +746,14 @@ PlayerSettings:
|
||||||
switchSocketBufferEfficiency: 4
|
switchSocketBufferEfficiency: 4
|
||||||
switchSocketInitializeEnabled: 1
|
switchSocketInitializeEnabled: 1
|
||||||
switchNetworkInterfaceManagerInitializeEnabled: 1
|
switchNetworkInterfaceManagerInitializeEnabled: 1
|
||||||
|
switchDisableHTCSPlayerConnection: 0
|
||||||
switchUseNewStyleFilepaths: 0
|
switchUseNewStyleFilepaths: 0
|
||||||
switchUseLegacyFmodPriorities: 1
|
switchUseLegacyFmodPriorities: 1
|
||||||
switchUseMicroSleepForYield: 1
|
switchUseMicroSleepForYield: 1
|
||||||
switchEnableRamDiskSupport: 0
|
switchEnableRamDiskSupport: 0
|
||||||
switchMicroSleepForYieldTime: 25
|
switchMicroSleepForYieldTime: 25
|
||||||
switchRamDiskSpaceSize: 12
|
switchRamDiskSpaceSize: 12
|
||||||
|
switchUpgradedPlayerSettingsToNMETA: 0
|
||||||
ps4NPAgeRating: 12
|
ps4NPAgeRating: 12
|
||||||
ps4NPTitleSecret:
|
ps4NPTitleSecret:
|
||||||
ps4NPTrophyPackPath:
|
ps4NPTrophyPackPath:
|
||||||
|
|
@ -838,6 +857,11 @@ PlayerSettings:
|
||||||
webGLMemoryGeometricGrowthStep: 0.2
|
webGLMemoryGeometricGrowthStep: 0.2
|
||||||
webGLMemoryGeometricGrowthCap: 96
|
webGLMemoryGeometricGrowthCap: 96
|
||||||
webGLPowerPreference: 2
|
webGLPowerPreference: 2
|
||||||
|
webGLWebAssemblyTable: 0
|
||||||
|
webGLWebAssemblyBigInt: 0
|
||||||
|
webGLCloseOnQuit: 0
|
||||||
|
webWasm2023: 0
|
||||||
|
webEnableSubmoduleStrippingCompatibility: 0
|
||||||
scriptingDefineSymbols:
|
scriptingDefineSymbols:
|
||||||
Android: LEVELPLAY_DEPENDENCIES_INSTALLED
|
Android: LEVELPLAY_DEPENDENCIES_INSTALLED
|
||||||
additionalCompilerArguments: {}
|
additionalCompilerArguments: {}
|
||||||
|
|
@ -846,6 +870,7 @@ PlayerSettings:
|
||||||
Android: 1
|
Android: 1
|
||||||
il2cppCompilerConfiguration: {}
|
il2cppCompilerConfiguration: {}
|
||||||
il2cppCodeGeneration: {}
|
il2cppCodeGeneration: {}
|
||||||
|
il2cppStacktraceInformation: {}
|
||||||
managedStrippingLevel:
|
managedStrippingLevel:
|
||||||
Android: 1
|
Android: 1
|
||||||
EmbeddedLinux: 1
|
EmbeddedLinux: 1
|
||||||
|
|
@ -871,6 +896,7 @@ PlayerSettings:
|
||||||
gcWBarrierValidation: 0
|
gcWBarrierValidation: 0
|
||||||
apiCompatibilityLevelPerPlatform:
|
apiCompatibilityLevelPerPlatform:
|
||||||
Android: 3
|
Android: 3
|
||||||
|
editorAssembliesCompatibilityLevel: 2
|
||||||
m_RenderingPath: 1
|
m_RenderingPath: 1
|
||||||
m_MobileRenderingPath: 1
|
m_MobileRenderingPath: 1
|
||||||
metroPackageName: Template_3D
|
metroPackageName: Template_3D
|
||||||
|
|
@ -947,9 +973,11 @@ PlayerSettings:
|
||||||
hmiPlayerDataPath:
|
hmiPlayerDataPath:
|
||||||
hmiForceSRGBBlit: 1
|
hmiForceSRGBBlit: 1
|
||||||
embeddedLinuxEnableGamepadInput: 1
|
embeddedLinuxEnableGamepadInput: 1
|
||||||
hmiLogStartupTiming: 0
|
|
||||||
hmiCpuConfiguration:
|
hmiCpuConfiguration:
|
||||||
|
hmiLogStartupTiming: 0
|
||||||
|
qnxGraphicConfPath:
|
||||||
apiCompatibilityLevel: 6
|
apiCompatibilityLevel: 6
|
||||||
|
captureStartupLogs: {}
|
||||||
activeInputHandler: 0
|
activeInputHandler: 0
|
||||||
windowsGamepadBackendHint: 0
|
windowsGamepadBackendHint: 0
|
||||||
cloudProjectId: 7efbe83b-131a-4a1a-aa30-f8e223bff789
|
cloudProjectId: 7efbe83b-131a-4a1a-aa30-f8e223bff789
|
||||||
|
|
@ -963,3 +991,7 @@ PlayerSettings:
|
||||||
platformRequiresReadableAssets: 0
|
platformRequiresReadableAssets: 0
|
||||||
virtualTexturingSupportEnabled: 0
|
virtualTexturingSupportEnabled: 0
|
||||||
insecureHttpOption: 0
|
insecureHttpOption: 0
|
||||||
|
androidVulkanDenyFilterList: []
|
||||||
|
androidVulkanAllowFilterList: []
|
||||||
|
androidVulkanDeviceFilterListAsset: {fileID: 0}
|
||||||
|
d3d12DeviceFilterListAsset: {fileID: 0}
|
||||||
|
|
|
||||||
|
|
@ -1,2 +1,2 @@
|
||||||
m_EditorVersion: 2022.3.26f1
|
m_EditorVersion: 6000.2.8f1
|
||||||
m_EditorVersionWithRevision: 2022.3.26f1 (ec6cd8118806)
|
m_EditorVersionWithRevision: 6000.2.8f1 (c9992ac36c34)
|
||||||
|
|
|
||||||
|
|
@ -61,6 +61,11 @@
|
||||||
"type": "UnityEngine.PhysicMaterial",
|
"type": "UnityEngine.PhysicMaterial",
|
||||||
"defaultInstantiationMode": 0
|
"defaultInstantiationMode": 0
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"userAdded": false,
|
||||||
|
"type": "UnityEngine.PhysicsMaterial",
|
||||||
|
"defaultInstantiationMode": 0
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"userAdded": false,
|
"userAdded": false,
|
||||||
"type": "UnityEngine.PhysicsMaterial2D",
|
"type": "UnityEngine.PhysicsMaterial2D",
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue