Compare commits
127 Commits
Author | SHA1 | Date | |
---|---|---|---|
f545e4c5ab | |||
cb98e78a3f | |||
946975249d | |||
ce55f07150 | |||
7286202be9 | |||
14640c1dca | |||
321b2a49a4 | |||
f1115ef188 | |||
92818edfaa | |||
dd40e54ef3 | |||
c19a0c2889 | |||
ded36f457d | |||
1be7a98835 | |||
a3a9ad9674 | |||
89a1f0d872 | |||
6db2d6b82a | |||
37715a46ab | |||
60cc0d76bb | |||
e7307f95e9 | |||
88da55123b | |||
eda04235c3 | |||
65031be081 | |||
0c7f6dd628 | |||
883c027a1a | |||
d51b240c6c | |||
91b5e584a6 | |||
44a5aec21e | |||
8e0a26f17c | |||
b48db63a27 | |||
c0d20f847d | |||
36732ed4d4 | |||
d3388a4dad | |||
ece9d959fd | |||
dfdf280564 | |||
2cca6c37bb | |||
c653c9efc8 | |||
374fc8b753 | |||
88b2b4841a | |||
b2da56b1ca | |||
14bc694588 | |||
7e1b993d20 | |||
f8d692352d | |||
fa4b799788 | |||
970a69be11 | |||
dddb7f09f3 | |||
3cd229bc23 | |||
4948818065 | |||
036b084d34 | |||
1e3addeb4d | |||
47c70d3071 | |||
9955b9ce30 | |||
32ddc54019 | |||
ff262d55c8 | |||
d1f3d1fa55 | |||
2965633235 | |||
a82369e595 | |||
16c4fa2b96 | |||
591ec0aa74 | |||
210d326469 | |||
dd405a21db | |||
c40f700235 | |||
36cc896b2a | |||
4c02e91dfd | |||
41b15477fb | |||
b61f71bc00 | |||
74fe42a7ff | |||
7fa8969d5b | |||
21f8332d66 | |||
cb219a52c0 | |||
f2f2100334 | |||
9bdb95527a | |||
ad504ce4cc | |||
18ebbd7b4c | |||
ba189f18c4 | |||
322aaa613e | |||
5443377bfe | |||
1ed6dc0f68 | |||
90dec1b42a | |||
80da98d95a | |||
76016fbbf1 | |||
53657b8fad | |||
9d7502091c | |||
f788c25837 | |||
017110738b | |||
fd7134ece9 | |||
68ceacfef4 | |||
a452844cd1 | |||
4b8d11e1de | |||
8f888ee552 | |||
95b99d1d42 | |||
ba6676b625 | |||
495441be06 | |||
8025a0a418 | |||
760609fae2 | |||
ecc60751f7 | |||
e10b7e4b51 | |||
a91a83a280 | |||
316f92df2c | |||
938babb41b | |||
3173dd914a | |||
5f6712f476 | |||
6b7996fdd7 | |||
5feb16dcfb | |||
bf8e98caf0 | |||
b634eb1e8e | |||
dadf38acd5 | |||
f42e0d78d6 | |||
1e7c6d81c9 | |||
dda988db17 | |||
900061f7f6 | |||
e56278c6cb | |||
2793f5fcb1 | |||
833ec43a52 | |||
e6856124e7 | |||
8ed7a130ab | |||
d8d3d4ed92 | |||
334af786f6 | |||
17ef93bb6e | |||
a6d58690f9 | |||
a6de537e4a | |||
33b0307aa2 | |||
121428414c | |||
98f774b2ae | |||
d31576fb0b | |||
c9853049c5 | |||
f108341068 | |||
40d4e2cc8a |
23
.github/workflows/ff-release.yml
vendored
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
name: Fast-Forward Release Branch
|
||||||
|
on:
|
||||||
|
release:
|
||||||
|
types: [created]
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
fast-forward:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v2
|
||||||
|
with:
|
||||||
|
ref: release
|
||||||
|
fetch-depth: 0
|
||||||
|
|
||||||
|
- name: Merge into Release
|
||||||
|
run: git merge ${{github.ref_name}} --ff-only
|
||||||
|
|
||||||
|
- name: Push Changes
|
||||||
|
uses: ad-m/github-push-action@master
|
||||||
|
with:
|
||||||
|
github_token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
branch: release
|
142
.github/workflows/ksp-publish.yml
vendored
Normal file
@ -0,0 +1,142 @@
|
|||||||
|
name: Build and Release
|
||||||
|
on: [ push ]
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Setup Python
|
||||||
|
uses: actions/setup-python@v5
|
||||||
|
with:
|
||||||
|
python-version: '3.12'
|
||||||
|
|
||||||
|
- name: Setup .NET Core SDK
|
||||||
|
uses: actions/setup-dotnet@v4.0.0
|
||||||
|
with:
|
||||||
|
dotnet-version: '6.0.x'
|
||||||
|
|
||||||
|
- name: Install Python Tools
|
||||||
|
run: |
|
||||||
|
python -m pip install --upgrade pip
|
||||||
|
python -m pip install yaclog yaclog-ksp
|
||||||
|
|
||||||
|
- name: Generate Version Info
|
||||||
|
run: |
|
||||||
|
yaclog show
|
||||||
|
python Scripts/version.py
|
||||||
|
yaclog-ksp -n "Conformal Decals"
|
||||||
|
|
||||||
|
- name: Validate Version Info
|
||||||
|
uses: DasSkelett/AVC-VersionFileValidator@master
|
||||||
|
|
||||||
|
- name: Download DLL Dependencies
|
||||||
|
working-directory: Source
|
||||||
|
run: |
|
||||||
|
wget --user drewcassidy --password ${{ secrets.PILE_OF_ROCKS_PASS }} https://pileof.rocks/Secret/conformal-decals-dependencies-1.zip
|
||||||
|
unzip conformal-decals-dependencies-*.zip -d ConformalDecals/dlls
|
||||||
|
|
||||||
|
- name: Build DLL
|
||||||
|
working-directory: Source
|
||||||
|
run: |
|
||||||
|
mkdir -p ../GameData/ConformalDecals/Plugins
|
||||||
|
dotnet build --configuration Release ConformalDecals.sln
|
||||||
|
|
||||||
|
- name: Download KSP Dependencies
|
||||||
|
run: |
|
||||||
|
wget https://pileof.rocks/KSP/Shabby_v0.3.0.zip
|
||||||
|
wget https://ksp.sarbian.com/jenkins/job/ModuleManager/161/artifact/ModuleManager.4.2.1.dll
|
||||||
|
wget https://github.com/blowfishpro/B9PartSwitch/releases/download/v2.19.0/B9PartSwitch_v2.19.0.zip
|
||||||
|
wget https://github.com/KSPModdingLibs/HarmonyKSP/releases/download/2.0.4.0/HarmonyKSP_2.0.4.0_for_KSP1.8+.zip
|
||||||
|
unzip -d Shabby Shabby*.zip
|
||||||
|
unzip -d B9PartSwitch B9PartSwitch*.zip
|
||||||
|
unzip -d HarmonyKSP HarmonyKSP*.zip
|
||||||
|
mv Shabby/GameData/Shabby GameData/
|
||||||
|
mv ModuleManager*.dll GameData/
|
||||||
|
mv B9PartSwitch/GameData/B9PartSwitch GameData/
|
||||||
|
mv HarmonyKSP/GameData/000_Harmony GameData/
|
||||||
|
|
||||||
|
- name: Upload Unbundled Build
|
||||||
|
uses: actions/upload-artifact@v4
|
||||||
|
with:
|
||||||
|
name: ConformalDecals-unbundled
|
||||||
|
path: |
|
||||||
|
GameData/ConformalDecals/
|
||||||
|
README.md
|
||||||
|
CHANGELOG.md
|
||||||
|
LICENSE-ART.md
|
||||||
|
LICENSE-SOURCE.md
|
||||||
|
|
||||||
|
- name: Upload Bundled Build
|
||||||
|
uses: actions/upload-artifact@v4
|
||||||
|
with:
|
||||||
|
name: ConformalDecals
|
||||||
|
path: |
|
||||||
|
GameData/
|
||||||
|
README.md
|
||||||
|
CHANGELOG.md
|
||||||
|
LICENSE-ART.md
|
||||||
|
LICENSE-SOURCE.md
|
||||||
|
|
||||||
|
|
||||||
|
deploy:
|
||||||
|
needs: build
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Setup Python
|
||||||
|
uses: actions/setup-python@v5
|
||||||
|
with:
|
||||||
|
python-version: '3.12'
|
||||||
|
|
||||||
|
- name: Install Python Tools
|
||||||
|
run: |
|
||||||
|
python -m pip install --upgrade pip
|
||||||
|
python -m pip install yaclog
|
||||||
|
|
||||||
|
- name: Get version name and body
|
||||||
|
run: |
|
||||||
|
echo "VERSION_TITLE=$(yaclog show -n)" >> $GITHUB_ENV
|
||||||
|
yaclog show
|
||||||
|
|
||||||
|
- name: Download Build Artifacts
|
||||||
|
uses: actions/download-artifact@v4
|
||||||
|
|
||||||
|
- name: Zip Download Packages
|
||||||
|
run: |
|
||||||
|
set -u
|
||||||
|
mkdir bundled
|
||||||
|
mkdir unbundled
|
||||||
|
zip -r bundled/ConformalDecals-$VERSION_TITLE.zip ConformalDecals/*
|
||||||
|
zip -r unbundled/ConformalDecals-$VERSION_TITLE.zip ConformalDecals-unbundled/*
|
||||||
|
ls
|
||||||
|
|
||||||
|
- name: Publish to Spacedock
|
||||||
|
run: |
|
||||||
|
set -u
|
||||||
|
curl -F "username=drewcassidy" -F "password=${{ secrets.SPACEDOCK_PASS }}" \
|
||||||
|
-c ./cookies "https://spacedock.info/api/login"
|
||||||
|
curl -c ./cookies -b ./cookies \
|
||||||
|
-F "version=$VERSION_TITLE" \
|
||||||
|
-F "changelog=$(yaclog show -mb)" \
|
||||||
|
-F "game-version=1.12.5" \
|
||||||
|
-F "notify-followers=yes" \
|
||||||
|
-F "zipball=@bundled/ConformalDecals-$VERSION_TITLE.zip" \
|
||||||
|
"https://spacedock.info/api/mod/2451/update"
|
||||||
|
|
||||||
|
- name: Publish to Github
|
||||||
|
run: |
|
||||||
|
set -u
|
||||||
|
gh release create ${{ github.ref_name }} \
|
||||||
|
--notes "$(yaclog show -mb)" \
|
||||||
|
--title "Conformal Decals $VERSION_TITLE" \
|
||||||
|
bundled/ConformalDecals-*.zip \
|
||||||
|
ConformalDecals/GameData/ConformalDecals/Versioning/ConformalDecals.version
|
||||||
|
|
||||||
|
env:
|
||||||
|
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
17
.gitignore
vendored
@ -1,10 +1,8 @@
|
|||||||
# Unity Project Directories
|
# Unity Project Directories
|
||||||
Assets/*
|
Assets/*
|
||||||
!Assets/Shaders/
|
!Assets/ConformalDecals
|
||||||
!Assets/Textures/
|
Assets/ConformalDecals/Fonts
|
||||||
!Assets/Scripts/
|
Assets/ConformalDecals/Parts
|
||||||
!Assets/UI/
|
|
||||||
!Assets/ConformalDecals/
|
|
||||||
KSP/
|
KSP/
|
||||||
Library/
|
Library/
|
||||||
Logs/
|
Logs/
|
||||||
@ -12,10 +10,16 @@ Packages/
|
|||||||
ProjectSettings/
|
ProjectSettings/
|
||||||
Temp/
|
Temp/
|
||||||
|
|
||||||
|
# Autogenerated shaders
|
||||||
|
Assets/ConformalDecals/Shaders/Decal/*.shader
|
||||||
|
|
||||||
# Unity Assetbundle Manifest Files
|
# Unity Assetbundle Manifest Files
|
||||||
GameData/ConformalDecals/Resources/Resources
|
GameData/ConformalDecals/Resources/Resources
|
||||||
GameData/ConformalDecals/Resources/*.manifest
|
GameData/ConformalDecals/Resources/*.manifest
|
||||||
|
|
||||||
|
# DLLs
|
||||||
|
GameData/ConformalDecals/Plugins
|
||||||
|
|
||||||
# Unity Project Files
|
# Unity Project Files
|
||||||
PartTools.cfg
|
PartTools.cfg
|
||||||
*.meta
|
*.meta
|
||||||
@ -50,3 +54,6 @@ Source/ConformalDecals/bin
|
|||||||
*.sublime*
|
*.sublime*
|
||||||
.idea
|
.idea
|
||||||
obj
|
obj
|
||||||
|
*.swp
|
||||||
|
@thumbs
|
||||||
|
|
||||||
|
@ -1 +0,0 @@
|
|||||||
USE_SSM_CREDENTIALS: false
|
|
@ -1,30 +0,0 @@
|
|||||||
# Example annotated build data file
|
|
||||||
mod-name: ConformalDecals
|
|
||||||
package:
|
|
||||||
include-dependencies: true # Include dependencies in the package
|
|
||||||
included-gamedata: # Include these gamedata-level folders in packages:
|
|
||||||
- ConformalDecals
|
|
||||||
included-support: # Include these root-level files in packages
|
|
||||||
- README.md
|
|
||||||
- LICENSE-ART.md
|
|
||||||
- LICENSE-SOURCE.md
|
|
||||||
- changelog.txt
|
|
||||||
dependencies: # Configure dependencies
|
|
||||||
ModuleManager:
|
|
||||||
location: url
|
|
||||||
url: https://ksp.sarbian.com/jenkins/job/ModuleManager/159/artifact/ModuleManager.4.1.4.dll
|
|
||||||
zip: false
|
|
||||||
B9PartSwitch:
|
|
||||||
location: url
|
|
||||||
url: http://pileof.rocks/KSP/B9PartSwitch-v2.16.0.zip
|
|
||||||
zip: true
|
|
||||||
Shabby:
|
|
||||||
location: url
|
|
||||||
url: http://taniwha.org/~bill/Shabby_v0.1.2.zip
|
|
||||||
zip: true
|
|
||||||
deploy:
|
|
||||||
SpaceDock:
|
|
||||||
enabled: true # activate/deactivate this deployment script
|
|
||||||
mod-id: 2451 # The Spacedock mod ID for deployment
|
|
||||||
GitHub:
|
|
||||||
enabled: true # activate/deactivate this deployment script
|
|
25
.travis.yml
@ -1,25 +0,0 @@
|
|||||||
language: python
|
|
||||||
python:
|
|
||||||
- 3.6
|
|
||||||
before_install:
|
|
||||||
- echo -e "machine github.com\n login $GITHUB_OAUTH_TOKEN" > ~/.netrc
|
|
||||||
install:
|
|
||||||
- pip install awscli boto3 requests
|
|
||||||
branches:
|
|
||||||
only:
|
|
||||||
- release
|
|
||||||
script:
|
|
||||||
- git clone https://github.com/post-kerbin-mining-corporation/build-deploy.git
|
|
||||||
- cd build-deploy
|
|
||||||
- git checkout master
|
|
||||||
- cd ..
|
|
||||||
- pytest -s --testpath "GameData/" build-deploy/src/tests/ # run the deploy tests
|
|
||||||
- python build-deploy/src/package.py --f ".mod_data.yml" # Build package
|
|
||||||
before_deploy:
|
|
||||||
- python build-deploy/src/stage.py --f ".mod_data.yml" # Run the staging script
|
|
||||||
deploy:
|
|
||||||
- provider: script
|
|
||||||
script: python build-deploy/src/deploy.py --f ".mod_data.yml" # Deploy package to spacedock, curse, github
|
|
||||||
skip_cleanup: true
|
|
||||||
on:
|
|
||||||
branch: release
|
|
156
Assets/ConformalDecals/Shaders/Decal/DecalBase.shader.template
Normal file
@ -0,0 +1,156 @@
|
|||||||
|
Shader "ConformalDecals/Decal/{% block shader_name %}UNKNOWN{% endblock %}"
|
||||||
|
{
|
||||||
|
Properties
|
||||||
|
{
|
||||||
|
|
||||||
|
// Shader-specific properties
|
||||||
|
{% block properties %}
|
||||||
|
{% endblock %}
|
||||||
|
|
||||||
|
// Common decal properties
|
||||||
|
_Cutoff ("Alpha cutoff", Range(0,1)) = 0.5
|
||||||
|
_DecalOpacity("Opacity", Range(0,1) ) = 1
|
||||||
|
_Background("Background Color", Color) = (0.9,0.9,0.9,0.7)
|
||||||
|
|
||||||
|
[Enum(UnityEngine.Rendering.CullMode)] _Cull ("Cull", int) = 2
|
||||||
|
[Toggle] _ZWrite ("ZWrite", Float) = 1.0
|
||||||
|
|
||||||
|
[Toggle(DECAL_PREVIEW)] _Preview ("Preview", int) = 0
|
||||||
|
|
||||||
|
[Header(Effects)]
|
||||||
|
[PerRendererData]_Opacity("_Opacity", Range(0,1) ) = 1
|
||||||
|
[PerRendererData]_Color("_Color", Color) = (1,1,1,1)
|
||||||
|
[PerRendererData]_RimFalloff("_RimFalloff", Range(0.01,5) ) = 0.1
|
||||||
|
[PerRendererData]_RimColor("_RimColor", Color) = (0,0,0,0)
|
||||||
|
[PerRendererData]_UnderwaterFogFactor ("Underwater Fog Factor", Range(0,1)) = 0
|
||||||
|
}
|
||||||
|
SubShader
|
||||||
|
{
|
||||||
|
Tags
|
||||||
|
{
|
||||||
|
"Queue" = "Geometry+100" "IgnoreProjector" = "true" "DisableBatching" = "true"
|
||||||
|
}
|
||||||
|
Cull [_Cull]
|
||||||
|
|
||||||
|
Pass
|
||||||
|
{
|
||||||
|
Name "FORWARD"
|
||||||
|
Tags
|
||||||
|
{
|
||||||
|
"LightMode" = "ForwardBase"
|
||||||
|
}
|
||||||
|
ZWrite [_ZWrite]
|
||||||
|
ZTest LEqual
|
||||||
|
Blend SrcAlpha OneMinusSrcAlpha
|
||||||
|
|
||||||
|
CGPROGRAM
|
||||||
|
#pragma vertex vert
|
||||||
|
#pragma fragment frag_forward
|
||||||
|
|
||||||
|
#pragma multi_compile_fwdbase
|
||||||
|
#pragma skip_variants LIGHTMAP_ON DIRLIGHTMAP_COMBINED DYNAMICLIGHTMAP_ON LIGHTMAP_SHADOW_MIXING
|
||||||
|
#pragma multi_compile_local __ DECAL_PREVIEW
|
||||||
|
|
||||||
|
{% block body %}
|
||||||
|
#error No body provided
|
||||||
|
{% endblock %}
|
||||||
|
|
||||||
|
ENDCG
|
||||||
|
}
|
||||||
|
|
||||||
|
Pass
|
||||||
|
{
|
||||||
|
Name "FORWARD"
|
||||||
|
Tags
|
||||||
|
{
|
||||||
|
"LightMode" = "ForwardAdd"
|
||||||
|
}
|
||||||
|
ZWrite Off
|
||||||
|
ZTest LEqual
|
||||||
|
Blend SrcAlpha One
|
||||||
|
Offset -1, -1
|
||||||
|
|
||||||
|
CGPROGRAM
|
||||||
|
#pragma vertex vert
|
||||||
|
#pragma fragment frag_forward
|
||||||
|
|
||||||
|
#pragma multi_compile DIRECTIONAL SPOT POINT
|
||||||
|
#pragma multi_compile __ LIGHTPROBE_SH
|
||||||
|
#pragma multi_compile_local __ DECAL_PREVIEW
|
||||||
|
|
||||||
|
{{ self.body() }}
|
||||||
|
|
||||||
|
ENDCG
|
||||||
|
}
|
||||||
|
|
||||||
|
Pass
|
||||||
|
{
|
||||||
|
Name "DEFERRED_PREPASS"
|
||||||
|
Tags
|
||||||
|
{
|
||||||
|
"LightMode" = "Deferred"
|
||||||
|
}
|
||||||
|
ZWrite Off
|
||||||
|
ZTest LEqual
|
||||||
|
Offset -1, -1
|
||||||
|
Blend 1 Zero OneMinusSrcColor, Zero OneMinusSrcAlpha
|
||||||
|
|
||||||
|
Stencil
|
||||||
|
{
|
||||||
|
Ref 1
|
||||||
|
Comp Equal
|
||||||
|
Pass Keep
|
||||||
|
}
|
||||||
|
|
||||||
|
CGPROGRAM
|
||||||
|
#pragma vertex vert
|
||||||
|
#pragma fragment frag_deferred_prepass
|
||||||
|
#pragma target 3.0
|
||||||
|
|
||||||
|
#pragma multi_compile_local __ DECAL_PREVIEW
|
||||||
|
|
||||||
|
{{ self.body() }}
|
||||||
|
|
||||||
|
{% block pragmas_deferred_prepass %}
|
||||||
|
{% endblock %}
|
||||||
|
|
||||||
|
ENDCG
|
||||||
|
}
|
||||||
|
|
||||||
|
Pass
|
||||||
|
{
|
||||||
|
Name "DEFERRED"
|
||||||
|
Tags
|
||||||
|
{
|
||||||
|
"LightMode" = "Deferred"
|
||||||
|
}
|
||||||
|
ZWrite Off
|
||||||
|
ZTest LEqual
|
||||||
|
Offset -1, -1
|
||||||
|
Blend 0 SrcAlpha OneMinusSrcAlpha, Zero One
|
||||||
|
Blend 1 One One
|
||||||
|
Blend 2 SrcAlpha OneMinusSrcAlpha, Zero One
|
||||||
|
Blend 3 SrcAlpha OneMinusSrcAlpha, Zero One
|
||||||
|
|
||||||
|
Stencil
|
||||||
|
{
|
||||||
|
Ref 1
|
||||||
|
Comp Equal
|
||||||
|
Pass Keep
|
||||||
|
}
|
||||||
|
|
||||||
|
CGPROGRAM
|
||||||
|
#pragma vertex vert
|
||||||
|
#pragma fragment frag_deferred
|
||||||
|
#pragma target 3.0
|
||||||
|
|
||||||
|
#pragma multi_compile __ LIGHTPROBE_SH
|
||||||
|
#pragma multi_compile __ UNITY_HDR_ON
|
||||||
|
#pragma multi_compile_local __ DECAL_PREVIEW
|
||||||
|
|
||||||
|
{{ self.body() }}
|
||||||
|
|
||||||
|
ENDCG
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
422
Assets/ConformalDecals/Shaders/Decal/DecalsCommon.cginc
Normal file
@ -0,0 +1,422 @@
|
|||||||
|
#ifndef DECALS_COMMON_INCLUDED
|
||||||
|
#define DECALS_COMMON_INCLUDED
|
||||||
|
|
||||||
|
#include "AutoLight.cginc"
|
||||||
|
#include "Lighting.cginc"
|
||||||
|
#include "../LightingKSP.cginc"
|
||||||
|
|
||||||
|
#define CLIP_MARGIN 0.05
|
||||||
|
#define EDGE_MARGIN 0.01
|
||||||
|
|
||||||
|
// UNIFORM VARIABLES
|
||||||
|
// Projection matrix, normal, and tangent vectors
|
||||||
|
float4x4 _ProjectionMatrix;
|
||||||
|
float3 _DecalNormal;
|
||||||
|
float3 _DecalTangent;
|
||||||
|
|
||||||
|
// Common Shading Paramaters
|
||||||
|
float _Cutoff;
|
||||||
|
float _DecalOpacity;
|
||||||
|
float4 _Background;
|
||||||
|
|
||||||
|
sampler2D _Decal;
|
||||||
|
float4 _Decal_ST;
|
||||||
|
|
||||||
|
// Variant Shading Parameters
|
||||||
|
#ifdef DECAL_BASE_NORMAL
|
||||||
|
sampler2D _BumpMap;
|
||||||
|
float4 _BumpMap_ST;
|
||||||
|
float _EdgeWearStrength;
|
||||||
|
float _EdgeWearOffset;
|
||||||
|
#endif //DECAL_BASE_NORMAL
|
||||||
|
|
||||||
|
#ifdef DECAL_BUMPMAP
|
||||||
|
sampler2D _BumpMap;
|
||||||
|
float4 _BumpMap_ST;
|
||||||
|
#endif //DECAL_BUMPMAP
|
||||||
|
|
||||||
|
#ifdef DECAL_SPECMAP
|
||||||
|
sampler2D _SpecMap;
|
||||||
|
float4 _SpecMap_ST;
|
||||||
|
// specular color is declared in a unity CGINC for some reason??
|
||||||
|
#endif //DECAL_SPECMAP
|
||||||
|
|
||||||
|
fixed _Shininess;
|
||||||
|
|
||||||
|
|
||||||
|
#ifdef DECAL_EMISSIVE
|
||||||
|
sampler2D _Emissive;
|
||||||
|
float4 _Emissive_ST;
|
||||||
|
fixed4 _Emissive_Color;
|
||||||
|
#endif //DECAL_EMISSIVE
|
||||||
|
|
||||||
|
// KSP EFFECTS
|
||||||
|
// opacity and color
|
||||||
|
float _Opacity;
|
||||||
|
float _RimFalloff;
|
||||||
|
float4 _RimColor;
|
||||||
|
|
||||||
|
// SURFACE INPUT STRUCT
|
||||||
|
struct DecalSurfaceInput
|
||||||
|
{
|
||||||
|
float3 uv;
|
||||||
|
float2 uv_decal;
|
||||||
|
|
||||||
|
#ifdef DECAL_BUMPMAP
|
||||||
|
float2 uv_bumpmap;
|
||||||
|
#endif //DECAL_BUMPMAP
|
||||||
|
|
||||||
|
#ifdef DECAL_SPECMAP
|
||||||
|
float2 uv_specmap;
|
||||||
|
#endif //DECAL_SPECMAP
|
||||||
|
|
||||||
|
#ifdef DECAL_EMISSIVE
|
||||||
|
float2 uv_emissive;
|
||||||
|
#endif //DECAL_EMISSIVE
|
||||||
|
|
||||||
|
#ifdef DECAL_BASE_NORMAL
|
||||||
|
float3 normal;
|
||||||
|
#endif //DECAL_BASE_NORMAL
|
||||||
|
|
||||||
|
float3 vertex_normal;
|
||||||
|
float3 viewDir;
|
||||||
|
float3 worldPosition;
|
||||||
|
};
|
||||||
|
|
||||||
|
struct appdata_decal
|
||||||
|
{
|
||||||
|
float4 vertex : POSITION;
|
||||||
|
float3 normal : NORMAL;
|
||||||
|
#if defined(DECAL_BASE_NORMAL) || defined(DECAL_PREVIEW)
|
||||||
|
float4 texcoord : TEXCOORD0;
|
||||||
|
float4 tangent : TANGENT;
|
||||||
|
#endif
|
||||||
|
};
|
||||||
|
|
||||||
|
struct v2f
|
||||||
|
{
|
||||||
|
UNITY_POSITION(pos);
|
||||||
|
float3 normal : NORMAL;
|
||||||
|
float4 uv_decal : TEXCOORD0;
|
||||||
|
|
||||||
|
#ifdef DECAL_BASE_NORMAL
|
||||||
|
float2 uv_base : TEXCOORD1;
|
||||||
|
#endif //DECAL_BASE_NORMAL
|
||||||
|
|
||||||
|
float4 tSpace0 : TEXCOORD2;
|
||||||
|
float4 tSpace1 : TEXCOORD3;
|
||||||
|
float4 tSpace2 : TEXCOORD4;
|
||||||
|
|
||||||
|
#ifdef UNITY_PASS_FORWARDBASE
|
||||||
|
fixed3 vlight : TEXCOORD5;
|
||||||
|
UNITY_SHADOW_COORDS(6)
|
||||||
|
#endif //UNITY_PASS_FORWARDBASE
|
||||||
|
|
||||||
|
#ifdef UNITY_PASS_FORWARDADD
|
||||||
|
UNITY_LIGHTING_COORDS(5,6)
|
||||||
|
#endif //UNITY_PASS_FORWARDADD
|
||||||
|
|
||||||
|
#if UNITY_SHOULD_SAMPLE_SH
|
||||||
|
half3 sh : TEXCOORD7; // SH
|
||||||
|
#endif
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
inline void decalClipAlpha(float alpha) {
|
||||||
|
#ifndef DECAL_PREVIEW
|
||||||
|
clip(alpha - 0.001);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
inline float CalcMipLevel(float2 texture_coord) {
|
||||||
|
float2 dx = ddx(texture_coord);
|
||||||
|
float2 dy = ddy(texture_coord);
|
||||||
|
float delta_max_sqr = max(dot(dx, dx), dot(dy, dy));
|
||||||
|
|
||||||
|
return 0.5 * log2(delta_max_sqr);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Decal bounds distance function
|
||||||
|
// takes in a world position, world normal, and projector normal and outputs a unitless signed distance from the
|
||||||
|
inline float BoundsDist(float3 p, float3 normal, float3 projNormal) {
|
||||||
|
float3 q = abs(p - 0.5) - 0.5; // 1x1 square/cube centered at (0.5,0.5)
|
||||||
|
//float dist = length(max(q,0)) + min(max(q.x,max(q.y,q.z)),0.0); // true SDF
|
||||||
|
#ifdef DECAL_PREVIEW
|
||||||
|
return 10 * max(q.x, q.y); // 2D pseudo SDF
|
||||||
|
#else
|
||||||
|
float dist = max(max(q.x, q.y), q.z); // pseudo SDF
|
||||||
|
float ndist = EDGE_MARGIN - dot(normal, projNormal); // SDF to normal
|
||||||
|
return 10 * max(dist, ndist); // return intersection
|
||||||
|
#endif //DECAL_PREVIEW
|
||||||
|
}
|
||||||
|
|
||||||
|
// declare surf function,
|
||||||
|
// this must be defined in any shader using this cginc
|
||||||
|
void surf (DecalSurfaceInput IN, inout SurfaceOutput o);
|
||||||
|
|
||||||
|
v2f vert(appdata_decal v)
|
||||||
|
{
|
||||||
|
v2f o;
|
||||||
|
UNITY_INITIALIZE_OUTPUT(v2f,o);
|
||||||
|
|
||||||
|
o.pos = UnityObjectToClipPos(v.vertex);
|
||||||
|
o.normal = v.normal;
|
||||||
|
|
||||||
|
#ifdef DECAL_PREVIEW
|
||||||
|
o.uv_decal = v.texcoord;
|
||||||
|
#else
|
||||||
|
o.uv_decal = mul (_ProjectionMatrix, v.vertex);
|
||||||
|
#endif //DECAL_PREVIEW
|
||||||
|
|
||||||
|
#ifdef DECAL_BASE_NORMAL
|
||||||
|
o.uv_base = TRANSFORM_TEX(v.texcoord, _BumpMap);
|
||||||
|
#endif //DECAL_BASE_NORMAL
|
||||||
|
|
||||||
|
float3 worldPosition = mul(unity_ObjectToWorld, v.vertex).xyz;
|
||||||
|
float3 worldNormal = UnityObjectToWorldNormal(v.normal);
|
||||||
|
|
||||||
|
#if defined(DECAL_BASE_NORMAL) || defined(DECAL_PREVIEW)
|
||||||
|
// use tangent of base geometry
|
||||||
|
fixed3 worldTangent = UnityObjectToWorldDir(v.tangent.xyz);
|
||||||
|
fixed tangentSign = v.tangent.w * unity_WorldTransformParams.w;
|
||||||
|
fixed3 worldBinormal = cross(worldNormal, worldTangent) * tangentSign;
|
||||||
|
#else
|
||||||
|
// use tangent of projector
|
||||||
|
fixed3 decalTangent = UnityObjectToWorldDir(_DecalTangent);
|
||||||
|
fixed3 worldBinormal = cross(decalTangent, worldNormal);
|
||||||
|
fixed3 worldTangent = cross(worldNormal, worldBinormal);
|
||||||
|
#endif //defined(DECAL_BASE_NORMAL) || defined(DECAL_PREVIEW)
|
||||||
|
|
||||||
|
o.tSpace0 = float4(worldTangent.x, worldBinormal.x, worldNormal.x, worldPosition.x);
|
||||||
|
o.tSpace1 = float4(worldTangent.y, worldBinormal.y, worldNormal.y, worldPosition.y);
|
||||||
|
o.tSpace2 = float4(worldTangent.z, worldBinormal.z, worldNormal.z, worldPosition.z);
|
||||||
|
|
||||||
|
// forward base pass specific lighting code
|
||||||
|
#ifdef UNITY_PASS_FORWARDBASE
|
||||||
|
// SH/ambient light
|
||||||
|
#if UNITY_SHOULD_SAMPLE_SH
|
||||||
|
float3 shlight = ShadeSH9 (float4(worldNormal,1.0));
|
||||||
|
o.vlight = shlight;
|
||||||
|
#else
|
||||||
|
o.vlight = 0.0;
|
||||||
|
#endif // UNITY_SHOULD_SAMPLE_SH
|
||||||
|
|
||||||
|
// vertex light
|
||||||
|
#ifdef VERTEXLIGHT_ON
|
||||||
|
o.vlight += Shade4PointLights (
|
||||||
|
unity_4LightPosX0, unity_4LightPosY0, unity_4LightPosZ0,
|
||||||
|
unity_LightColor[0].rgb, unity_LightColor[1].rgb, unity_LightColor[2].rgb, unity_LightColor[3].rgb,
|
||||||
|
unity_4LightAtten0, worldPosition, worldNormal );
|
||||||
|
#endif // VERTEXLIGHT_ON
|
||||||
|
#endif // UNITY_PASS_FORWARDBASE
|
||||||
|
|
||||||
|
// pass shadow and, possibly, light cookie coordinates to pixel shader
|
||||||
|
UNITY_TRANSFER_LIGHTING(o, 0.0);
|
||||||
|
return o;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
SurfaceOutput frag_common(v2f IN, out float3 worldPos, out float3 worldViewDir, out float3 viewDir) {
|
||||||
|
SurfaceOutput o;
|
||||||
|
|
||||||
|
// setup world-space TBN vectors
|
||||||
|
UNITY_EXTRACT_TBN(IN);
|
||||||
|
|
||||||
|
worldPos = float3(IN.tSpace0.w, IN.tSpace1.w, IN.tSpace2.w);
|
||||||
|
worldViewDir = normalize(UnityWorldSpaceViewDir(worldPos));
|
||||||
|
viewDir = _unity_tbn_0 * worldViewDir.x + _unity_tbn_1 * worldViewDir.y + _unity_tbn_2 * worldViewDir.z;
|
||||||
|
|
||||||
|
#ifdef DECAL_PREVIEW
|
||||||
|
fixed4 uv_projected = IN.uv_decal;
|
||||||
|
#else
|
||||||
|
// perform decal projection
|
||||||
|
fixed4 uv_projected = UNITY_PROJ_COORD(IN.uv_decal);
|
||||||
|
|
||||||
|
clip(uv_projected.xyz + CLIP_MARGIN);
|
||||||
|
clip(CLIP_MARGIN + (1-uv_projected.xyz));
|
||||||
|
#endif //DECAL_PREVIEW
|
||||||
|
|
||||||
|
// declare data
|
||||||
|
DecalSurfaceInput i;
|
||||||
|
|
||||||
|
// initialize surface input
|
||||||
|
UNITY_INITIALIZE_OUTPUT(DecalSurfaceInput, i)
|
||||||
|
i.uv_decal = TRANSFORM_TEX(uv_projected, _Decal);
|
||||||
|
i.uv = uv_projected;
|
||||||
|
|
||||||
|
#ifdef DECAL_BUMPMAP
|
||||||
|
i.uv_bumpmap = TRANSFORM_TEX(uv_projected, _BumpMap);
|
||||||
|
#endif //DECAL_BUMPMAP
|
||||||
|
|
||||||
|
#ifdef DECAL_SPECMAP
|
||||||
|
i.uv_specmap = TRANSFORM_TEX(uv_projected, _SpecMap);
|
||||||
|
#endif //DECAL_SPECMAP
|
||||||
|
|
||||||
|
#ifdef DECAL_EMISSIVE
|
||||||
|
i.uv_emissive = TRANSFORM_TEX(uv_projected, _Emissive);
|
||||||
|
#endif //DECAL_EMISSIVE
|
||||||
|
|
||||||
|
#ifdef DECAL_BASE_NORMAL
|
||||||
|
#ifdef DECAL_PREVIEW
|
||||||
|
i.normal = fixed3(0,0,1);
|
||||||
|
#else
|
||||||
|
i.normal = UnpackNormalDXT5nm(tex2D(_BumpMap, IN.uv_base));
|
||||||
|
#endif //DECAL_PREVIEW
|
||||||
|
#endif //DECAL_BASE_NORMAL
|
||||||
|
|
||||||
|
i.vertex_normal = IN.normal;
|
||||||
|
i.viewDir = viewDir;
|
||||||
|
i.worldPosition = worldPos;
|
||||||
|
|
||||||
|
// initialize surface output
|
||||||
|
o.Albedo = 0.0;
|
||||||
|
o.Emission = 0.0;
|
||||||
|
o.Specular = 0.4;
|
||||||
|
o.Alpha = _DecalOpacity;
|
||||||
|
o.Gloss = 0.0;
|
||||||
|
o.Normal = fixed3(0,0,1);
|
||||||
|
|
||||||
|
// call surface function
|
||||||
|
surf(i, o);
|
||||||
|
|
||||||
|
// apply KSP fog. In the deferred pass this is a no-op
|
||||||
|
o.Albedo = UnderwaterFog(i.worldPosition, o.Albedo).rgb;
|
||||||
|
|
||||||
|
// apply KSP rim lighting
|
||||||
|
half rim = 1.0 - saturate(dot(normalize(i.viewDir), o.Normal));
|
||||||
|
o.Emission += o.Emission = (_RimColor.rgb * pow(rim, _RimFalloff)) * _RimColor.a;
|
||||||
|
|
||||||
|
// compute world normal
|
||||||
|
float3 worldN;
|
||||||
|
worldN.x = dot(_unity_tbn_0, o.Normal);
|
||||||
|
worldN.y = dot(_unity_tbn_1, o.Normal);
|
||||||
|
worldN.z = dot(_unity_tbn_2, o.Normal);
|
||||||
|
worldN = normalize(worldN);
|
||||||
|
o.Normal = worldN;
|
||||||
|
|
||||||
|
return o;
|
||||||
|
}
|
||||||
|
|
||||||
|
fixed4 frag_forward(v2f IN) : SV_Target
|
||||||
|
{
|
||||||
|
fixed4 c = 0;
|
||||||
|
|
||||||
|
float3 worldPos;
|
||||||
|
float3 worldViewDir;
|
||||||
|
float3 viewDir;
|
||||||
|
SurfaceOutput o = frag_common(IN, worldPos, worldViewDir, viewDir);
|
||||||
|
|
||||||
|
// compute lighting & shadowing factor
|
||||||
|
UNITY_LIGHT_ATTENUATION(atten, IN, worldPos)
|
||||||
|
|
||||||
|
#ifndef USING_DIRECTIONAL_LIGHT
|
||||||
|
fixed3 lightDir = normalize(UnityWorldSpaceLightDir(worldPos));
|
||||||
|
#else
|
||||||
|
fixed3 lightDir = _WorldSpaceLightPos0.xyz;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// Setup lighting environment
|
||||||
|
UnityGI gi;
|
||||||
|
UNITY_INITIALIZE_OUTPUT(UnityGI, gi);
|
||||||
|
gi.indirect.diffuse = 0;
|
||||||
|
gi.indirect.specular = 0;
|
||||||
|
gi.light.color = _LightColor0.rgb;
|
||||||
|
gi.light.dir = lightDir;
|
||||||
|
|
||||||
|
#ifdef UNITY_PASS_FORWARDBASE
|
||||||
|
// Call GI (lightmaps/SH/reflections) lighting function
|
||||||
|
UnityGIInput giInput;
|
||||||
|
UNITY_INITIALIZE_OUTPUT(UnityGIInput, giInput);
|
||||||
|
giInput.light = gi.light;
|
||||||
|
giInput.worldPos = worldPos;
|
||||||
|
giInput.worldViewDir = worldViewDir;
|
||||||
|
giInput.atten = atten;
|
||||||
|
|
||||||
|
#if UNITY_SHOULD_SAMPLE_SH && !UNITY_SAMPLE_FULL_SH_PER_PIXEL
|
||||||
|
giInput.ambient = IN.sh;
|
||||||
|
#else
|
||||||
|
giInput.ambient.rgb = 0.0;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
LightingBlinnPhongKSP_GI(o, giInput, gi);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef UNITY_PASS_FORWARDADD
|
||||||
|
gi.light.color *= atten;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
//call modified KSP lighting function
|
||||||
|
c += LightingBlinnPhongKSP(o, viewDir, gi);
|
||||||
|
c.rgb += o.Emission;
|
||||||
|
return c;
|
||||||
|
}
|
||||||
|
|
||||||
|
void frag_deferred (v2f IN,
|
||||||
|
out half4 outGBuffer0 : SV_Target0,
|
||||||
|
out half4 outGBuffer1 : SV_Target1,
|
||||||
|
#if defined(DECAL_BUMPMAP) || defined(DECAL_PREVIEW)
|
||||||
|
out half4 outGBuffer2 : SV_Target2,
|
||||||
|
#endif
|
||||||
|
out half4 outEmission : SV_Target3)
|
||||||
|
{
|
||||||
|
#if !(defined(DECAL_BUMPMAP) || defined(DECAL_PREVIEW))
|
||||||
|
half4 outGBuffer2 = 0; // define dummy normal buffer when we're not writing to it
|
||||||
|
#endif
|
||||||
|
|
||||||
|
float3 worldPos;
|
||||||
|
float3 worldViewDir;
|
||||||
|
float3 viewDir;
|
||||||
|
SurfaceOutput o = frag_common(IN, worldPos, worldViewDir, viewDir);
|
||||||
|
|
||||||
|
// Setup lighting environment
|
||||||
|
UnityGI gi;
|
||||||
|
UNITY_INITIALIZE_OUTPUT(UnityGI, gi);
|
||||||
|
gi.indirect.diffuse = 0;
|
||||||
|
gi.indirect.specular = 0;
|
||||||
|
gi.light.color = 0;
|
||||||
|
gi.light.dir = half3(0,1,0);
|
||||||
|
|
||||||
|
UnityGIInput giInput;
|
||||||
|
UNITY_INITIALIZE_OUTPUT(UnityGIInput, giInput);
|
||||||
|
giInput.light = gi.light;
|
||||||
|
giInput.worldPos = worldPos;
|
||||||
|
giInput.worldViewDir = worldViewDir;
|
||||||
|
giInput.atten = 1;
|
||||||
|
giInput.lightmapUV = 0.0;
|
||||||
|
|
||||||
|
#if UNITY_SHOULD_SAMPLE_SH && !UNITY_SAMPLE_FULL_SH_PER_PIXEL
|
||||||
|
giInput.ambient = 0.0 * IN.sh;
|
||||||
|
#else
|
||||||
|
giInput.ambient.rgb = 0.0;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
giInput.probeHDR[0] = unity_SpecCube0_HDR;
|
||||||
|
giInput.probeHDR[1] = unity_SpecCube1_HDR;
|
||||||
|
|
||||||
|
LightingBlinnPhongKSP_GI(o, giInput, gi);
|
||||||
|
|
||||||
|
outEmission = LightingBlinnPhongKSP_Deferred(o, worldViewDir, gi, outGBuffer0, outGBuffer1, outGBuffer2);
|
||||||
|
|
||||||
|
// outGBuffer0 = outEmission;
|
||||||
|
|
||||||
|
#ifndef UNITY_HDR_ON
|
||||||
|
outEmission.rgb = exp2(-outEmission.rgb);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
outGBuffer0.a = o.Alpha;
|
||||||
|
outGBuffer1 *= o.Alpha;
|
||||||
|
outGBuffer2.a = o.Alpha;
|
||||||
|
outEmission.a = o.Alpha;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
void frag_deferred_prepass(v2f IN, out half4 outGBuffer1: SV_Target1) {
|
||||||
|
float3 worldPos;
|
||||||
|
float3 worldViewDir;
|
||||||
|
float3 viewDir;
|
||||||
|
SurfaceOutput o = frag_common(IN, worldPos, worldViewDir, viewDir);
|
||||||
|
|
||||||
|
outGBuffer1 = o.Alpha;
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
@ -1,28 +1,27 @@
|
|||||||
|
#include "DecalsCommon.cginc"
|
||||||
|
#include "../SDF.cginc"
|
||||||
|
|
||||||
void surf(DecalSurfaceInput IN, inout SurfaceOutput o) {
|
void surf(DecalSurfaceInput IN, inout SurfaceOutput o) {
|
||||||
float4 color = tex2D(_Decal, IN.uv_decal);
|
float4 color = tex2D(_Decal, IN.uv_decal);
|
||||||
o.Albedo = UnderwaterFog(IN.worldPosition, color).rgb;
|
o.Albedo = color.rgb;
|
||||||
o.Alpha = _DecalOpacity;
|
o.Specular = 0.4;
|
||||||
|
o.Gloss = _Shininess;
|
||||||
|
|
||||||
#ifdef DECAL_BASE_NORMAL
|
#ifdef DECAL_BASE_NORMAL
|
||||||
float3 normal = IN.normal;
|
float3 normal = IN.normal;
|
||||||
float wearFactor = 1 - normal.z;
|
float wearFactor = 1 - normal.z;
|
||||||
float wearFactorAlpha = saturate(_EdgeWearStrength * wearFactor);
|
|
||||||
o.Alpha *= saturate(1 + _EdgeWearOffset - saturate(_EdgeWearStrength * wearFactor));
|
o.Alpha *= saturate(1 + _EdgeWearOffset - saturate(_EdgeWearStrength * wearFactor));
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef DECAL_BUMPMAP
|
#ifdef DECAL_BUMPMAP
|
||||||
o.Normal = tex2D(_BumpMap, IN.uv_bumpmap);
|
o.Normal = UnpackNormalDXT5nm(tex2D(_BumpMap, IN.uv_bumpmap));
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef DECAL_SPECMAP
|
#ifdef DECAL_SPECMAP
|
||||||
float4 specular = tex2D(_SpecMap, IN.uv_specmap);
|
float4 specular = tex2D(_SpecMap, IN.uv_specmap);
|
||||||
o.Gloss = specular.r;
|
o.Specular = specular;
|
||||||
o.Specular = _Shininess;
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
half rim = 1.0 - saturate(dot(normalize(IN.viewDir), o.Normal));
|
|
||||||
o.Emission = (_RimColor.rgb * pow(rim, _RimFalloff)) * _RimColor.a;
|
|
||||||
|
|
||||||
#ifdef DECAL_EMISSIVE
|
#ifdef DECAL_EMISSIVE
|
||||||
o.Emission += tex2D(_Emissive, IN.uv_emissive).rgb * _Emissive_Color.rgb * _Emissive_Color.a;
|
o.Emission += tex2D(_Emissive, IN.uv_emissive).rgb * _Emissive_Color.rgb * _Emissive_Color.a;
|
||||||
#endif
|
#endif
|
@ -0,0 +1,40 @@
|
|||||||
|
{% extends "DecalBase.shader.template" %}
|
||||||
|
{% block shader_name %}Standard{% endblock %}
|
||||||
|
|
||||||
|
{% block properties %}
|
||||||
|
[Header(Decal)]
|
||||||
|
_Decal("Decal Texture", 2D) = "gray" {}
|
||||||
|
[Toggle(DECAL_SDF_ALPHA)] _Decal_SDF_Alpha ("SDF in Alpha", int) = 0
|
||||||
|
|
||||||
|
[Header(Normal)]
|
||||||
|
[Toggle(DECAL_BASE_NORMAL)] _BaseNormal ("Use Base Normal", int) = 0
|
||||||
|
[Toggle(DECAL_BUMPMAP)] _Decal_BumpMap ("Has BumpMap", int) = 0
|
||||||
|
_BumpMap("Bump Map", 2D) = "bump" {}
|
||||||
|
_EdgeWearStrength("Edge Wear Strength", Range(0,500)) = 100
|
||||||
|
_EdgeWearOffset("Edge Wear Offset", Range(0,1)) = 0.1
|
||||||
|
|
||||||
|
[Header(Specularity)]
|
||||||
|
[Toggle(DECAL_SPECMAP)] _Decal_SpecMap ("Has SpecMap", int) = 0
|
||||||
|
_SpecMap ("Specular Map", 2D) = "black" {}
|
||||||
|
_SpecColor ("_SpecColor", Color) = (0.25, 0.25, 0.25, 1)
|
||||||
|
_Shininess ("Shininess", Range (0.03, 10)) = 0.3
|
||||||
|
|
||||||
|
[Header(Emissive)]
|
||||||
|
[Toggle(DECAL_EMISSIVE)] _Decal_Emissive ("Has Emissive", int) = 0
|
||||||
|
_Emissive("_Emissive", 2D) = "black" {}
|
||||||
|
_EmissiveColor("_EmissiveColor", Color) = (0,0,0,1)
|
||||||
|
{% endblock %}
|
||||||
|
|
||||||
|
{% block body %}
|
||||||
|
#pragma multi_compile_local __ DECAL_BASE_NORMAL DECAL_BUMPMAP
|
||||||
|
#pragma multi_compile_local __ DECAL_SPECMAP
|
||||||
|
#pragma multi_compile_local __ DECAL_EMISSIVE
|
||||||
|
#pragma multi_compile_local __ DECAL_SDF_ALPHA
|
||||||
|
|
||||||
|
#include "StandardDecal.cginc"
|
||||||
|
{% endblock %}
|
||||||
|
|
||||||
|
|
||||||
|
{% block pragmas_deferred_prepass %}
|
||||||
|
#pragma skip_variants DECAL_SPECMAP DECAL_EMISSIVE DECAL_BUMPMAP
|
||||||
|
{% endblock %}
|
@ -1,3 +1,6 @@
|
|||||||
|
#include "DecalsCommon.cginc"
|
||||||
|
#include "../SDF.cginc"
|
||||||
|
|
||||||
float4 _DecalColor;
|
float4 _DecalColor;
|
||||||
|
|
||||||
float4 _OutlineColor;
|
float4 _OutlineColor;
|
||||||
@ -5,6 +8,9 @@ float _OutlineWidth;
|
|||||||
|
|
||||||
void surf(DecalSurfaceInput IN, inout SurfaceOutput o) {
|
void surf(DecalSurfaceInput IN, inout SurfaceOutput o) {
|
||||||
float4 color = _DecalColor;
|
float4 color = _DecalColor;
|
||||||
|
o.Specular = 0.4;
|
||||||
|
o.Gloss = _Shininess;
|
||||||
|
|
||||||
float dist = _Cutoff - tex2D(_Decal, IN.uv_decal).r; // text distance
|
float dist = _Cutoff - tex2D(_Decal, IN.uv_decal).r; // text distance
|
||||||
|
|
||||||
#ifdef DECAL_OUTLINE
|
#ifdef DECAL_OUTLINE
|
||||||
@ -28,8 +34,8 @@ void surf(DecalSurfaceInput IN, inout SurfaceOutput o) {
|
|||||||
|
|
||||||
dist = max(dist, BoundsDist(IN.uv, IN.vertex_normal, _DecalNormal));
|
dist = max(dist, BoundsDist(IN.uv, IN.vertex_normal, _DecalNormal));
|
||||||
float ddist = SDFdDist(dist); // distance gradient magnitude
|
float ddist = SDFdDist(dist); // distance gradient magnitude
|
||||||
o.Alpha = _DecalOpacity * SDFAA(dist, ddist);
|
o.Albedo = color.rgb;
|
||||||
o.Albedo = UnderwaterFog(IN.worldPosition, color).rgb;
|
o.Alpha *= SDFAA(dist, ddist);
|
||||||
|
|
||||||
#ifdef DECAL_BASE_NORMAL
|
#ifdef DECAL_BASE_NORMAL
|
||||||
float3 normal = IN.normal;
|
float3 normal = IN.normal;
|
||||||
@ -40,10 +46,6 @@ void surf(DecalSurfaceInput IN, inout SurfaceOutput o) {
|
|||||||
|
|
||||||
#ifdef DECAL_SPECMAP
|
#ifdef DECAL_SPECMAP
|
||||||
float4 specular = tex2D(_SpecMap, IN.uv_specmap);
|
float4 specular = tex2D(_SpecMap, IN.uv_specmap);
|
||||||
o.Gloss = specular.r;
|
o.Specular = specular;
|
||||||
o.Specular = _Shininess;
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
half rim = 1.0 - saturate(dot(normalize(IN.viewDir), o.Normal));
|
|
||||||
o.Emission = (_RimColor.rgb * pow(rim, _RimFalloff)) * _RimColor.a;
|
|
||||||
}
|
}
|
@ -0,0 +1,41 @@
|
|||||||
|
{% extends "DecalBase.shader.template" %}
|
||||||
|
{% block shader_name %}Text{% endblock %}
|
||||||
|
|
||||||
|
{% block properties %}
|
||||||
|
[Header(Decal)]
|
||||||
|
[Toggle(DECAL_FILL)] _Fill ("Fill", int) = 0
|
||||||
|
_Decal("Decal Texture", 2D) = "gray" {}
|
||||||
|
_DecalColor("Decal Color", Color) = (1,1,1,1)
|
||||||
|
|
||||||
|
_Weight("Text Weight", Range(0,1)) = 0
|
||||||
|
|
||||||
|
[Header(Outline)]
|
||||||
|
[Toggle(DECAL_OUTLINE)] _Outline ("Outline", int) = 0
|
||||||
|
_OutlineColor("Outline Color", Color) = (0,0,0,1)
|
||||||
|
_OutlineWidth("Outline Width", Range(0,1)) = 0.1
|
||||||
|
|
||||||
|
[Header(Normal)]
|
||||||
|
[Toggle(DECAL_BASE_NORMAL)] _BaseNormal ("Use Base Normal", int) = 0
|
||||||
|
_BumpMap("Bump Map", 2D) = "bump" {}
|
||||||
|
_EdgeWearStrength("Edge Wear Strength", Range(0,500)) = 100
|
||||||
|
_EdgeWearOffset("Edge Wear Offset", Range(0,1)) = 0.1
|
||||||
|
|
||||||
|
[Header(Specularity)]
|
||||||
|
[Toggle(DECAL_SPECMAP)] _Decal_SpecMap ("Has SpecMap", int) = 0
|
||||||
|
_SpecMap ("Specular Map)", 2D) = "black" {}
|
||||||
|
_SpecColor ("_SpecColor", Color) = (0.25, 0.25, 0.25, 1)
|
||||||
|
_Shininess ("Shininess", Range (0.03, 10)) = 0.3
|
||||||
|
{% endblock %}
|
||||||
|
|
||||||
|
{% block body %}
|
||||||
|
#pragma multi_compile_local __ DECAL_BASE_NORMAL
|
||||||
|
#pragma multi_compile_local __ DECAL_SPECMAP
|
||||||
|
#pragma multi_compile_local __ DECAL_OUTLINE
|
||||||
|
#pragma multi_compile_local __ DECAL_FILL
|
||||||
|
|
||||||
|
#include "TextDecal.cginc"
|
||||||
|
{% endblock %}
|
||||||
|
|
||||||
|
{% block pragmas_deferred_prepass %}
|
||||||
|
#pragma skip_variants DECAL_SPECMAP
|
||||||
|
{% endblock %}
|
@ -29,7 +29,7 @@ Shader "ConformalDecals/Decal Back"
|
|||||||
CGPROGRAM
|
CGPROGRAM
|
||||||
|
|
||||||
#include "LightingKSP.cginc"
|
#include "LightingKSP.cginc"
|
||||||
#pragma surface surf BlinnPhongSmooth vertex:vert
|
#pragma surface surf BlinnPhongKSP vertex:vert
|
||||||
#pragma target 3.0
|
#pragma target 3.0
|
||||||
|
|
||||||
sampler2D _MainTex;
|
sampler2D _MainTex;
|
||||||
@ -65,9 +65,9 @@ Shader "ConformalDecals/Decal Back"
|
|||||||
uv_MainTex.y = IN.uv_MainTex.x + IN.uv_MainTex.y;
|
uv_MainTex.y = IN.uv_MainTex.x + IN.uv_MainTex.y;
|
||||||
|
|
||||||
// stagger every other row
|
// stagger every other row
|
||||||
|
uv_MainTex.y *= 2;
|
||||||
int row = floor(uv_MainTex.y);
|
int row = floor(uv_MainTex.y);
|
||||||
uv_MainTex.x += row * _RowOffset;
|
uv_MainTex.x += row * _RowOffset;
|
||||||
uv_MainTex.y *= 2;
|
|
||||||
|
|
||||||
float4 color = _Color * tex2D(_MainTex,(uv_MainTex));
|
float4 color = _Color * tex2D(_MainTex,(uv_MainTex));
|
||||||
float3 normal = UnpackNormal(tex2D(_BumpMap, uv_BumpMap));
|
float3 normal = UnpackNormal(tex2D(_BumpMap, uv_BumpMap));
|
161
Assets/ConformalDecals/Shaders/LightingKSP.cginc
Normal file
@ -0,0 +1,161 @@
|
|||||||
|
// WHAT IS THIS FILE?
|
||||||
|
// this file provides a replacement for the LightingKSP.cginc file that ships with part tools for writing custom shaders.
|
||||||
|
// This version enables support for the Deferred mod
|
||||||
|
//
|
||||||
|
// HOW DO I USE IT?
|
||||||
|
// Step 1)
|
||||||
|
// replace LightingKSP.cginc in your shader folder with this file, if present. If you aren't using LightingKSP.cginc
|
||||||
|
// in your shader, add the following below `CGPROGRAM`:
|
||||||
|
// `#include "../LightingKSP.cginc"`
|
||||||
|
//
|
||||||
|
// Step 2)
|
||||||
|
// add the following above `CGPROGRAM`:
|
||||||
|
// ```
|
||||||
|
// Stencil
|
||||||
|
// {
|
||||||
|
// Ref 1
|
||||||
|
// Comp Always
|
||||||
|
// Pass Replace
|
||||||
|
// }
|
||||||
|
// ```
|
||||||
|
//
|
||||||
|
// Step 3)
|
||||||
|
// there should be a line in your shader that looks like this:
|
||||||
|
// `#pragma surface surf BlinnPhongSmooth keepalpha`
|
||||||
|
// Remove the `keepalpha` if it's there. the part after `surf` is the name of the lighting function your shader uses now.
|
||||||
|
// If the lighting function is `BlinnPhong` or `BlinnPhongSmooth`, change it to `BlinnPhongKSP`
|
||||||
|
// If the lighting function is `Standard`, change it to `StandardKSP`
|
||||||
|
// If the lighting function is `StandardSpecular`, change it to `StandardSpecularKSP`
|
||||||
|
|
||||||
|
#ifndef LIGHTING_KSP_INCLUDED
|
||||||
|
#define LIGHTING_KSP_INCLUDED
|
||||||
|
|
||||||
|
#include "UnityPBSLighting.cginc"
|
||||||
|
|
||||||
|
#define blinnPhongShininessPower 0.215
|
||||||
|
|
||||||
|
// An exact conversion from blinn-phong to PBR is impossible, but the look can be approximated perceptually
|
||||||
|
// and by observing how blinn-phong looks and feels at various settings, although it can never be perfect
|
||||||
|
// 1) The specularColor can be used as is in the PBR specular flow, just needs to be divided by PI so it sums up to 1 over the hemisphere
|
||||||
|
// 2) Blinn-phong shininess doesn't stop feeling shiny unless at very low values, like below 0.04
|
||||||
|
// while the PBR smoothness feels more linear -> map shininess to smoothness accordingly using a function
|
||||||
|
// that increases very quickly at first then slows down, I went with something like x^(1/4) or x^(1/6) then made the power configurable
|
||||||
|
// I tried various mappings from the literature but nothing really worked as well as this
|
||||||
|
// 3) Finally I noticed that some parts still looked very shiny like the AV-R8 winglet while in stock they looked rough thanks a low
|
||||||
|
// specularColor but high shininess and specularMap, so I multiplied the smoothness by the sqrt of the specularColor and that caps
|
||||||
|
// the smoothness when specularColor is low
|
||||||
|
void GetStandardSpecularPropertiesFromLegacy(float legacyShininess, float specularMap, out float3 specular,
|
||||||
|
out float smoothness)
|
||||||
|
{
|
||||||
|
float3 legacySpecularColor = saturate(_SpecColor);
|
||||||
|
|
||||||
|
smoothness = pow(legacyShininess, blinnPhongShininessPower) * specularMap;
|
||||||
|
smoothness *= sqrt(length(legacySpecularColor));
|
||||||
|
|
||||||
|
specular = legacySpecularColor * UNITY_INV_PI;
|
||||||
|
}
|
||||||
|
|
||||||
|
float4 _Color;
|
||||||
|
|
||||||
|
// LEGACY BLINN-PHONG LIGHTING FUNCTION FOR KSP WITH PBR CONVERSION FOR DEFERRED
|
||||||
|
|
||||||
|
inline float4 LightingBlinnPhongKSP(SurfaceOutput s, half3 viewDir, UnityGI gi)
|
||||||
|
{
|
||||||
|
return LightingBlinnPhong(s,viewDir, gi);
|
||||||
|
}
|
||||||
|
|
||||||
|
inline float4 LightingBlinnPhongKSP_Deferred(SurfaceOutput s, float3 worldViewDir, UnityGI gi,
|
||||||
|
out float4 outDiffuseOcclusion, out float4 outSpecSmoothness,
|
||||||
|
out float4 outNormal)
|
||||||
|
{
|
||||||
|
SurfaceOutputStandardSpecular ss;
|
||||||
|
ss.Albedo = s.Albedo;
|
||||||
|
ss.Normal = s.Normal;
|
||||||
|
ss.Emission = s.Emission;
|
||||||
|
ss.Occlusion = 1;
|
||||||
|
ss.Alpha = saturate(s.Alpha);
|
||||||
|
GetStandardSpecularPropertiesFromLegacy(s.Specular, s.Gloss, ss.Specular, ss.Smoothness);
|
||||||
|
|
||||||
|
return LightingStandardSpecular_Deferred(ss, worldViewDir, gi, outDiffuseOcclusion, outSpecSmoothness, outNormal);
|
||||||
|
}
|
||||||
|
|
||||||
|
inline void LightingBlinnPhongKSP_GI(inout SurfaceOutput s, UnityGIInput gi_input, inout UnityGI gi)
|
||||||
|
{
|
||||||
|
#ifndef UNITY_PASS_DEFERRED
|
||||||
|
gi = UnityGlobalIllumination(gi_input, 1.0, s.Normal);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
// STANDARD UNITY LIGHTING FUNCTION FOR KSP
|
||||||
|
|
||||||
|
inline float4 LightingStandardKSP(SurfaceOutputStandard s, float3 worldViewDir, UnityGI gi)
|
||||||
|
{
|
||||||
|
return LightingStandard(s, worldViewDir, gi); // no change
|
||||||
|
}
|
||||||
|
|
||||||
|
inline float4 LightingStandardKSP_Deferred(SurfaceOutputStandard s, float3 worldViewDir, UnityGI gi,
|
||||||
|
out float4 outDiffuseOcclusion,
|
||||||
|
out float4 outSpecSmoothness, out float4 outNormal)
|
||||||
|
{
|
||||||
|
return LightingStandard_Deferred(s, worldViewDir, gi, outDiffuseOcclusion, outSpecSmoothness, outNormal);
|
||||||
|
}
|
||||||
|
|
||||||
|
inline void LightingStandardKSP_GI(inout SurfaceOutputStandard s, UnityGIInput gi_input, inout UnityGI gi)
|
||||||
|
{
|
||||||
|
#ifndef UNITY_PASS_DEFERRED
|
||||||
|
LightingStandard_GI(s, gi_input, gi);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
// STANDARD SPECULAR UNITY LIGHTING FUNCTION FOR KSP
|
||||||
|
|
||||||
|
inline float4 LightingStandardSpecularKSP(SurfaceOutputStandardSpecular s, float3 worldViewDir, UnityGI gi)
|
||||||
|
{
|
||||||
|
return LightingStandardSpecular(s, worldViewDir, gi); // no change
|
||||||
|
}
|
||||||
|
|
||||||
|
inline float4 LightingStandardSpecularKSP_Deferred(SurfaceOutputStandardSpecular s, float3 worldViewDir, UnityGI gi,
|
||||||
|
out float4 outDiffuseOcclusion,
|
||||||
|
out float4 outSpecSmoothness, out float4 outNormal)
|
||||||
|
{
|
||||||
|
return LightingStandardSpecular_Deferred(s, worldViewDir, gi, outDiffuseOcclusion, outSpecSmoothness, outNormal);
|
||||||
|
}
|
||||||
|
|
||||||
|
inline void LightingStandardSpecularKSP_GI(inout SurfaceOutputStandardSpecular s, UnityGIInput gi_input,
|
||||||
|
inout UnityGI gi)
|
||||||
|
{
|
||||||
|
#ifndef UNITY_PASS_DEFERRED
|
||||||
|
LightingStandardSpecular_GI(s, gi_input, gi);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
float4 _LocalCameraPos;
|
||||||
|
float4 _LocalCameraDir;
|
||||||
|
float4 _UnderwaterFogColor;
|
||||||
|
float _UnderwaterMinAlphaFogDistance;
|
||||||
|
float _UnderwaterMaxAlbedoFog;
|
||||||
|
float _UnderwaterMaxAlphaFog;
|
||||||
|
float _UnderwaterAlbedoDistanceScalar;
|
||||||
|
float _UnderwaterAlphaDistanceScalar;
|
||||||
|
float _UnderwaterFogFactor;
|
||||||
|
|
||||||
|
float4 UnderwaterFog(float3 worldPos, float3 color)
|
||||||
|
{
|
||||||
|
// skip fog in deferred mode
|
||||||
|
#ifdef UNITY_PASS_DEFERRED
|
||||||
|
return float4(color, 1);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
float3 toPixel = worldPos - _LocalCameraPos.xyz;
|
||||||
|
float toPixelLength = length(toPixel); ///< Comment out the math--looks better without it.
|
||||||
|
|
||||||
|
float underwaterDetection = _UnderwaterFogFactor * _LocalCameraDir.w; ///< sign(1 - sign(_LocalCameraPos.w));
|
||||||
|
float albedoLerpValue = underwaterDetection * (_UnderwaterMaxAlbedoFog * saturate(
|
||||||
|
toPixelLength * _UnderwaterAlbedoDistanceScalar));
|
||||||
|
float alphaFactor = 1 - underwaterDetection * (_UnderwaterMaxAlphaFog * saturate(
|
||||||
|
(toPixelLength - _UnderwaterMinAlphaFogDistance) * _UnderwaterAlphaDistanceScalar));
|
||||||
|
|
||||||
|
return float4(lerp(color, _UnderwaterFogColor.rgb, albedoLerpValue), alphaFactor);
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
@ -23,8 +23,6 @@ Shader "ConformalDecals/UI/Color Slider"
|
|||||||
[Toggle(RED)] _Red ("Red", int) = 0
|
[Toggle(RED)] _Red ("Red", int) = 0
|
||||||
[Toggle(GREEN)] _Green ("Green", int) = 0
|
[Toggle(GREEN)] _Green ("Green", int) = 0
|
||||||
[Toggle(BLUE)] _Blue ("Blue", int) = 0
|
[Toggle(BLUE)] _Blue ("Blue", int) = 0
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
SubShader
|
SubShader
|
||||||
{
|
{
|
||||||
@ -63,7 +61,7 @@ Shader "ConformalDecals/UI/Color Slider"
|
|||||||
#include "UnityCG.cginc"
|
#include "UnityCG.cginc"
|
||||||
#include "UnityUI.cginc"
|
#include "UnityUI.cginc"
|
||||||
#include "HSL.cginc"
|
#include "HSL.cginc"
|
||||||
#include "SDF.cginc"
|
#include "../SDF.cginc"
|
||||||
|
|
||||||
#pragma multi_compile_local _ UNITY_UI_CLIP_RECT
|
#pragma multi_compile_local _ UNITY_UI_CLIP_RECT
|
||||||
#pragma multi_compile_local _ UNITY_UI_ALPHACLIP
|
#pragma multi_compile_local _ UNITY_UI_ALPHACLIP
|
@ -56,7 +56,7 @@ Shader "ConformalDecals/UI/HSV Square"
|
|||||||
#include "UnityCG.cginc"
|
#include "UnityCG.cginc"
|
||||||
#include "UnityUI.cginc"
|
#include "UnityUI.cginc"
|
||||||
#include "HSL.cginc"
|
#include "HSL.cginc"
|
||||||
#include "SDF.cginc"
|
#include "../SDF.cginc"
|
||||||
|
|
||||||
#pragma multi_compile_local _ UNITY_UI_CLIP_RECT
|
#pragma multi_compile_local _ UNITY_UI_CLIP_RECT
|
||||||
#pragma multi_compile_local _ UNITY_UI_ALPHACLIP
|
#pragma multi_compile_local _ UNITY_UI_ALPHACLIP
|
@ -56,7 +56,7 @@ Shader "ConformalDecals/UI/Color Swatch"
|
|||||||
#include "UnityCG.cginc"
|
#include "UnityCG.cginc"
|
||||||
#include "UnityUI.cginc"
|
#include "UnityUI.cginc"
|
||||||
#include "HSL.cginc"
|
#include "HSL.cginc"
|
||||||
#include "SDF.cginc"
|
#include "../SDF.cginc"
|
||||||
|
|
||||||
#pragma multi_compile_local _ UNITY_UI_CLIP_RECT
|
#pragma multi_compile_local _ UNITY_UI_CLIP_RECT
|
||||||
#pragma multi_compile_local _ UNITY_UI_ALPHACLIP
|
#pragma multi_compile_local _ UNITY_UI_ALPHACLIP
|
Before Width: | Height: | Size: 40 KiB After Width: | Height: | Size: 40 KiB |
Before Width: | Height: | Size: 31 KiB After Width: | Height: | Size: 31 KiB |
BIN
Assets/ConformalDecals/Textures/Decal-Blank.afdesign
Normal file
BIN
Assets/ConformalDecals/Textures/Decal-Blank.afdesign~lock~
Normal file
BIN
Assets/ConformalDecals/Textures/Decal-Spec.tif
Normal file
BIN
Assets/ConformalDecals/Textures/Icons Generic.afdesign
Normal file
Before Width: | Height: | Size: 470 KiB After Width: | Height: | Size: 470 KiB |
BIN
Assets/ConformalDecals/Textures/Munar.afdesign
Normal file
BIN
Assets/ConformalDecals/Textures/Paper-Wrinkle-n.png
Normal file
After Width: | Height: | Size: 1.4 MiB |
Before Width: | Height: | Size: 5.7 KiB After Width: | Height: | Size: 5.7 KiB |
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 10 KiB |
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 14 KiB |
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 18 KiB |
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 20 KiB |
BIN
Assets/ConformalDecals/Textures/Semiotic.afdesign
Normal file
Before Width: | Height: | Size: 6.2 KiB After Width: | Height: | Size: 6.2 KiB |
Before Width: | Height: | Size: 260 B After Width: | Height: | Size: 260 B |
Before Width: | Height: | Size: 3.9 KiB After Width: | Height: | Size: 3.9 KiB |
Before Width: | Height: | Size: 169 B After Width: | Height: | Size: 169 B |
BIN
Assets/ConformalDecals/Textures/paper-spec.png
Normal file
After Width: | Height: | Size: 74 KiB |
BIN
Assets/ConformalDecals/Textures/paper.png
Normal file
After Width: | Height: | Size: 48 KiB |
@ -1,46 +0,0 @@
|
|||||||
using System;
|
|
||||||
using UnityEngine;
|
|
||||||
|
|
||||||
[ExecuteInEditMode]
|
|
||||||
public class DecalProjectorTest : MonoBehaviour
|
|
||||||
{
|
|
||||||
public GameObject target = null;
|
|
||||||
public Material targetMaterial = null;
|
|
||||||
public MeshRenderer targetRenderer;
|
|
||||||
|
|
||||||
|
|
||||||
public float aspectRatio = 1.0f;
|
|
||||||
public float size = 1.0f;
|
|
||||||
public float factor = 1.0f;
|
|
||||||
|
|
||||||
private Matrix4x4 _projectionMatrix;
|
|
||||||
private Matrix4x4 _OrthoMatrix;
|
|
||||||
|
|
||||||
private int _matrixID;
|
|
||||||
private int _normalID;
|
|
||||||
public int _tangentID;
|
|
||||||
|
|
||||||
// Start is called before the first frame update
|
|
||||||
void Awake()
|
|
||||||
{
|
|
||||||
_projectionMatrix = Matrix4x4.identity;
|
|
||||||
targetRenderer = target.GetComponent<MeshRenderer>();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Update is called once per frame
|
|
||||||
void Update()
|
|
||||||
{
|
|
||||||
Vector3 pos =new Vector3( 0.5f ,0.5f, 0);
|
|
||||||
Vector3 scale = new Vector3(1 / size, 1 / (aspectRatio * size), 1);
|
|
||||||
_OrthoMatrix.SetTRS(pos, Quaternion.identity, scale);
|
|
||||||
//Debug.Log(_OrthoMatrix);
|
|
||||||
var targetToProjector = transform.worldToLocalMatrix * targetRenderer.localToWorldMatrix;
|
|
||||||
var projectorToTarget = targetRenderer.worldToLocalMatrix * transform.localToWorldMatrix;
|
|
||||||
_projectionMatrix = _OrthoMatrix * targetToProjector;
|
|
||||||
|
|
||||||
targetMaterial.SetMatrix("_ProjectionMatrix", _projectionMatrix);
|
|
||||||
targetMaterial.SetVector("_DecalNormal", projectorToTarget.MultiplyVector(Vector3.back).normalized);
|
|
||||||
targetMaterial.SetVector("_DecalTangent", projectorToTarget.MultiplyVector(Vector3.right).normalized);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -1,117 +0,0 @@
|
|||||||
using System.Collections;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using TMPro;
|
|
||||||
using UnityEngine;
|
|
||||||
using UnityEngine.Rendering;
|
|
||||||
|
|
||||||
public class TextRenderTest : MonoBehaviour {
|
|
||||||
//[InspectorButton("go")] public bool button;
|
|
||||||
|
|
||||||
public Camera _camera;
|
|
||||||
|
|
||||||
public GameObject _cameraObject;
|
|
||||||
|
|
||||||
public TextMeshPro _tmp;
|
|
||||||
|
|
||||||
public Material _blitMaterial;
|
|
||||||
|
|
||||||
public Material _targetMaterial;
|
|
||||||
|
|
||||||
public RenderTexture renderTex;
|
|
||||||
private float pixelDensity = 8;
|
|
||||||
private int MaxTextureSize = 4096;
|
|
||||||
private static readonly int Decal = Shader.PropertyToID("_Decal");
|
|
||||||
|
|
||||||
public const TextureFormat TextTextureFormat = TextureFormat.RG16;
|
|
||||||
public const RenderTextureFormat TextRenderTextureFormat = RenderTextureFormat.R8;
|
|
||||||
|
|
||||||
// Start is called before the first frame update
|
|
||||||
void Start() {
|
|
||||||
Debug.Log("starting...");
|
|
||||||
|
|
||||||
StartCoroutine(OnRender());
|
|
||||||
}
|
|
||||||
|
|
||||||
// Update is called once per frame
|
|
||||||
void Update() { }
|
|
||||||
|
|
||||||
private IEnumerator OnRender() {
|
|
||||||
Debug.Log("starting...2");
|
|
||||||
|
|
||||||
// calculate camera and texture size
|
|
||||||
_tmp.ForceMeshUpdate();
|
|
||||||
var mesh = _tmp.mesh;
|
|
||||||
mesh.RecalculateBounds();
|
|
||||||
var bounds = mesh.bounds;
|
|
||||||
Debug.Log(bounds.size);
|
|
||||||
|
|
||||||
var width = bounds.size.x * pixelDensity;
|
|
||||||
var height = bounds.size.y * pixelDensity;
|
|
||||||
|
|
||||||
var widthPoT = Mathf.NextPowerOfTwo((int) width);
|
|
||||||
var heightPoT = Mathf.NextPowerOfTwo((int) height);
|
|
||||||
|
|
||||||
if (widthPoT > MaxTextureSize) {
|
|
||||||
widthPoT /= widthPoT / MaxTextureSize;
|
|
||||||
heightPoT /= widthPoT / MaxTextureSize;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (heightPoT > MaxTextureSize) {
|
|
||||||
widthPoT /= heightPoT / MaxTextureSize;
|
|
||||||
heightPoT /= heightPoT / MaxTextureSize;
|
|
||||||
}
|
|
||||||
|
|
||||||
widthPoT = Mathf.Min(widthPoT, MaxTextureSize);
|
|
||||||
heightPoT = Mathf.Min(heightPoT, MaxTextureSize);
|
|
||||||
|
|
||||||
var widthRatio = widthPoT / width;
|
|
||||||
var heightRatio = heightPoT / height;
|
|
||||||
|
|
||||||
var sizeRatio = Mathf.Min(widthRatio, heightRatio);
|
|
||||||
|
|
||||||
Debug.Log(sizeRatio);
|
|
||||||
|
|
||||||
int scaledHeight = (int) (sizeRatio * height);
|
|
||||||
int scaledWidth = (int) (sizeRatio * width);
|
|
||||||
|
|
||||||
Debug.Log($"width = {scaledWidth}");
|
|
||||||
Debug.Log($"height = {scaledHeight}");
|
|
||||||
|
|
||||||
_camera.orthographicSize = scaledHeight / pixelDensity / 2;
|
|
||||||
_camera.aspect = (float) widthPoT / heightPoT;
|
|
||||||
|
|
||||||
_cameraObject.transform.localPosition = new Vector3(bounds.center.x, bounds.center.y, -1);
|
|
||||||
|
|
||||||
var halfHeight = heightPoT / pixelDensity / 2 / sizeRatio;
|
|
||||||
var halfWidth = widthPoT / pixelDensity / 2 / sizeRatio;
|
|
||||||
var matrix = Matrix4x4.Ortho(bounds.center.x - halfWidth, bounds.center.x + halfWidth,
|
|
||||||
bounds.center.y - halfHeight, bounds.center.y + halfHeight, -1, 1);
|
|
||||||
|
|
||||||
// setup texture
|
|
||||||
var texture = new Texture2D(widthPoT, heightPoT, TextTextureFormat, true);
|
|
||||||
_targetMaterial.SetTexture(Decal, texture);
|
|
||||||
|
|
||||||
|
|
||||||
// setup render texture
|
|
||||||
renderTex = RenderTexture.GetTemporary(widthPoT, heightPoT, 0, TextRenderTextureFormat, RenderTextureReadWrite.Linear, 1);
|
|
||||||
renderTex.autoGenerateMips = false;
|
|
||||||
|
|
||||||
RenderTexture.active = renderTex;
|
|
||||||
GL.PushMatrix();
|
|
||||||
GL.LoadProjectionMatrix(matrix);
|
|
||||||
_blitMaterial.SetPass(0);
|
|
||||||
Graphics.DrawMeshNow(mesh, Matrix4x4.identity);
|
|
||||||
GL.PopMatrix();
|
|
||||||
|
|
||||||
// setup material
|
|
||||||
_blitMaterial.mainTexture = _tmp.font.atlas;
|
|
||||||
|
|
||||||
yield return null;
|
|
||||||
|
|
||||||
RenderTexture.active = renderTex;
|
|
||||||
texture.ReadPixels(new Rect(0, 0, widthPoT, heightPoT), 0, 0, true);
|
|
||||||
texture.Apply(false, true);
|
|
||||||
|
|
||||||
RenderTexture.ReleaseTemporary(renderTex);
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,156 +0,0 @@
|
|||||||
#ifndef DECALS_COMMON_INCLUDED
|
|
||||||
#define DECALS_COMMON_INCLUDED
|
|
||||||
|
|
||||||
#include "AutoLight.cginc"
|
|
||||||
#include "Lighting.cginc"
|
|
||||||
|
|
||||||
#define CLIP_MARGIN 0.05
|
|
||||||
#define EDGE_MARGIN 0.01
|
|
||||||
|
|
||||||
// UNIFORM VARIABLES
|
|
||||||
// Projection matrix, normal, and tangent vectors
|
|
||||||
float4x4 _ProjectionMatrix;
|
|
||||||
float3 _DecalNormal;
|
|
||||||
float3 _DecalTangent;
|
|
||||||
|
|
||||||
// Common Shading Paramaters
|
|
||||||
float _Cutoff;
|
|
||||||
float _DecalOpacity;
|
|
||||||
float4 _Background;
|
|
||||||
|
|
||||||
sampler2D _Decal;
|
|
||||||
float4 _Decal_ST;
|
|
||||||
|
|
||||||
// Variant Shading Parameters
|
|
||||||
#ifdef DECAL_BASE_NORMAL
|
|
||||||
sampler2D _BumpMap;
|
|
||||||
float4 _BumpMap_ST;
|
|
||||||
float _EdgeWearStrength;
|
|
||||||
float _EdgeWearOffset;
|
|
||||||
#endif //DECAL_BASE_NORMAL
|
|
||||||
|
|
||||||
#ifdef DECAL_BUMPMAP
|
|
||||||
sampler2D _BumpMap;
|
|
||||||
float4 _BumpMap_ST;
|
|
||||||
#endif //DECAL_BUMPMAP
|
|
||||||
|
|
||||||
#ifdef DECAL_SPECMAP
|
|
||||||
sampler2D _SpecMap;
|
|
||||||
float4 _SpecMap_ST;
|
|
||||||
// specular color is declared in a unity CGINC for some reason??
|
|
||||||
fixed _Shininess;
|
|
||||||
#endif //DECAL_SPECMAP
|
|
||||||
|
|
||||||
#ifdef DECAL_EMISSIVE
|
|
||||||
sampler2D _Emissive;
|
|
||||||
float4 _Emissive_ST;
|
|
||||||
fixed4 _Emissive_Color;
|
|
||||||
#endif //DECAL_EMISSIVE
|
|
||||||
|
|
||||||
// KSP EFFECTS
|
|
||||||
// opacity and color
|
|
||||||
float _Opacity;
|
|
||||||
float4 _Color;
|
|
||||||
float _RimFalloff;
|
|
||||||
float4 _RimColor;
|
|
||||||
|
|
||||||
// fog
|
|
||||||
float4 _LocalCameraPos;
|
|
||||||
float4 _LocalCameraDir;
|
|
||||||
float4 _UnderwaterFogColor;
|
|
||||||
float _UnderwaterMinAlphaFogDistance;
|
|
||||||
float _UnderwaterMaxAlbedoFog;
|
|
||||||
float _UnderwaterMaxAlphaFog;
|
|
||||||
float _UnderwaterAlbedoDistanceScalar;
|
|
||||||
float _UnderwaterAlphaDistanceScalar;
|
|
||||||
float _UnderwaterFogFactor;
|
|
||||||
|
|
||||||
// SURFACE INPUT STRUCT
|
|
||||||
struct DecalSurfaceInput
|
|
||||||
{
|
|
||||||
float3 uv;
|
|
||||||
float2 uv_decal;
|
|
||||||
|
|
||||||
#ifdef DECAL_BUMPMAP
|
|
||||||
float2 uv_bumpmap;
|
|
||||||
#endif //DECAL_BUMPMAP
|
|
||||||
|
|
||||||
#ifdef DECAL_SPECMAP
|
|
||||||
float2 uv_specmap;
|
|
||||||
#endif //DECAL_SPECMAP
|
|
||||||
|
|
||||||
#ifdef DECAL_EMISSIVE
|
|
||||||
float2 uv_emissive;
|
|
||||||
#endif //DECAL_EMISSIVE
|
|
||||||
|
|
||||||
#ifdef DECAL_BASE_NORMAL
|
|
||||||
float3 normal;
|
|
||||||
#endif //DECAL_BASE_NORMAL
|
|
||||||
|
|
||||||
float3 vertex_normal;
|
|
||||||
float3 viewDir;
|
|
||||||
float3 worldPosition;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct appdata_decal
|
|
||||||
{
|
|
||||||
float4 vertex : POSITION;
|
|
||||||
float3 normal : NORMAL;
|
|
||||||
#if defined(DECAL_BASE_NORMAL) || defined(DECAL_PREVIEW)
|
|
||||||
float4 texcoord : TEXCOORD0;
|
|
||||||
float4 tangent : TANGENT;
|
|
||||||
#endif
|
|
||||||
};
|
|
||||||
|
|
||||||
struct v2f
|
|
||||||
{
|
|
||||||
UNITY_POSITION(pos);
|
|
||||||
float3 normal : NORMAL;
|
|
||||||
float4 uv_decal : TEXCOORD0;
|
|
||||||
|
|
||||||
#ifdef DECAL_BASE_NORMAL
|
|
||||||
float2 uv_base : TEXCOORD1;
|
|
||||||
#endif //DECAL_BASE_NORMAL
|
|
||||||
|
|
||||||
float4 tSpace0 : TEXCOORD2;
|
|
||||||
float4 tSpace1 : TEXCOORD3;
|
|
||||||
float4 tSpace2 : TEXCOORD4;
|
|
||||||
|
|
||||||
#ifdef UNITY_PASS_FORWARDBASE
|
|
||||||
fixed3 vlight : TEXCOORD5;
|
|
||||||
UNITY_SHADOW_COORDS(6)
|
|
||||||
#endif //UNITY_PASS_FORWARDBASE
|
|
||||||
|
|
||||||
#ifdef UNITY_PASS_FORWARDADD
|
|
||||||
UNITY_LIGHTING_COORDS(5,6)
|
|
||||||
#endif //UNITY_PASS_FORWARDADD
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
inline void decalClipAlpha(float alpha) {
|
|
||||||
#ifndef DECAL_PREVIEW
|
|
||||||
clip(alpha - 0.001);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
inline float CalcMipLevel(float2 texture_coord) {
|
|
||||||
float2 dx = ddx(texture_coord);
|
|
||||||
float2 dy = ddy(texture_coord);
|
|
||||||
float delta_max_sqr = max(dot(dx, dx), dot(dy, dy));
|
|
||||||
|
|
||||||
return 0.5 * log2(delta_max_sqr);
|
|
||||||
}
|
|
||||||
|
|
||||||
inline float BoundsDist(float3 p, float3 normal, float3 projNormal) {
|
|
||||||
float3 q = abs(p - 0.5) - 0.5; // 1x1 square/cube centered at (0.5,0.5)
|
|
||||||
//float dist = length(max(q,0)) + min(max(q.x,max(q.y,q.z)),0.0); // true SDF
|
|
||||||
#ifdef DECAL_PREVIEW
|
|
||||||
return 10 * max(q.x, q.y); // 2D pseudo SDF
|
|
||||||
#else
|
|
||||||
float dist = max(max(q.x, q.y), q.z); // pseudo SDF
|
|
||||||
float ndist = EDGE_MARGIN - dot(normal, projNormal); // SDF to normal
|
|
||||||
return 10 * max(dist, ndist); // return intersection
|
|
||||||
#endif //DECAL_PREVIEW
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
|
@ -1,33 +0,0 @@
|
|||||||
#ifndef DECALS_LIGHTING_INCLUDED
|
|
||||||
#define DECALS_LIGHTING_INCLUDED
|
|
||||||
|
|
||||||
// modifed version of the KSP BlinnPhong because it does some weird things
|
|
||||||
inline fixed4 LightingBlinnPhongDecal(SurfaceOutput s, fixed3 lightDir, half3 viewDir, fixed atten)
|
|
||||||
{
|
|
||||||
s.Normal = normalize(s.Normal);
|
|
||||||
half3 h = normalize(lightDir + viewDir);
|
|
||||||
|
|
||||||
fixed diff = max(0, dot(s.Normal, lightDir));
|
|
||||||
|
|
||||||
float nh = max(0, dot(s.Normal, h));
|
|
||||||
float spec = pow(nh, s.Specular*128.0) * s.Gloss;
|
|
||||||
|
|
||||||
fixed4 c = 0;
|
|
||||||
c.rgb = (s.Albedo * _LightColor0.rgb * diff + _LightColor0.rgb * _SpecColor.rgb * spec) * (atten);
|
|
||||||
return c;
|
|
||||||
}
|
|
||||||
|
|
||||||
// KSP underwater fog function
|
|
||||||
float4 UnderwaterFog(float3 worldPos, float3 color)
|
|
||||||
{
|
|
||||||
float3 toPixel = worldPos - _LocalCameraPos.xyz;
|
|
||||||
float toPixelLength = length(toPixel);
|
|
||||||
|
|
||||||
float underwaterDetection = _UnderwaterFogFactor * _LocalCameraDir.w;
|
|
||||||
float albedoLerpValue = underwaterDetection * (_UnderwaterMaxAlbedoFog * saturate(toPixelLength * _UnderwaterAlbedoDistanceScalar));
|
|
||||||
float alphaFactor = 1 - underwaterDetection * (_UnderwaterMaxAlphaFog * saturate((toPixelLength - _UnderwaterMinAlphaFogDistance) * _UnderwaterAlphaDistanceScalar));
|
|
||||||
|
|
||||||
return float4(lerp(color, _UnderwaterFogColor.rgb, albedoLerpValue), alphaFactor);
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
|
@ -1,183 +0,0 @@
|
|||||||
#ifndef DECALS_SURFACE_INCLUDED
|
|
||||||
#define DECALS_SURFACE_INCLUDED
|
|
||||||
|
|
||||||
#include "DecalsCommon.cginc"
|
|
||||||
#include "DecalsLighting.cginc"
|
|
||||||
|
|
||||||
// declare surf function,
|
|
||||||
// this must be defined in any shader using this cginc
|
|
||||||
void surf (DecalSurfaceInput IN, inout SurfaceOutput o);
|
|
||||||
|
|
||||||
v2f vert_forward(appdata_decal v)
|
|
||||||
{
|
|
||||||
v2f o;
|
|
||||||
UNITY_INITIALIZE_OUTPUT(v2f,o);
|
|
||||||
|
|
||||||
o.pos = UnityObjectToClipPos(v.vertex);
|
|
||||||
o.normal = v.normal;
|
|
||||||
|
|
||||||
#ifdef DECAL_PREVIEW
|
|
||||||
o.uv_decal = v.texcoord;
|
|
||||||
#else
|
|
||||||
o.uv_decal = mul (_ProjectionMatrix, v.vertex);
|
|
||||||
#endif //DECAL_PREVIEW
|
|
||||||
|
|
||||||
#ifdef DECAL_BASE_NORMAL
|
|
||||||
o.uv_base = TRANSFORM_TEX(v.texcoord, _BumpMap);
|
|
||||||
#endif //DECAL_BASE_NORMAL
|
|
||||||
|
|
||||||
float3 worldPosition = mul(unity_ObjectToWorld, v.vertex).xyz;
|
|
||||||
float3 worldNormal = UnityObjectToWorldNormal(v.normal);
|
|
||||||
|
|
||||||
#if defined(DECAL_BASE_NORMAL) || defined(DECAL_PREVIEW)
|
|
||||||
// use tangent of base geometry
|
|
||||||
fixed3 worldTangent = UnityObjectToWorldDir(v.tangent.xyz);
|
|
||||||
fixed tangentSign = v.tangent.w * unity_WorldTransformParams.w;
|
|
||||||
fixed3 worldBinormal = cross(worldNormal, worldTangent) * tangentSign;
|
|
||||||
#else
|
|
||||||
// use tangent of projector
|
|
||||||
fixed3 decalTangent = UnityObjectToWorldDir(_DecalTangent);
|
|
||||||
fixed3 worldBinormal = cross(decalTangent, worldNormal);
|
|
||||||
fixed3 worldTangent = cross(worldNormal, worldBinormal);
|
|
||||||
#endif //defined(DECAL_BASE_NORMAL) || defined(DECAL_PREVIEW)
|
|
||||||
|
|
||||||
o.tSpace0 = float4(worldTangent.x, worldBinormal.x, worldNormal.x, worldPosition.x);
|
|
||||||
o.tSpace1 = float4(worldTangent.y, worldBinormal.y, worldNormal.y, worldPosition.y);
|
|
||||||
o.tSpace2 = float4(worldTangent.z, worldBinormal.z, worldNormal.z, worldPosition.z);
|
|
||||||
|
|
||||||
// forward base pass specific lighting code
|
|
||||||
#ifdef UNITY_PASS_FORWARDBASE
|
|
||||||
// SH/ambient light
|
|
||||||
#if UNITY_SHOULD_SAMPLE_SH
|
|
||||||
float3 shlight = ShadeSH9 (float4(worldNormal,1.0));
|
|
||||||
o.vlight = shlight;
|
|
||||||
#else
|
|
||||||
o.vlight = 0.0;
|
|
||||||
#endif // UNITY_SHOULD_SAMPLE_SH
|
|
||||||
|
|
||||||
// vertex light
|
|
||||||
#ifdef VERTEXLIGHT_ON
|
|
||||||
o.vlight += Shade4PointLights (
|
|
||||||
unity_4LightPosX0, unity_4LightPosY0, unity_4LightPosZ0,
|
|
||||||
unity_LightColor[0].rgb, unity_LightColor[1].rgb, unity_LightColor[2].rgb, unity_LightColor[3].rgb,
|
|
||||||
unity_4LightAtten0, worldPosition, worldNormal );
|
|
||||||
#endif // VERTEXLIGHT_ON
|
|
||||||
#endif // UNITY_PASS_FORWARDBASE
|
|
||||||
|
|
||||||
// pass shadow and, possibly, light cookie coordinates to pixel shader
|
|
||||||
UNITY_TRANSFER_LIGHTING(o, 0.0);
|
|
||||||
|
|
||||||
return o;
|
|
||||||
}
|
|
||||||
|
|
||||||
fixed4 frag_forward(v2f IN) : SV_Target
|
|
||||||
{
|
|
||||||
#ifdef DECAL_PREVIEW
|
|
||||||
fixed4 uv_projected = IN.uv_decal;
|
|
||||||
#else
|
|
||||||
// perform decal projection
|
|
||||||
fixed4 uv_projected = UNITY_PROJ_COORD(IN.uv_decal);
|
|
||||||
|
|
||||||
clip(uv_projected.xyz + CLIP_MARGIN);
|
|
||||||
clip(CLIP_MARGIN + (1-uv_projected.xyz));
|
|
||||||
#endif //DECAL_PREVIEW
|
|
||||||
|
|
||||||
// declare data
|
|
||||||
DecalSurfaceInput i;
|
|
||||||
SurfaceOutput o;
|
|
||||||
|
|
||||||
// setup world-space TBN vectors
|
|
||||||
UNITY_EXTRACT_TBN(IN);
|
|
||||||
|
|
||||||
float3 worldPosition = float3(IN.tSpace0.w, IN.tSpace1.w, IN.tSpace2.w);
|
|
||||||
float3 worldTangent = float3(IN.tSpace0.x, IN.tSpace1.x, IN.tSpace2.x);
|
|
||||||
|
|
||||||
// setup world-space light and view direction vectors
|
|
||||||
#ifndef USING_DIRECTIONAL_LIGHT
|
|
||||||
fixed3 lightDir = normalize(UnityWorldSpaceLightDir(worldPosition));
|
|
||||||
#else
|
|
||||||
fixed3 lightDir = _WorldSpaceLightPos0.xyz;
|
|
||||||
#endif
|
|
||||||
float3 worldViewDir = normalize(UnityWorldSpaceViewDir(worldPosition));
|
|
||||||
float3 viewDir = _unity_tbn_0 * worldViewDir.x + _unity_tbn_1 * worldViewDir.y + _unity_tbn_2 * worldViewDir.z;
|
|
||||||
|
|
||||||
// initialize surface input
|
|
||||||
UNITY_INITIALIZE_OUTPUT(DecalSurfaceInput, i)
|
|
||||||
i.uv_decal = TRANSFORM_TEX(uv_projected, _Decal);
|
|
||||||
i.uv = uv_projected;
|
|
||||||
|
|
||||||
#ifdef DECAL_BUMPMAP
|
|
||||||
i.uv_bumpmap = TRANSFORM_TEX(uv_projected, _BumpMap);
|
|
||||||
#endif //DECAL_BUMPMAP
|
|
||||||
|
|
||||||
#ifdef DECAL_SPECMAP
|
|
||||||
i.uv_specmap = TRANSFORM_TEX(uv_projected, _SpecMap);
|
|
||||||
#endif //DECAL_SPECMAP
|
|
||||||
|
|
||||||
#ifdef DECAL_EMISSIVE
|
|
||||||
i.uv_emissive = TRANSFORM_TEX(uv_projected, _Emissive);
|
|
||||||
#endif //DECAL_EMISSIVE
|
|
||||||
|
|
||||||
#ifdef DECAL_BASE_NORMAL
|
|
||||||
#ifdef DECAL_PREVIEW
|
|
||||||
i.normal = fixed3(0,0,1);
|
|
||||||
#else
|
|
||||||
i.normal = UnpackNormalDXT5nm(tex2D(_BumpMap, IN.uv_base));
|
|
||||||
#endif //DECAL_PREVIEW
|
|
||||||
#endif //DECAL_BASE_NORMAL
|
|
||||||
|
|
||||||
i.vertex_normal = IN.normal;
|
|
||||||
i.viewDir = viewDir;
|
|
||||||
i.worldPosition = worldPosition;
|
|
||||||
|
|
||||||
// initialize surface output
|
|
||||||
o.Albedo = 0.0;
|
|
||||||
o.Emission = 0.0;
|
|
||||||
o.Specular = 0.0;
|
|
||||||
o.Alpha = 0.0;
|
|
||||||
o.Gloss = 0.0;
|
|
||||||
o.Normal = fixed3(0,0,1);
|
|
||||||
|
|
||||||
// call surface function
|
|
||||||
surf(i, o);
|
|
||||||
|
|
||||||
#ifdef DECAL_PREVIEW
|
|
||||||
if (any(IN.uv_decal > 1) || any(IN.uv_decal < 0)) o.Alpha = 0;
|
|
||||||
|
|
||||||
o.Albedo = lerp(_Background.rgb, o.Albedo, o.Alpha) * _Color.rgb;
|
|
||||||
o.Normal = lerp(float3(0,0,1), o.Normal, o.Alpha);
|
|
||||||
o.Gloss = lerp(_Background.a, o.Gloss, o.Alpha);
|
|
||||||
o.Emission = lerp(0, o.Emission, o.Alpha);
|
|
||||||
o.Alpha = _Opacity;
|
|
||||||
#endif //DECAL_PREVIEW
|
|
||||||
|
|
||||||
// compute lighting & shadowing factor
|
|
||||||
UNITY_LIGHT_ATTENUATION(atten, IN, worldPosition)
|
|
||||||
|
|
||||||
// compute world normal
|
|
||||||
float3 WorldNormal;
|
|
||||||
WorldNormal.x = dot(_unity_tbn_0, o.Normal);
|
|
||||||
WorldNormal.y = dot(_unity_tbn_1, o.Normal);
|
|
||||||
WorldNormal.z = dot(_unity_tbn_2, o.Normal);
|
|
||||||
WorldNormal = normalize(WorldNormal);
|
|
||||||
o.Normal = WorldNormal;
|
|
||||||
|
|
||||||
//call modified KSP lighting function
|
|
||||||
float4 c = LightingBlinnPhongDecal(o, lightDir, worldViewDir, atten);
|
|
||||||
|
|
||||||
// Forward base emission and ambient/vertex lighting
|
|
||||||
#ifdef UNITY_PASS_FORWARDBASE
|
|
||||||
c.rgb += o.Emission;
|
|
||||||
c.rgb += o.Albedo * IN.vlight;
|
|
||||||
c.a = o.Alpha;
|
|
||||||
#endif //UNITY_PASS_FORWARDBASE
|
|
||||||
|
|
||||||
// Forward add multiply by alpha
|
|
||||||
#ifdef UNITY_PASS_FORWARDADD
|
|
||||||
c.rgb *= o.Alpha;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
return c;
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
|
@ -1,102 +0,0 @@
|
|||||||
#ifndef LIGHTING_KSP_INCLUDED
|
|
||||||
#define LIGHTING_KSP_INCLUDED
|
|
||||||
|
|
||||||
inline fixed4 LightingBlinnPhongSmooth(SurfaceOutput s, fixed3 lightDir, half3 viewDir, fixed atten)
|
|
||||||
{
|
|
||||||
s.Normal = normalize(s.Normal);
|
|
||||||
half3 h = normalize(lightDir + viewDir);
|
|
||||||
|
|
||||||
fixed diff = max(0, dot(s.Normal, lightDir));
|
|
||||||
|
|
||||||
float nh = max(0, dot(s.Normal, h));
|
|
||||||
float spec = pow(nh, s.Specular*128.0) * s.Gloss;
|
|
||||||
|
|
||||||
fixed4 c;
|
|
||||||
c.rgb = (s.Albedo * _LightColor0.rgb * diff + _LightColor0.rgb * _SpecColor.rgb * spec) * (atten);
|
|
||||||
c.a = s.Alpha + _LightColor0.a * _SpecColor.a * spec * atten;
|
|
||||||
return c;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
inline half4 LightingUnlit(SurfaceOutput s, half3 lightDir, half atten)
|
|
||||||
{
|
|
||||||
// half diff = max (0, dot (s.Normal, lightDir));
|
|
||||||
|
|
||||||
half4 c;
|
|
||||||
c.rgb = s.Albedo;
|
|
||||||
c.a = s.Alpha;
|
|
||||||
return c;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
inline half4 LightingUnlit_PrePass(SurfaceOutput s, half4 light)
|
|
||||||
{
|
|
||||||
half4 c;
|
|
||||||
c.rgb = s.Albedo;
|
|
||||||
c.a = s.Alpha;
|
|
||||||
return c;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
fixed4 LightingNoLighting(SurfaceOutput s, fixed3 lightDir, fixed atten) { return fixed4(0, 0, 0, 0); }
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
float4 _Color;
|
|
||||||
half _LightBoost;
|
|
||||||
half4 LightingLightWrapped(SurfaceOutput s, half3 lightDir, half3 viewDir, half atten) {
|
|
||||||
float3 w = _Color.rgb*0.5;
|
|
||||||
half3 NdotL = dot(s.Normal, lightDir);
|
|
||||||
|
|
||||||
//Specular term
|
|
||||||
half3 h = normalize(lightDir + viewDir);
|
|
||||||
s.Normal = normalize(s.Normal);
|
|
||||||
float NdotH = dot(s.Normal, h);
|
|
||||||
float spec = pow(max(NdotH, 0), s.Specular * 128.0) * s.Gloss;
|
|
||||||
fixed3 specColor = _SpecColor.rgb * _LightColor0.rgb;
|
|
||||||
|
|
||||||
half3 diff = NdotL * (1 - w) + w;
|
|
||||||
half4 c;
|
|
||||||
c.rgb = ((s.Albedo * _LightColor0.rgb * diff) + (specColor * spec)) * (atten * _LightBoost);
|
|
||||||
c.a = s.Alpha + (_LightColor0.a * _SpecColor.a * spec * atten);
|
|
||||||
return c;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
float4 _LocalCameraPos;
|
|
||||||
float4 _LocalCameraDir;
|
|
||||||
float4 _UnderwaterFogColor;
|
|
||||||
float _UnderwaterMinAlphaFogDistance;
|
|
||||||
float _UnderwaterMaxAlbedoFog;
|
|
||||||
float _UnderwaterMaxAlphaFog;
|
|
||||||
float _UnderwaterAlbedoDistanceScalar;
|
|
||||||
float _UnderwaterAlphaDistanceScalar;
|
|
||||||
float _UnderwaterFogFactor;
|
|
||||||
|
|
||||||
float4 UnderwaterFog(float3 worldPos, float3 color)
|
|
||||||
{
|
|
||||||
float3 toPixel = worldPos - _LocalCameraPos.xyz;
|
|
||||||
float toPixelLength = length(toPixel); ///< Comment out the math--looks better without it.
|
|
||||||
//float angleDot = dot(_LocalCameraDir.xyz, toPixel / toPixelLength);
|
|
||||||
//angleDot = lerp(0.00000001, angleDot, saturate(sign(angleDot)));
|
|
||||||
//float waterDist = -_LocalCameraPos.w / angleDot;
|
|
||||||
//float dist = min(toPixelLength, waterDist);
|
|
||||||
|
|
||||||
|
|
||||||
float underwaterDetection = _UnderwaterFogFactor * _LocalCameraDir.w; ///< sign(1 - sign(_LocalCameraPos.w));
|
|
||||||
float albedoLerpValue = underwaterDetection * (_UnderwaterMaxAlbedoFog * saturate(toPixelLength * _UnderwaterAlbedoDistanceScalar));
|
|
||||||
float alphaFactor = 1 - underwaterDetection * (_UnderwaterMaxAlphaFog * saturate((toPixelLength - _UnderwaterMinAlphaFogDistance) * _UnderwaterAlphaDistanceScalar));
|
|
||||||
|
|
||||||
return float4(lerp(color, _UnderwaterFogColor.rgb, albedoLerpValue), alphaFactor);
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
|
@ -1,111 +0,0 @@
|
|||||||
Shader "ConformalDecals/Decal/Standard"
|
|
||||||
{
|
|
||||||
Properties
|
|
||||||
{
|
|
||||||
[Header(Decal)]
|
|
||||||
_Decal("Decal Texture", 2D) = "gray" {}
|
|
||||||
[Toggle(DECAL_SDF_ALPHA)] _Decal_SDF_Alpha ("SDF in Alpha", int) = 0
|
|
||||||
|
|
||||||
|
|
||||||
[Header(Normal)]
|
|
||||||
[Toggle(DECAL_BASE_NORMAL)] _BaseNormal ("Use Base Normal", int) = 0
|
|
||||||
[Toggle(DECAL_BUMPMAP)] _Decal_BumpMap ("Has BumpMap", int) = 0
|
|
||||||
_BumpMap("Bump Map", 2D) = "bump" {}
|
|
||||||
_EdgeWearStrength("Edge Wear Strength", Range(0,500)) = 100
|
|
||||||
_EdgeWearOffset("Edge Wear Offset", Range(0,1)) = 0.1
|
|
||||||
|
|
||||||
[Header(Specularity)]
|
|
||||||
[Toggle(DECAL_SPECMAP)] _Decal_SpecMap ("Has SpecMap", int) = 0
|
|
||||||
_SpecMap ("Specular Map)", 2D) = "black" {}
|
|
||||||
_SpecColor ("_SpecColor", Color) = (0.25, 0.25, 0.25, 1)
|
|
||||||
_Shininess ("Shininess", Range (0.03, 10)) = 0.3
|
|
||||||
|
|
||||||
[Header(Emissive)]
|
|
||||||
[Toggle(DECAL_EMISSIVE)] _Decal_Emissive ("Has Emissive", int) = 0
|
|
||||||
_Emissive("_Emissive", 2D) = "black" {}
|
|
||||||
_EmissiveColor("_EmissiveColor", Color) = (0,0,0,1)
|
|
||||||
|
|
||||||
_Cutoff ("Alpha cutoff", Range(0,1)) = 0.5
|
|
||||||
_DecalOpacity("Opacity", Range(0,1) ) = 1
|
|
||||||
_Background("Background Color", Color) = (0.9,0.9,0.9,0.7)
|
|
||||||
|
|
||||||
[Enum(UnityEngine.Rendering.CullMode)] _Cull ("Cull", int) = 2
|
|
||||||
[Toggle] _ZWrite ("ZWrite", Float) = 1.0
|
|
||||||
|
|
||||||
[Toggle(DECAL_PREVIEW)] _Preview ("Preview", int) = 0
|
|
||||||
|
|
||||||
[Header(Effects)]
|
|
||||||
[PerRendererData]_Opacity("_Opacity", Range(0,1) ) = 1
|
|
||||||
[PerRendererData]_Color("_Color", Color) = (1,1,1,1)
|
|
||||||
[PerRendererData]_RimFalloff("_RimFalloff", Range(0.01,5) ) = 0.1
|
|
||||||
[PerRendererData]_RimColor("_RimColor", Color) = (0,0,0,0)
|
|
||||||
[PerRendererData]_UnderwaterFogFactor ("Underwater Fog Factor", Range(0,1)) = 0
|
|
||||||
}
|
|
||||||
SubShader
|
|
||||||
{
|
|
||||||
Tags { "Queue" = "Geometry+100" "IgnoreProjector" = "true" "DisableBatching" = "true"}
|
|
||||||
Cull [_Cull]
|
|
||||||
|
|
||||||
Pass
|
|
||||||
{
|
|
||||||
Name "FORWARD"
|
|
||||||
Tags { "LightMode" = "ForwardBase" }
|
|
||||||
ZWrite [_ZWrite]
|
|
||||||
ZTest LEqual
|
|
||||||
Blend SrcAlpha OneMinusSrcAlpha
|
|
||||||
|
|
||||||
CGPROGRAM
|
|
||||||
#pragma vertex vert_forward
|
|
||||||
#pragma fragment frag_forward
|
|
||||||
|
|
||||||
#pragma multi_compile_fwdbase nolightmap nodirlightmap nodynlightmap
|
|
||||||
#pragma skip_variants SHADOWS_DEPTH SHADOWS_CUBE SHADOWS_SHADOWMASK LIGHTMAP_SHADOW_MIXING POINT_COOKIE
|
|
||||||
#pragma multi_compile_local __ DECAL_PREVIEW
|
|
||||||
#pragma multi_compile_local __ DECAL_BASE_NORMAL DECAL_BUMPMAP
|
|
||||||
#pragma multi_compile_local __ DECAL_SPECMAP
|
|
||||||
#pragma multi_compile_local __ DECAL_EMISSIVE
|
|
||||||
#pragma multi_compile_local __ DECAL_SDF_ALPHA
|
|
||||||
|
|
||||||
#include "UnityCG.cginc"
|
|
||||||
#include "DecalsCommon.cginc"
|
|
||||||
#include "DecalsSurface.cginc"
|
|
||||||
#include "SDF.cginc"
|
|
||||||
#include "StandardDecal.cginc"
|
|
||||||
|
|
||||||
ENDCG
|
|
||||||
}
|
|
||||||
|
|
||||||
Pass
|
|
||||||
{
|
|
||||||
Name "FORWARD"
|
|
||||||
Tags { "LightMode" = "ForwardAdd" }
|
|
||||||
ZWrite Off
|
|
||||||
ZTest LEqual
|
|
||||||
Blend One One
|
|
||||||
Offset -1, -1
|
|
||||||
|
|
||||||
CGPROGRAM
|
|
||||||
#pragma vertex vert_forward
|
|
||||||
#pragma fragment frag_forward
|
|
||||||
|
|
||||||
#pragma multi_compile_fwdadd nolightmap nodirlightmap nodynlightmap
|
|
||||||
#pragma skip_variants SHADOWS_DEPTH SHADOWS_CUBE SHADOWS_SHADOWMASK LIGHTMAP_SHADOW_MIXING POINT_COOKIE
|
|
||||||
#pragma multi_compile_local __ DECAL_PREVIEW
|
|
||||||
#pragma multi_compile_local __ DECAL_BASE_NORMAL DECAL_BUMPMAP
|
|
||||||
#pragma multi_compile_local __ DECAL_SPECMAP
|
|
||||||
#pragma multi_compile_local __ DECAL_EMISSIVE
|
|
||||||
#pragma multi_compile_local __ DECAL_SDF_ALPHA
|
|
||||||
|
|
||||||
#include "UnityCG.cginc"
|
|
||||||
#include "DecalsCommon.cginc"
|
|
||||||
#include "DecalsSurface.cginc"
|
|
||||||
#include "SDF.cginc"
|
|
||||||
#include "StandardDecal.cginc"
|
|
||||||
|
|
||||||
ENDCG
|
|
||||||
}
|
|
||||||
|
|
||||||
// shadow casting support
|
|
||||||
UsePass "Legacy Shaders/VertexLit/SHADOWCASTER"
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,112 +0,0 @@
|
|||||||
Shader "ConformalDecals/Decal/Text"
|
|
||||||
{
|
|
||||||
Properties
|
|
||||||
{
|
|
||||||
[Header(Decal)]
|
|
||||||
[Toggle(DECAL_FILL)] _Fill ("Fill", int) = 0
|
|
||||||
_Decal("Decal Texture", 2D) = "gray" {}
|
|
||||||
_DecalColor("Decal Color", Color) = (1,1,1,1)
|
|
||||||
|
|
||||||
_Weight("Text Weight", Range(0,1)) = 0
|
|
||||||
|
|
||||||
[Header(Outline)]
|
|
||||||
[Toggle(DECAL_OUTLINE)] _Outline ("Outline", int) = 0
|
|
||||||
_OutlineColor("Outline Color", Color) = (0,0,0,1)
|
|
||||||
_OutlineWidth("Outline Width", Range(0,1)) = 0.1
|
|
||||||
|
|
||||||
[Header(Normal)]
|
|
||||||
[Toggle(DECAL_BASE_NORMAL)] _BaseNormal ("Use Base Normal", int) = 0
|
|
||||||
_BumpMap("Bump Map", 2D) = "bump" {}
|
|
||||||
_EdgeWearStrength("Edge Wear Strength", Range(0,500)) = 100
|
|
||||||
_EdgeWearOffset("Edge Wear Offset", Range(0,1)) = 0.1
|
|
||||||
|
|
||||||
[Header(Specularity)]
|
|
||||||
[Toggle(DECAL_SPECMAP)] _Decal_SpecMap ("Has SpecMap", int) = 0
|
|
||||||
_SpecMap ("Specular Map)", 2D) = "black" {}
|
|
||||||
_SpecColor ("_SpecColor", Color) = (0.25, 0.25, 0.25, 1)
|
|
||||||
_Shininess ("Shininess", Range (0.03, 10)) = 0.3
|
|
||||||
|
|
||||||
_Cutoff ("Alpha cutoff", Range(0,1)) = 0.5
|
|
||||||
_DecalOpacity("Opacity", Range(0,1) ) = 1
|
|
||||||
_Background("Background Color", Color) = (0.9,0.9,0.9,0.7)
|
|
||||||
|
|
||||||
[Enum(UnityEngine.Rendering.CullMode)] _Cull ("Cull", int) = 2
|
|
||||||
[Toggle] _ZWrite ("ZWrite", Float) = 1.0
|
|
||||||
|
|
||||||
[Toggle(DECAL_PREVIEW)] _Preview ("Preview", int) = 0
|
|
||||||
|
|
||||||
[Header(Effects)]
|
|
||||||
[PerRendererData]_Opacity("_Opacity", Range(0,1) ) = 1
|
|
||||||
_Color("_Color", Color) = (1,1,1,1)
|
|
||||||
[PerRendererData]_RimFalloff("_RimFalloff", Range(0.01,5) ) = 0.1
|
|
||||||
[PerRendererData]_RimColor("_RimColor", Color) = (0,0,0,0)
|
|
||||||
[PerRendererData]_UnderwaterFogFactor ("Underwater Fog Factor", Range(0,1)) = 0
|
|
||||||
}
|
|
||||||
SubShader
|
|
||||||
{
|
|
||||||
Tags { "Queue" = "Geometry+100" "IgnoreProjector" = "true" "DisableBatching" = "true"}
|
|
||||||
Cull [_Cull]
|
|
||||||
|
|
||||||
Pass
|
|
||||||
{
|
|
||||||
Name "FORWARD"
|
|
||||||
Tags { "LightMode" = "ForwardBase" }
|
|
||||||
ZWrite [_ZWrite]
|
|
||||||
ZTest LEqual
|
|
||||||
Blend SrcAlpha OneMinusSrcAlpha
|
|
||||||
|
|
||||||
CGPROGRAM
|
|
||||||
#pragma vertex vert_forward
|
|
||||||
#pragma fragment frag_forward
|
|
||||||
|
|
||||||
#pragma multi_compile_fwdbase nolightmap nodirlightmap nodynlightmap
|
|
||||||
#pragma skip_variants SHADOWS_DEPTH SHADOWS_CUBE SHADOWS_SHADOWMASK LIGHTMAP_SHADOW_MIXING POINT_COOKIE
|
|
||||||
#pragma multi_compile_local __ DECAL_PREVIEW
|
|
||||||
#pragma multi_compile_local __ DECAL_BASE_NORMAL
|
|
||||||
#pragma multi_compile_local __ DECAL_SPECMAP
|
|
||||||
#pragma multi_compile_local __ DECAL_OUTLINE
|
|
||||||
#pragma multi_compile_local __ DECAL_FILL
|
|
||||||
|
|
||||||
#include "UnityCG.cginc"
|
|
||||||
#include "DecalsCommon.cginc"
|
|
||||||
#include "DecalsSurface.cginc"
|
|
||||||
#include "SDF.cginc"
|
|
||||||
#include "TextDecal.cginc"
|
|
||||||
|
|
||||||
ENDCG
|
|
||||||
}
|
|
||||||
|
|
||||||
Pass
|
|
||||||
{
|
|
||||||
Name "FORWARD"
|
|
||||||
Tags { "LightMode" = "ForwardAdd" }
|
|
||||||
ZWrite Off
|
|
||||||
ZTest LEqual
|
|
||||||
Blend One One
|
|
||||||
Offset -1, -1
|
|
||||||
|
|
||||||
CGPROGRAM
|
|
||||||
#pragma vertex vert_forward
|
|
||||||
#pragma fragment frag_forward
|
|
||||||
|
|
||||||
#pragma multi_compile_fwdadd nolightmap nodirlightmap nodynlightmap
|
|
||||||
#pragma skip_variants SHADOWS_DEPTH SHADOWS_CUBE SHADOWS_SHADOWMASK LIGHTMAP_SHADOW_MIXING POINT_COOKIE
|
|
||||||
#pragma multi_compile_local __ DECAL_PREVIEW
|
|
||||||
#pragma multi_compile_local __ DECAL_BASE_NORMAL
|
|
||||||
#pragma multi_compile_local __ DECAL_SPECMAP
|
|
||||||
#pragma multi_compile_local __ DECAL_OUTLINE
|
|
||||||
#pragma multi_compile_local __ DECAL_FILL
|
|
||||||
|
|
||||||
#include "UnityCG.cginc"
|
|
||||||
#include "DecalsCommon.cginc"
|
|
||||||
#include "DecalsSurface.cginc"
|
|
||||||
#include "SDF.cginc"
|
|
||||||
#include "TextDecal.cginc"
|
|
||||||
|
|
||||||
ENDCG
|
|
||||||
}
|
|
||||||
|
|
||||||
// shadow casting support
|
|
||||||
UsePass "Legacy Shaders/VertexLit/SHADOWCASTER"
|
|
||||||
}
|
|
||||||
}
|
|
229
CHANGELOG.md
Normal file
@ -0,0 +1,229 @@
|
|||||||
|
# Changelog
|
||||||
|
|
||||||
|
All notable changes to this project will be documented in this file
|
||||||
|
|
||||||
|
| modName | Conformal Decals |
|
||||||
|
| ------- |:-------------------------------------------------------------------------------------|
|
||||||
|
| license | CC-By-SA & GPL3 |
|
||||||
|
| website | https://forum.kerbalspaceprogram.com/index.php?/topic/194802-18-111-conformal-decals |
|
||||||
|
| author | Andrew Cassidy |
|
||||||
|
|
||||||
|
## 0.2.14 - 2024-06-25
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- Fixed parts showing as all black with the Deferred Rendering mod
|
||||||
|
|
||||||
|
|
||||||
|
## 0.2.13 - 2024-05-17
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- Fixed flag decals sometimes not respecting image aspect ratio
|
||||||
|
|
||||||
|
|
||||||
|
## 0.2.12 - 2022-10-31
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
- Updated bundled Shabby to 0.3.0. Does not affect CKAN users
|
||||||
|
- Made flag aspect ratio overrides configurable with `ASPECTRATIO` nodes in the config. User flags added to Squad/Flags should now be the correct aspect ratio
|
||||||
|
- All decal aspect ratios can now be overriden with the `aspectRatio` field
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- Reverted some changes from last version that were causing issues on launch
|
||||||
|
|
||||||
|
|
||||||
|
## 0.2.11 - 2022-10-30
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- PR by LinuxGuruGamer:
|
||||||
|
- Fixed nullref caused when an entry in `_targets` was null
|
||||||
|
- Fixed memory leak caused by the OnDestroy() methods not being called due to them being virtual
|
||||||
|
|
||||||
|
|
||||||
|
## 0.2.10 - 2022-03-14
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- Fixed decals not projecting on loading prefabs
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
- Re-enabled projecting onto TransparentFX layer
|
||||||
|
|
||||||
|
### Added
|
||||||
|
|
||||||
|
- Allowed for regular expressions to be used when blacklisting shaders
|
||||||
|
- Added all Waterfall shaders to the shader blacklist when Waterfall is present
|
||||||
|
|
||||||
|
|
||||||
|
## 0.2.9 - 2022-03-12
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- Fixed text decals breaking when used in symmetry
|
||||||
|
- Fixed decals projecting onto the TransparentFX layer, such as Waterfall plumes
|
||||||
|
|
||||||
|
|
||||||
|
## 0.2.8
|
||||||
|
|
||||||
|
- Update bundled Shabby to support Harmony 2 for compatibility with other mods
|
||||||
|
- Update bundled B9PartSwitch to 2.18.0
|
||||||
|
|
||||||
|
|
||||||
|
## 0.2.7
|
||||||
|
|
||||||
|
- Supported KSP versions: 1.8.x to 1.11.x
|
||||||
|
|
||||||
|
### Notes:
|
||||||
|
|
||||||
|
- Attaching decal parts in flight using engineer kerbals is not supported.
|
||||||
|
|
||||||
|
### Fixed:
|
||||||
|
|
||||||
|
- Fixed certain non-ascii strings not rendering correctly under certain circumstances.
|
||||||
|
- Yet another attempted fix for the planet text glitch.
|
||||||
|
|
||||||
|
|
||||||
|
## 0.2.6
|
||||||
|
|
||||||
|
### Fixed:
|
||||||
|
|
||||||
|
- Fixed stock flags appearing stretched by forcing their aspect ratio to be correct.
|
||||||
|
- Another attempted fix for the planet text glitch.
|
||||||
|
|
||||||
|
|
||||||
|
## 0.2.5
|
||||||
|
|
||||||
|
### Fixed:
|
||||||
|
|
||||||
|
- Fixed line spacing, character spacing, and vertical settings not applying to symmetry counterparts
|
||||||
|
|
||||||
|
|
||||||
|
## 0.2.4
|
||||||
|
|
||||||
|
### Fixed:
|
||||||
|
|
||||||
|
- Fixed red text appearing on planets due to KSP bug by clearing render textures afterwards.
|
||||||
|
- Fixed fonts not saving correctly.
|
||||||
|
|
||||||
|
### Changed:
|
||||||
|
|
||||||
|
- Lowered step size for decal size and depth to 1cm.
|
||||||
|
- Changed default max size to 5m.
|
||||||
|
- Changed default text decal size to 0.2m
|
||||||
|
- Text decals now show as a circle if they contain only whitespace.
|
||||||
|
|
||||||
|
|
||||||
|
## 0.2.3
|
||||||
|
|
||||||
|
### Fixed:
|
||||||
|
|
||||||
|
- Fixed TMP subobjects being deleted, causing fallback fonts to fail in some situations.
|
||||||
|
- Started using URL-style encoding for text decals behind the scenes to prevent issues with certain characters.
|
||||||
|
- Fixed text decals having zero size when they had only whitespace or an empty string.
|
||||||
|
- Fixed decals having drag and causing issues when using FAR.
|
||||||
|
- Fixed broken saving of text decals in certain circumstances.
|
||||||
|
|
||||||
|
|
||||||
|
## 0.2.2
|
||||||
|
|
||||||
|
### Fixed:
|
||||||
|
|
||||||
|
- Fixed corrupted text rendering when a vessel loads during a scene change.
|
||||||
|
|
||||||
|
|
||||||
|
## 0.2.1
|
||||||
|
|
||||||
|
### Changed:
|
||||||
|
|
||||||
|
- Pressing enter in the text entry window now types a newline.
|
||||||
|
|
||||||
|
### Fixed:
|
||||||
|
|
||||||
|
- Renamed font assetbundle. The old extension was causing the game to try to load it twice on Windows due to legacy compatability features.
|
||||||
|
- Fixed text rendering on DirectX resulting in black boxes by using ARGB32 instead of RG16 for the render texture in DirectX.
|
||||||
|
|
||||||
|
|
||||||
|
## 0.2.0
|
||||||
|
|
||||||
|
### New Parts:
|
||||||
|
|
||||||
|
- CDL-3 Surface Base Decal: A set of conformal decals based on the symbols from the movie Moon (2009) designed by Gavin Rothery
|
||||||
|
- CDL-T Custom Text Decal: A customizable text decal with a variety of fonts
|
||||||
|
|
||||||
|
### Changed:
|
||||||
|
|
||||||
|
- New ModuleConformalText module for customizable text
|
||||||
|
- Text, font, and style can all be customized, as well as text fill and outline colors and widths
|
||||||
|
- Same projection and opacity options as other conformal decals
|
||||||
|
- New StandardText decal shader supporting the text module
|
||||||
|
- Unified all decal shaders into a single "StandardDecal" shader with variants supporting any combination of bump, specular and emissive maps, plus SDF alphas.
|
||||||
|
- Old shaders are remapped to Standard shader plus keywords automatically.
|
||||||
|
- New SDF-based antialiasing for when decals extend to their borders, e.g. on opaque flags.
|
||||||
|
- New "KEYWORD" material modifier, allowing for shader features to be enabled and disabled.
|
||||||
|
- Material modifiers can now be removed in variants by setting `remove = true` inside them.
|
||||||
|
|
||||||
|
### Fixed:
|
||||||
|
|
||||||
|
- Fixed WIDTH and HEIGHT scale modes being flipped
|
||||||
|
- Removed some debug log statements
|
||||||
|
- Dependencies:
|
||||||
|
- Updated ModuleManager to version 4.1.4
|
||||||
|
|
||||||
|
|
||||||
|
## 0.1.4
|
||||||
|
|
||||||
|
Supported KSP versions: 1.8.x to 1.10.x
|
||||||
|
|
||||||
|
### Fixed:
|
||||||
|
|
||||||
|
- Fixed decals rendering onto disabled B9PS part variants
|
||||||
|
- Decals will still not update whan their parent part's B9PS variant is changed, both in flight and in the editor. This is known and awaiting a change to B9PS to be fixed.
|
||||||
|
- Fixed decal bounds rendering as dark cubes when shadowed by EVE clouds.
|
||||||
|
- Fixed decals being shadowed by EVE clouds, causing the part underneath to appear overly dark.
|
||||||
|
|
||||||
|
|
||||||
|
## 0.1.3
|
||||||
|
|
||||||
|
### Fixe:
|
||||||
|
|
||||||
|
- Fixed decals being able to be scaled down to 0
|
||||||
|
|
||||||
|
### Changed:
|
||||||
|
|
||||||
|
- Made decal bounds no longer collide in flight, this is done by repurposing layer 31 (which is configurable in the ConformalDecals.cfg file)
|
||||||
|
- Decals will now be unselectable in flight by default. This can be disabled with the `selectableInFlight` value in ConformalDecals.cfg, or in the module config itself.
|
||||||
|
- Decal parts will now destroy themselves automatically when the parent part is destroyed
|
||||||
|
- Small refactor of node parsing code
|
||||||
|
- Colors can now be specified in hex (#RGB, #RGBA, #RRGGBB, or #RRGGBBAA) or using the colors specified in the XKCDColors class
|
||||||
|
|
||||||
|
|
||||||
|
## 0.1.2
|
||||||
|
|
||||||
|
### Fixed:
|
||||||
|
|
||||||
|
- Disabled writing to the zbuffer in the decal bounds shader. Should fix any issues with Scatterer or EVE.
|
||||||
|
|
||||||
|
|
||||||
|
## 0.1.1
|
||||||
|
|
||||||
|
### Fixed:
|
||||||
|
|
||||||
|
- Fixed flag decal not adjusting to new texture sizes immediately.
|
||||||
|
- Fixed decal bounds being visible on launch.
|
||||||
|
- Fixed decal bounds being visible in the part icon.
|
||||||
|
|
||||||
|
|
||||||
|
## 0.1.0
|
||||||
|
|
||||||
|
Initial release!
|
||||||
|
|
||||||
|
### New Parts:
|
||||||
|
|
||||||
|
- CDL-F Flag Decal: Conformal flag decal, which uses either the mission flag or a flag of your choosing.
|
||||||
|
- CDL-1 Generic Decal: A set of conformal generic decals for planes and rockets
|
||||||
|
- CDL-2 Semiotic Standard Decal: A set of conformal decals based on the Semiotic Standard for All Commercial Trans-Stellar Utility Lifter and Transport Spacecraft designed by Ron Cobb for the movie Alien
|
BIN
GameData/ConformalDecals/Assets/paper.dds
Normal file
@ -52,7 +52,7 @@ PART
|
|||||||
name = ModuleConformalText
|
name = ModuleConformalText
|
||||||
|
|
||||||
text = Text
|
text = Text
|
||||||
font = Calibri SDF
|
fontName = Calibri SDF
|
||||||
fillColor = #000000FF
|
fillColor = #000000FF
|
||||||
outlineColor = #FFFFFFFF
|
outlineColor = #FFFFFFFF
|
||||||
fillEnabled = true
|
fillEnabled = true
|
||||||
@ -62,6 +62,7 @@ PART
|
|||||||
useBaseNormal = true
|
useBaseNormal = true
|
||||||
scaleMode = MINIMUM
|
scaleMode = MINIMUM
|
||||||
|
|
||||||
|
defaultScale = 0.2
|
||||||
defaultDepth = 0.2
|
defaultDepth = 0.2
|
||||||
defaultCutoff = 0.5
|
defaultCutoff = 0.5
|
||||||
}
|
}
|
||||||
|
7
GameData/ConformalDecals/Patches/Waterfall.cfg
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
// Prevent projection onto Waterfall plumes
|
||||||
|
|
||||||
|
CONFORMALDECALS:NEEDS[Waterfall] {
|
||||||
|
SHADERBLACKLIST {
|
||||||
|
shaderRegex = Waterfall/.*
|
||||||
|
}
|
||||||
|
}
|
@ -4,21 +4,13 @@ CONFORMALDECALS {
|
|||||||
|
|
||||||
SHADERBLACKLIST {
|
SHADERBLACKLIST {
|
||||||
shader = DepthMask
|
shader = DepthMask
|
||||||
shader = KSP/Alpha/Cutoff
|
|
||||||
shader = KSP/Alpha/Cutoff Bumped
|
|
||||||
shader = KSP/Alpha/Translucent
|
|
||||||
shader = KSP/Alpha/Translucent Additive
|
|
||||||
shader = KSP/Alpha/Translucent Specular
|
|
||||||
shader = KSP/Alpha/Unlit Transparent
|
|
||||||
shader = KSP/Bumped Specular (Transparent)
|
shader = KSP/Bumped Specular (Transparent)
|
||||||
shader = KSP/FX/ScrollingUnlit
|
shader = KSP/FX/ScrollingUnlit
|
||||||
shader = KSP/Particles/Additive
|
|
||||||
shader = KSP/Particles/Additive (Soft)
|
|
||||||
shader = KSP/Particles/Alpha Blended
|
|
||||||
shader = KSP/Particles/Alpha Blended Emissive Cutout
|
|
||||||
shader = KSP/Specular (Cutoff)
|
shader = KSP/Specular (Cutoff)
|
||||||
shader = KSP/Specular (Transparent)
|
shader = KSP/Specular (Transparent)
|
||||||
shader = Solid Color (Alpha)
|
shader = Solid Color (Alpha)
|
||||||
|
shaderRegex = KSP/Alpha/.*
|
||||||
|
shaderRegex = KSP/Particles/.*
|
||||||
}
|
}
|
||||||
|
|
||||||
FONT {
|
FONT {
|
||||||
@ -57,4 +49,309 @@ CONFORMALDECALS {
|
|||||||
style = 32
|
style = 32
|
||||||
styleMask = 4
|
styleMask = 4
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ASPECTRATIO {
|
||||||
|
path = Squad/Flags/09
|
||||||
|
aspectRatio = 0.625
|
||||||
|
}
|
||||||
|
|
||||||
|
ASPECTRATIO {
|
||||||
|
path = Squad/Flags/Sentinel_Flag
|
||||||
|
aspectRatio = 0.625
|
||||||
|
}
|
||||||
|
|
||||||
|
ASPECTRATIO {
|
||||||
|
path = Squad/Flags/blorbs
|
||||||
|
aspectRatio = 0.625
|
||||||
|
}
|
||||||
|
|
||||||
|
ASPECTRATIO {
|
||||||
|
path = Squad/Flags/bullseye
|
||||||
|
aspectRatio = 0.625
|
||||||
|
}
|
||||||
|
|
||||||
|
ASPECTRATIO {
|
||||||
|
path = Squad/Flags/capsule
|
||||||
|
aspectRatio = 0.625
|
||||||
|
}
|
||||||
|
|
||||||
|
ASPECTRATIO {
|
||||||
|
path = Squad/Flags/circles
|
||||||
|
aspectRatio = 0.625
|
||||||
|
}
|
||||||
|
|
||||||
|
ASPECTRATIO {
|
||||||
|
path = Squad/Flags/default
|
||||||
|
aspectRatio = 0.625
|
||||||
|
}
|
||||||
|
|
||||||
|
ASPECTRATIO {
|
||||||
|
path = Squad/Flags/hexagon
|
||||||
|
aspectRatio = 0.625
|
||||||
|
}
|
||||||
|
|
||||||
|
ASPECTRATIO {
|
||||||
|
path = Squad/Flags/hexagonCircles
|
||||||
|
aspectRatio = 0.625
|
||||||
|
}
|
||||||
|
|
||||||
|
ASPECTRATIO {
|
||||||
|
path = Squad/Flags/kerbal1
|
||||||
|
aspectRatio = 0.625
|
||||||
|
}
|
||||||
|
|
||||||
|
ASPECTRATIO {
|
||||||
|
path = Squad/Flags/kerbal2
|
||||||
|
aspectRatio = 0.625
|
||||||
|
}
|
||||||
|
|
||||||
|
ASPECTRATIO {
|
||||||
|
path = Squad/Flags/kerbin
|
||||||
|
aspectRatio = 0.625
|
||||||
|
}
|
||||||
|
|
||||||
|
ASPECTRATIO {
|
||||||
|
path = Squad/Flags/kerbinmunflag
|
||||||
|
aspectRatio = 0.625
|
||||||
|
}
|
||||||
|
|
||||||
|
ASPECTRATIO {
|
||||||
|
path = Squad/Flags/line
|
||||||
|
aspectRatio = 0.625
|
||||||
|
}
|
||||||
|
|
||||||
|
ASPECTRATIO {
|
||||||
|
path = Squad/Flags/minimalistic
|
||||||
|
aspectRatio = 0.625
|
||||||
|
}
|
||||||
|
|
||||||
|
ASPECTRATIO {
|
||||||
|
path = Squad/Flags/orbit
|
||||||
|
aspectRatio = 0.625
|
||||||
|
}
|
||||||
|
|
||||||
|
ASPECTRATIO {
|
||||||
|
path = Squad/Flags/orbs
|
||||||
|
aspectRatio = 0.625
|
||||||
|
}
|
||||||
|
|
||||||
|
ASPECTRATIO {
|
||||||
|
path = Squad/Flags/retro
|
||||||
|
aspectRatio = 0.625
|
||||||
|
}
|
||||||
|
|
||||||
|
ASPECTRATIO {
|
||||||
|
path = Squad/Flags/rings
|
||||||
|
aspectRatio = 0.625
|
||||||
|
}
|
||||||
|
|
||||||
|
ASPECTRATIO {
|
||||||
|
path = Squad/Flags/rocketScience
|
||||||
|
aspectRatio = 0.625
|
||||||
|
}
|
||||||
|
|
||||||
|
ASPECTRATIO {
|
||||||
|
path = Squad/Flags/satellite
|
||||||
|
aspectRatio = 0.625
|
||||||
|
}
|
||||||
|
|
||||||
|
ASPECTRATIO {
|
||||||
|
path = Squad/Flags/spheres
|
||||||
|
aspectRatio = 0.625
|
||||||
|
}
|
||||||
|
|
||||||
|
ASPECTRATIO {
|
||||||
|
path = Squad/Flags/squadLogo
|
||||||
|
aspectRatio = 0.625
|
||||||
|
}
|
||||||
|
|
||||||
|
ASPECTRATIO {
|
||||||
|
path = Squad/Flags/squadLogo2
|
||||||
|
aspectRatio = 0.625
|
||||||
|
}
|
||||||
|
|
||||||
|
ASPECTRATIO {
|
||||||
|
path = Squad/Flags/stripes
|
||||||
|
aspectRatio = 0.625
|
||||||
|
}
|
||||||
|
|
||||||
|
ASPECTRATIO {
|
||||||
|
path = Squad/Flags/trees
|
||||||
|
aspectRatio = 0.625
|
||||||
|
}
|
||||||
|
|
||||||
|
ASPECTRATIO {
|
||||||
|
path = Squad/Flags/trippy
|
||||||
|
aspectRatio = 0.625
|
||||||
|
}
|
||||||
|
|
||||||
|
ASPECTRATIO {
|
||||||
|
path = Squad/FlagsAgency/NASA
|
||||||
|
aspectRatio = 0.625
|
||||||
|
}
|
||||||
|
|
||||||
|
ASPECTRATIO {
|
||||||
|
path = Squad/FlagsAgency/esa_dark_blue
|
||||||
|
aspectRatio = 0.625
|
||||||
|
}
|
||||||
|
|
||||||
|
ASPECTRATIO {
|
||||||
|
path = Squad/FlagsAgency/uk_space_agency
|
||||||
|
aspectRatio = 0.625
|
||||||
|
}
|
||||||
|
|
||||||
|
ASPECTRATIO {
|
||||||
|
path = Squad/FlagsOrganization/B612_Foundation_flag
|
||||||
|
aspectRatio = 0.625
|
||||||
|
}
|
||||||
|
|
||||||
|
ASPECTRATIO {
|
||||||
|
path = Squad/FlagsOrganization/ESA_Arianespace
|
||||||
|
aspectRatio = 0.625
|
||||||
|
}
|
||||||
|
|
||||||
|
ASPECTRATIO {
|
||||||
|
path = Squad/FlagsOrganization/electron
|
||||||
|
aspectRatio = 0.625
|
||||||
|
}
|
||||||
|
|
||||||
|
ASPECTRATIO {
|
||||||
|
path = Squad/FlagsOrganization/rocketlab
|
||||||
|
aspectRatio = 0.625
|
||||||
|
}
|
||||||
|
|
||||||
|
ASPECTRATIO {
|
||||||
|
path = Squad/Agencies/C7AerospaceDivision
|
||||||
|
aspectRatio = 0.625
|
||||||
|
}
|
||||||
|
|
||||||
|
ASPECTRATIO {
|
||||||
|
path = Squad/Agencies/DinkelsteinKermansConstructionEmporium
|
||||||
|
aspectRatio = 0.625
|
||||||
|
}
|
||||||
|
|
||||||
|
ASPECTRATIO {
|
||||||
|
path = Squad/Agencies/ExperimentalEngineering
|
||||||
|
aspectRatio = 0.625
|
||||||
|
}
|
||||||
|
|
||||||
|
ASPECTRATIO {
|
||||||
|
path = Squad/Agencies/FlooydResearchLab
|
||||||
|
aspectRatio = 0.625
|
||||||
|
}
|
||||||
|
|
||||||
|
ASPECTRATIO {
|
||||||
|
path = Squad/Agencies/GoliathNationalProducts
|
||||||
|
aspectRatio = 0.625
|
||||||
|
}
|
||||||
|
|
||||||
|
ASPECTRATIO {
|
||||||
|
path = Squad/Agencies/IntegratedIntegrals
|
||||||
|
aspectRatio = 0.625
|
||||||
|
}
|
||||||
|
|
||||||
|
ASPECTRATIO {
|
||||||
|
path = Squad/Agencies/IonicSymphonicProtonicElectronics
|
||||||
|
aspectRatio = 0.625
|
||||||
|
}
|
||||||
|
|
||||||
|
ASPECTRATIO {
|
||||||
|
path = Squad/Agencies/JebsJunkyard
|
||||||
|
aspectRatio = 0.625
|
||||||
|
}
|
||||||
|
|
||||||
|
ASPECTRATIO {
|
||||||
|
path = Squad/Agencies/KerbalMotion
|
||||||
|
aspectRatio = 0.625
|
||||||
|
}
|
||||||
|
|
||||||
|
ASPECTRATIO {
|
||||||
|
path = Squad/Agencies/KerbinWorldFirstRecordKeepingSociety
|
||||||
|
aspectRatio = 0.625
|
||||||
|
}
|
||||||
|
|
||||||
|
ASPECTRATIO {
|
||||||
|
path = Squad/Agencies/Kerbodyne
|
||||||
|
aspectRatio = 0.625
|
||||||
|
}
|
||||||
|
|
||||||
|
ASPECTRATIO {
|
||||||
|
path = Squad/Agencies/Kerlington
|
||||||
|
aspectRatio = 0.625
|
||||||
|
}
|
||||||
|
|
||||||
|
ASPECTRATIO {
|
||||||
|
path = Squad/Agencies/MaxoConstructionToys
|
||||||
|
aspectRatio = 0.625
|
||||||
|
}
|
||||||
|
|
||||||
|
ASPECTRATIO {
|
||||||
|
path = Squad/Agencies/MovingPartsExpertsGroup
|
||||||
|
aspectRatio = 0.625
|
||||||
|
}
|
||||||
|
|
||||||
|
ASPECTRATIO {
|
||||||
|
path = Squad/Agencies/OMBDemolition
|
||||||
|
aspectRatio = 0.625
|
||||||
|
}
|
||||||
|
|
||||||
|
ASPECTRATIO {
|
||||||
|
path = Squad/Agencies/PeriapsisCo
|
||||||
|
aspectRatio = 0.625
|
||||||
|
}
|
||||||
|
|
||||||
|
ASPECTRATIO {
|
||||||
|
path = Squad/Agencies/Probodobodyne
|
||||||
|
aspectRatio = 0.625
|
||||||
|
}
|
||||||
|
|
||||||
|
ASPECTRATIO {
|
||||||
|
path = Squad/Agencies/R&D
|
||||||
|
aspectRatio = 0.625
|
||||||
|
}
|
||||||
|
|
||||||
|
ASPECTRATIO {
|
||||||
|
path = Squad/Agencies/ReactionSystemsLtd
|
||||||
|
aspectRatio = 0.625
|
||||||
|
}
|
||||||
|
|
||||||
|
ASPECTRATIO {
|
||||||
|
path = Squad/Agencies/Rockomax
|
||||||
|
aspectRatio = 0.625
|
||||||
|
}
|
||||||
|
|
||||||
|
ASPECTRATIO {
|
||||||
|
path = Squad/Agencies/Rokea
|
||||||
|
aspectRatio = 0.625
|
||||||
|
}
|
||||||
|
|
||||||
|
ASPECTRATIO {
|
||||||
|
path = Squad/Agencies/SeansCannery
|
||||||
|
aspectRatio = 0.625
|
||||||
|
}
|
||||||
|
|
||||||
|
ASPECTRATIO {
|
||||||
|
path = Squad/Agencies/SteadlerEngineeringCorps
|
||||||
|
aspectRatio = 0.625
|
||||||
|
}
|
||||||
|
|
||||||
|
ASPECTRATIO {
|
||||||
|
path = Squad/Agencies/StrutCo
|
||||||
|
aspectRatio = 0.625
|
||||||
|
}
|
||||||
|
|
||||||
|
ASPECTRATIO {
|
||||||
|
path = Squad/Agencies/Vac-Co
|
||||||
|
aspectRatio = 0.625
|
||||||
|
}
|
||||||
|
|
||||||
|
ASPECTRATIO {
|
||||||
|
path = Squad/Agencies/WinterOwl
|
||||||
|
aspectRatio = 0.625
|
||||||
|
}
|
||||||
|
|
||||||
|
ASPECTRATIO {
|
||||||
|
path = Squad/Agencies/ZaltonicElectronics
|
||||||
|
aspectRatio = 0.625
|
||||||
|
}
|
||||||
}
|
}
|
@ -1,28 +1,24 @@
|
|||||||
{
|
{
|
||||||
"NAME":"ConformalDecals",
|
"NAME": "ConformalDecals",
|
||||||
"URL":"https://raw.githubusercontent.com/drewcassidy/KSP-Conformal-Decals/release/GameData/ConformalDecals/Versioning/ConformalDecals.version",
|
"URL": "https://github.com/drewcassidy/KSP-Conformal-Decals/releases/latest/download/ConformalDecals.version",
|
||||||
"DOWNLOAD":"https://github.com/drewcassidy/KSP-Conformal-Decals/releases",
|
"DOWNLOAD": "https://github.com/drewcassidy/KSP-Conformal-Decals/releases/latest",
|
||||||
"VERSION":
|
"CHANGE_LOG_URL": "https://raw.githubusercontent.com/drewcassidy/KSP-Conformal-Decals/release/CHANGELOG.md",
|
||||||
{
|
"VERSION": {
|
||||||
"MAJOR":0,
|
"MAJOR": 9,
|
||||||
"MINOR":2,
|
"MINOR": 9,
|
||||||
"PATCH":3,
|
"PATCH": 9,
|
||||||
"BUILD":0
|
"BUILD": 100000
|
||||||
},
|
},
|
||||||
"KSP_VERSION":
|
"KSP_VERSION": {
|
||||||
{
|
"MAJOR": 1,
|
||||||
"MAJOR":1,
|
"MINOR": 12
|
||||||
"MINOR":10,
|
|
||||||
"PATCH":1
|
|
||||||
},
|
},
|
||||||
"KSP_VERSION_MIN":{
|
"KSP_VERSION_MIN": {
|
||||||
"MAJOR":1,
|
"MAJOR": 1,
|
||||||
"MINOR":8,
|
"MINOR": 8
|
||||||
"PATCH":0
|
|
||||||
},
|
},
|
||||||
"KSP_VERSION_MAX":{
|
"KSP_VERSION_MAX": {
|
||||||
"MAJOR":1,
|
"MAJOR": 1,
|
||||||
"MINOR":10,
|
"MINOR": 12
|
||||||
"PATCH":99
|
|
||||||
}
|
}
|
||||||
}
|
}
|
11
README.md
@ -1,5 +1,5 @@
|
|||||||
# Conformal Decals v0.2.3
|
# Conformal Decals
|
||||||
[](https://travis-ci.org/drewcassidy/KSP-Conformal-Decals) [](https://creativecommons.org/licenses/by-sa/4.0/) [](https://www.gnu.org/licenses/gpl-3.0)
|
[](https://creativecommons.org/licenses/by-sa/4.0/) [](https://www.gnu.org/licenses/gpl-3.0) [](https://github.com/KSP-CKAN/CKAN)
|
||||||
|
|
||||||

|

|
||||||
|
|
||||||
@ -8,10 +8,11 @@ Conformal Decals adds a set of decal stickers to KSP, as well as providing a fra
|
|||||||
## Dependencies
|
## Dependencies
|
||||||
|
|
||||||
Required:
|
Required:
|
||||||
- KSP (1.8.x to 1.10.x)
|
- KSP (1.8.x to 1.12.x)
|
||||||
- B9 Part Switch (2.16.0). Bundled with release.
|
- B9 Part Switch (2.18.0). Bundled with release.
|
||||||
- ModuleManager (4.1.4). Bundled with release.
|
- ModuleManager (4.1.4). Bundled with release.
|
||||||
- Shabby (0.1.2). Bundled with release.
|
- Shabby (0.2.0 unofficial build). Bundled with release.
|
||||||
|
- HarmonyKSP (2.0.4.0). Bundled with release.
|
||||||
|
|
||||||
Optional:
|
Optional:
|
||||||
- Wild Blue Tools. For custom decals category in the VAB and SPH.
|
- Wild Blue Tools. For custom decals category in the VAB and SPH.
|
||||||
|
61
Scripts/version.py
Normal file
@ -0,0 +1,61 @@
|
|||||||
|
import yaclog
|
||||||
|
import yaclog.version
|
||||||
|
import git as gp
|
||||||
|
import os
|
||||||
|
import xml.dom.minidom as minidom
|
||||||
|
import json
|
||||||
|
|
||||||
|
|
||||||
|
def run():
|
||||||
|
repo = gp.Repo(os.curdir)
|
||||||
|
cl = yaclog.Changelog('CHANGELOG.md')
|
||||||
|
version = str(cl.current_version(released=True).version)
|
||||||
|
release = False
|
||||||
|
|
||||||
|
for tag in repo.tags:
|
||||||
|
if tag.commit == repo.head.commit:
|
||||||
|
release = True
|
||||||
|
build = 100000
|
||||||
|
break
|
||||||
|
|
||||||
|
if not release:
|
||||||
|
build = int.from_bytes(repo.head.commit.binsha[0:2], byteorder='big')
|
||||||
|
version = yaclog.version.increment_version(version, 2)
|
||||||
|
|
||||||
|
print(f'Setting up version {version} build {build}')
|
||||||
|
|
||||||
|
version_path = 'GameData/ConformalDecals/Versioning/ConformalDecals.version'
|
||||||
|
with open(version_path, 'r+') as version_file:
|
||||||
|
print('Updating version file')
|
||||||
|
segments = version.split('.')
|
||||||
|
# print(version_file.read())
|
||||||
|
decoded = json.load(version_file)
|
||||||
|
decoded['VERSION']['MAJOR'] = int(segments[0])
|
||||||
|
decoded['VERSION']['MINOR'] = int(segments[1])
|
||||||
|
decoded['VERSION']['PATCH'] = int(segments[2])
|
||||||
|
decoded['VERSION']['BUILD'] = build
|
||||||
|
|
||||||
|
version_file.seek(0)
|
||||||
|
json.dump(decoded, version_file, indent=4)
|
||||||
|
version_file.truncate()
|
||||||
|
|
||||||
|
project_path = 'Source/ConformalDecals/ConformalDecals.csproj'
|
||||||
|
with open(project_path, 'r+') as project_file:
|
||||||
|
print('Updating csproj file')
|
||||||
|
segments = version.split('.')
|
||||||
|
decoded = minidom.parse(project_file)
|
||||||
|
version_node = decoded.getElementsByTagName('AssemblyVersion')[0]
|
||||||
|
if release:
|
||||||
|
version_node.firstChild.nodeValue = f'{version}'
|
||||||
|
else:
|
||||||
|
version_node.firstChild.nodeValue = f'{version}.{build}'
|
||||||
|
# version_node.value = f'{version}.{build}'
|
||||||
|
project_file.seek(0)
|
||||||
|
decoded.writexml(project_file)
|
||||||
|
project_file.truncate()
|
||||||
|
|
||||||
|
print('Done!')
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == '__main__':
|
||||||
|
run()
|
@ -1,6 +1,6 @@
|
|||||||
|
|
||||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConformalDecals", "ConformalDecals/ConformalDecals.csproj", "{1ea983f9-42e5-494e-9683-fdac9c9121f4}"
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConformalDecals", "ConformalDecals/ConformalDecals.csproj", "{1EA983F9-42E5-494E-9683-FDAC9C9121F4}"
|
||||||
EndProject
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
@ -8,9 +8,9 @@ Global
|
|||||||
Release|Any CPU = Release|Any CPU
|
Release|Any CPU = Release|Any CPU
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||||
{1ea983f9-42e5-494e-9683-fdac9c9121f4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{1EA983F9-42E5-494E-9683-FDAC9C9121F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{1ea983f9-42e5-494e-9683-fdac9c9121f4}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{1EA983F9-42E5-494E-9683-FDAC9C9121F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{1ea983f9-42e5-494e-9683-fdac9c9121f4}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{1EA983F9-42E5-494E-9683-FDAC9C9121F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{1ea983f9-42e5-494e-9683-fdac9c9121f4}.Release|Any CPU.Build.0 = Release|Any CPU
|
{1EA983F9-42E5-494E-9683-FDAC9C9121F4}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
EndGlobal
|
EndGlobal
|
||||||
|
@ -1,115 +1,61 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" ?><Project Sdk="Microsoft.NET.Sdk">
|
||||||
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<Import Project="$(MSBuildExtensionsPath)/$(MSBuildToolsVersion)/Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)/$(MSBuildToolsVersion)/Microsoft.Common.props')" />
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
<TargetFramework>net48</TargetFramework>
|
||||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
|
||||||
<ProjectGuid>{1ea983f9-42e5-494e-9683-fdac9c9121f4}</ProjectGuid>
|
|
||||||
<OutputType>Library</OutputType>
|
|
||||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
|
||||||
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
|
|
||||||
<FileAlignment>512</FileAlignment>
|
|
||||||
<Deterministic>true</Deterministic>
|
|
||||||
<LangVersion>8</LangVersion>
|
<LangVersion>8</LangVersion>
|
||||||
<RootNamespace>ConformalDecals</RootNamespace>
|
<IsPackable>false</IsPackable>
|
||||||
|
<PlatformTarget>x64</PlatformTarget>
|
||||||
|
<NoWarn>1701;1702;CS0649;CS1591</NoWarn>
|
||||||
|
<AssemblyVersion>9.9.9</AssemblyVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||||
<DebugSymbols>true</DebugSymbols>
|
<DefineConstants>DEBUG;TRACE;ENABLE_PROFILER</DefineConstants>
|
||||||
<DebugType>full</DebugType>
|
<DebugType>portable</DebugType>
|
||||||
<Optimize>false</Optimize>
|
|
||||||
<OutputPath>bin/Debug/</OutputPath>
|
|
||||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
|
||||||
<ErrorReport>prompt</ErrorReport>
|
|
||||||
<WarningLevel>4</WarningLevel>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
|
||||||
<DebugType>pdbonly</DebugType>
|
|
||||||
<Optimize>true</Optimize>
|
|
||||||
<OutputPath>bin/Release/</OutputPath>
|
|
||||||
<DefineConstants>TRACE</DefineConstants>
|
|
||||||
<ErrorReport>prompt</ErrorReport>
|
|
||||||
<WarningLevel>4</WarningLevel>
|
|
||||||
<DocumentationFile>bin/Release/ConformalDecals.xml</DocumentationFile>
|
|
||||||
<NoWarn>CS1591,CS0649</NoWarn>
|
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
|
<Reference Include="Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
|
||||||
<HintPath>dlls/Assembly-CSharp.dll</HintPath>
|
<HintPath>dlls\Assembly-CSharp.dll</HintPath>
|
||||||
</Reference>
|
|
||||||
<Reference Include="KSPAssets, Version=1.4.0.0, Culture=neutral, PublicKeyToken=null">
|
|
||||||
<HintPath>dlls\KSPAssets.dll</HintPath>
|
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Shabby, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
|
<Reference Include="Shabby, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
|
||||||
<HintPath>dlls/Shabby.dll</HintPath>
|
<HintPath>dlls\Shabby.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="System" />
|
|
||||||
<Reference Include="UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
|
<Reference Include="UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
|
||||||
<HintPath>dlls/UnityEngine.dll</HintPath>
|
<HintPath>dlls\UnityEngine.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="UnityEngine.AssetBundleModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
|
<Reference Include="UnityEngine.AssetBundleModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
|
||||||
<HintPath>dlls/UnityEngine.AssetBundleModule.dll</HintPath>
|
<HintPath>dlls\UnityEngine.AssetBundleModule.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
|
<Reference Include="UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
|
||||||
<HintPath>dlls/UnityEngine.CoreModule.dll</HintPath>
|
<HintPath>dlls\UnityEngine.CoreModule.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="UnityEngine.PhysicsModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
|
<Reference Include="UnityEngine.PhysicsModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
|
||||||
<HintPath>dlls/UnityEngine.PhysicsModule.dll</HintPath>
|
<HintPath>dlls\UnityEngine.PhysicsModule.dll</HintPath>
|
||||||
</Reference>
|
|
||||||
<Reference Include="UnityEngine.TextCoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
|
|
||||||
<HintPath>dlls/UnityEngine.TextCoreModule.dll</HintPath>
|
|
||||||
</Reference>
|
|
||||||
<Reference Include="UnityEngine.TextRenderingModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
|
|
||||||
<HintPath>dlls/UnityEngine.TextRenderingModule.dll</HintPath>
|
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
|
<Reference Include="UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
|
||||||
<HintPath>dlls/UnityEngine.UI.dll</HintPath>
|
<HintPath>dlls\UnityEngine.UI.dll</HintPath>
|
||||||
</Reference>
|
|
||||||
<Reference Include="UnityEngine.UIElementsModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
|
|
||||||
<HintPath>dlls/UnityEngine.UIElementsModule.dll</HintPath>
|
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="UnityEngine.UIModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
|
<Reference Include="UnityEngine.UIModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
|
||||||
<HintPath>dlls/UnityEngine.UIModule.dll</HintPath>
|
<HintPath>dlls\UnityEngine.UIModule.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Compile Include="DecalConfig.cs" />
|
<Compile Remove="dlls\**"/>
|
||||||
<Compile Include="DecalIconFixer.cs" />
|
|
||||||
<Compile Include="DecalPropertyIDs.cs" />
|
|
||||||
<Compile Include="MaterialProperties/MaterialColorProperty.cs" />
|
|
||||||
<Compile Include="MaterialProperties/MaterialFloatProperty.cs" />
|
|
||||||
<Compile Include="MaterialProperties/MaterialKeywordProperty.cs" />
|
|
||||||
<Compile Include="MaterialProperties/MaterialProperty.cs" />
|
|
||||||
<Compile Include="MaterialProperties/MaterialPropertyCollection.cs" />
|
|
||||||
<Compile Include="MaterialProperties/MaterialTextureProperty.cs" />
|
|
||||||
<Compile Include="ModuleConformalFlag.cs" />
|
|
||||||
<Compile Include="ModuleConformalText.cs" />
|
|
||||||
<Compile Include="ProjectionTarget.cs" />
|
|
||||||
<Compile Include="ModuleConformalDecal.cs" />
|
|
||||||
<Compile Include="Properties/AssemblyInfo.cs" />
|
|
||||||
<Compile Include="Text/DecalFont.cs" />
|
|
||||||
<Compile Include="Text/FontLoader.cs" />
|
|
||||||
<Compile Include="Text/TextRenderer.cs" />
|
|
||||||
<Compile Include="Text/DecalText.cs" />
|
|
||||||
<Compile Include="Text\TextRenderOutput.cs" />
|
|
||||||
<Compile Include="Text\TextRenderJob.cs" />
|
|
||||||
<Compile Include="UI/ColorPickerController.cs" />
|
|
||||||
<Compile Include="UI/FontMenuController.cs" />
|
|
||||||
<Compile Include="UI/FontMenuItem.cs" />
|
|
||||||
<Compile Include="UI/TextEntryController.cs" />
|
|
||||||
<Compile Include="UI/UILoader.cs" />
|
|
||||||
<Compile Include="UI/UITag.cs" />
|
|
||||||
<Compile Include="UI\ColorBoxSlider.cs" />
|
|
||||||
<Compile Include="UI\ColorChannelSlider.cs" />
|
|
||||||
<Compile Include="Util/Logging.cs" />
|
|
||||||
<Compile Include="Util/OrientedBounds.cs" />
|
|
||||||
<Compile Include="Util/ParseUtil.cs" />
|
|
||||||
<Compile Include="UI/BoxSlider.cs" />
|
|
||||||
<Compile Include="Util\ColorHSL.cs" />
|
|
||||||
<Compile Include="Util\ColorHSV.cs" />
|
|
||||||
<Compile Include="Util\ColorUtil.cs" />
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<Import Project="$(MSBuildToolsPath)/Microsoft.CSharp.targets" />
|
|
||||||
<PropertyGroup>
|
<ItemGroup>
|
||||||
<PostBuildEvent>sh -e -c "cp -v '$(TargetPath)' '$(SolutionDir)/../GameData/ConformalDecals/Plugins'"</PostBuildEvent>
|
<EmbeddedResource Remove="dlls\**"/>
|
||||||
</PropertyGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<None Remove="dlls\**"/>
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
|
||||||
|
<Exec Command="/bin/cp -v '$(OutDir)ConformalDecals.dll' '$(SolutionDir)../GameData/ConformalDecals/Plugins/ConformalDecals.dll'" IgnoreExitCode="true"/>
|
||||||
|
<Exec Command="/bin/cp -v '$(OutDir)ConformalDecals.pdb' '$(SolutionDir)../GameData/ConformalDecals/Plugins/ConformalDecals.pdb'" IgnoreExitCode="true"/>
|
||||||
|
<!--Fuck you MSBuild stop trying to run CMD.exe on macOS-->
|
||||||
|
</Target>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
@ -1,5 +1,6 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System.Text.RegularExpressions;
|
||||||
using ConformalDecals.Text;
|
using ConformalDecals.Text;
|
||||||
using ConformalDecals.Util;
|
using ConformalDecals.Util;
|
||||||
using TMPro;
|
using TMPro;
|
||||||
@ -10,9 +11,11 @@ namespace ConformalDecals {
|
|||||||
public static class DecalConfig {
|
public static class DecalConfig {
|
||||||
private static Texture2D _blankNormal;
|
private static Texture2D _blankNormal;
|
||||||
private static List<string> _shaderBlacklist;
|
private static List<string> _shaderBlacklist;
|
||||||
|
private static List<Regex> _shaderRegexBlacklist;
|
||||||
private static Dictionary<string, DecalFont> _fontList;
|
private static Dictionary<string, DecalFont> _fontList;
|
||||||
private static int _decalLayer = 31;
|
private static int _decalLayer = 31;
|
||||||
private static bool _selectableInFlight;
|
private static bool _selectableInFlight;
|
||||||
|
private static Dictionary<string, float> _aspectRatios;
|
||||||
|
|
||||||
private struct LegacyShaderEntry {
|
private struct LegacyShaderEntry {
|
||||||
public string name;
|
public string name;
|
||||||
@ -51,14 +54,24 @@ namespace ConformalDecals {
|
|||||||
|
|
||||||
public static IEnumerable<DecalFont> Fonts => _fontList.Values;
|
public static IEnumerable<DecalFont> Fonts => _fontList.Values;
|
||||||
|
|
||||||
public static DecalFont FallbackFont { get; private set; }
|
public static Dictionary<string, float> AspectRatios => _aspectRatios;
|
||||||
|
|
||||||
public static bool IsBlacklisted(Shader shader) {
|
public static bool IsBlacklisted(Shader shader) {
|
||||||
return IsBlacklisted(shader.name);
|
return IsBlacklisted(shader.name);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static bool IsBlacklisted(string shaderName) {
|
public static bool IsBlacklisted(string shaderName) {
|
||||||
return _shaderBlacklist.Contains(shaderName);
|
if (_shaderBlacklist.Contains(shaderName)) return true;
|
||||||
|
|
||||||
|
foreach (var regex in _shaderRegexBlacklist) {
|
||||||
|
if (regex.IsMatch(shaderName)) {
|
||||||
|
_shaderBlacklist.Add(shaderName);
|
||||||
|
Logging.Log($"Caching blacklisted shader name '{shaderName}' which matches '{regex}'");
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static bool IsLegacy(string shaderName, out string newShader, out string[] keywords) {
|
public static bool IsLegacy(string shaderName, out string newShader, out string[] keywords) {
|
||||||
@ -76,8 +89,7 @@ namespace ConformalDecals {
|
|||||||
public static DecalFont GetFont(string name) {
|
public static DecalFont GetFont(string name) {
|
||||||
if (_fontList.TryGetValue(name, out var font)) {
|
if (_fontList.TryGetValue(name, out var font)) {
|
||||||
return font;
|
return font;
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
throw new KeyNotFoundException($"Font {name} not found");
|
throw new KeyNotFoundException($"Font {name} not found");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -91,6 +103,10 @@ namespace ConformalDecals {
|
|||||||
foreach (var shaderName in blacklist.GetValuesList("shader")) {
|
foreach (var shaderName in blacklist.GetValuesList("shader")) {
|
||||||
_shaderBlacklist.Add(shaderName);
|
_shaderBlacklist.Add(shaderName);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
foreach (var shaderRegex in blacklist.GetValuesList("shaderRegex")) {
|
||||||
|
_shaderRegexBlacklist.Add(new Regex(shaderRegex));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
var allFonts = Resources.FindObjectsOfTypeAll<TMP_FontAsset>();
|
var allFonts = Resources.FindObjectsOfTypeAll<TMP_FontAsset>();
|
||||||
@ -99,8 +115,17 @@ namespace ConformalDecals {
|
|||||||
try {
|
try {
|
||||||
var font = new DecalFont(fontNode, allFonts);
|
var font = new DecalFont(fontNode, allFonts);
|
||||||
_fontList.Add(font.Name, font);
|
_fontList.Add(font.Name, font);
|
||||||
|
} catch (Exception e) {
|
||||||
|
Debug.LogException(e);
|
||||||
}
|
}
|
||||||
catch (Exception e) {
|
}
|
||||||
|
|
||||||
|
foreach (var ratioNode in node.GetNodes("ASPECTRATIO")) {
|
||||||
|
try {
|
||||||
|
var path = ParseUtil.ParseString(ratioNode, "path");
|
||||||
|
var ratio = ParseUtil.ParseFloat(ratioNode, "aspectRatio");
|
||||||
|
_aspectRatios[path] = ratio;
|
||||||
|
} catch (Exception e) {
|
||||||
Debug.LogException(e);
|
Debug.LogException(e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -128,13 +153,15 @@ namespace ConformalDecals {
|
|||||||
// ReSharper disable once UnusedMember.Global
|
// ReSharper disable once UnusedMember.Global
|
||||||
public static void ModuleManagerPostLoad() {
|
public static void ModuleManagerPostLoad() {
|
||||||
_shaderBlacklist = new List<string>();
|
_shaderBlacklist = new List<string>();
|
||||||
|
_shaderRegexBlacklist = new List<Regex>();
|
||||||
_fontList = new Dictionary<string, DecalFont>();
|
_fontList = new Dictionary<string, DecalFont>();
|
||||||
|
_aspectRatios = new Dictionary<string, float>();
|
||||||
|
|
||||||
var configs = GameDatabase.Instance.GetConfigs("CONFORMALDECALS");
|
var configs = GameDatabase.Instance.GetConfigs("CONFORMALDECALS");
|
||||||
|
|
||||||
if (configs.Length > 0) {
|
if (configs.Length > 0) {
|
||||||
Logging.Log("loading config");
|
|
||||||
foreach (var config in configs) {
|
foreach (var config in configs) {
|
||||||
|
Logging.Log($"loading config node '{config.url}'");
|
||||||
ParseConfig(config.config);
|
ParseConfig(config.config);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -45,6 +45,7 @@ namespace ConformalDecals.MaterialProperties {
|
|||||||
_decalMaterial.SetInt(DecalPropertyIDs._Cull, (int) CullMode.Off);
|
_decalMaterial.SetInt(DecalPropertyIDs._Cull, (int) CullMode.Off);
|
||||||
_decalMaterial.SetInt(DecalPropertyIDs._ZWrite, 0);
|
_decalMaterial.SetInt(DecalPropertyIDs._ZWrite, 0);
|
||||||
_decalMaterial.renderQueue = RenderQueue;
|
_decalMaterial.renderQueue = RenderQueue;
|
||||||
|
_decalMaterial.SetShaderPassEnabled("SHADOWCASTER", false);
|
||||||
}
|
}
|
||||||
|
|
||||||
return _decalMaterial;
|
return _decalMaterial;
|
||||||
@ -59,6 +60,7 @@ namespace ConformalDecals.MaterialProperties {
|
|||||||
_previewMaterial.EnableKeyword("DECAL_PREVIEW");
|
_previewMaterial.EnableKeyword("DECAL_PREVIEW");
|
||||||
_previewMaterial.SetInt(DecalPropertyIDs._Cull, (int) CullMode.Back);
|
_previewMaterial.SetInt(DecalPropertyIDs._Cull, (int) CullMode.Back);
|
||||||
_previewMaterial.SetInt(DecalPropertyIDs._ZWrite, 1);
|
_previewMaterial.SetInt(DecalPropertyIDs._ZWrite, 1);
|
||||||
|
_previewMaterial.SetShaderPassEnabled("DEFERRED_PREPASS", false);
|
||||||
}
|
}
|
||||||
|
|
||||||
return _previewMaterial;
|
return _previewMaterial;
|
||||||
@ -75,7 +77,12 @@ namespace ConformalDecals.MaterialProperties {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public float AspectRatio => MainTexture == null ? 1 : MainTexture.AspectRatio;
|
public float AspectRatio {
|
||||||
|
get => MainTexture == null ? 1 : MainTexture.AspectRatio;
|
||||||
|
set {
|
||||||
|
if (MainTexture != null) MainTexture.AspectRatio = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public void OnBeforeSerialize() {
|
public void OnBeforeSerialize() {
|
||||||
if (_materialProperties == null) throw new SerializationException("Tried to serialize an uninitialized MaterialPropertyCollection");
|
if (_materialProperties == null) throw new SerializationException("Tried to serialize an uninitialized MaterialPropertyCollection");
|
||||||
@ -136,8 +143,7 @@ namespace ConformalDecals.MaterialProperties {
|
|||||||
public T GetProperty<T>(string propertyName) where T : MaterialProperty {
|
public T GetProperty<T>(string propertyName) where T : MaterialProperty {
|
||||||
if (_materialProperties.ContainsKey(propertyName) && _materialProperties[propertyName] is T property) {
|
if (_materialProperties.ContainsKey(propertyName) && _materialProperties[propertyName] is T property) {
|
||||||
return property;
|
return property;
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -145,8 +151,7 @@ namespace ConformalDecals.MaterialProperties {
|
|||||||
public T AddOrGetProperty<T>(string propertyName) where T : MaterialProperty {
|
public T AddOrGetProperty<T>(string propertyName) where T : MaterialProperty {
|
||||||
if (_materialProperties.ContainsKey(propertyName) && _materialProperties[propertyName] is T property) {
|
if (_materialProperties.ContainsKey(propertyName) && _materialProperties[propertyName] is T property) {
|
||||||
return property;
|
return property;
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
return AddProperty<T>(propertyName);
|
return AddProperty<T>(propertyName);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -156,6 +161,7 @@ namespace ConformalDecals.MaterialProperties {
|
|||||||
foreach (var material in Materials) {
|
foreach (var material in Materials) {
|
||||||
property.Remove(material);
|
property.Remove(material);
|
||||||
}
|
}
|
||||||
|
|
||||||
_materialProperties.Remove(propertyName);
|
_materialProperties.Remove(propertyName);
|
||||||
Destroy(property);
|
Destroy(property);
|
||||||
|
|
||||||
@ -204,8 +210,7 @@ namespace ConformalDecals.MaterialProperties {
|
|||||||
if (_shader == null) {
|
if (_shader == null) {
|
||||||
Logging.Log("Using default decal shader");
|
Logging.Log("Using default decal shader");
|
||||||
shaderName = "ConformalDecals/Decal/Standard";
|
shaderName = "ConformalDecals/Decal/Standard";
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -19,6 +19,8 @@ namespace ConformalDecals.MaterialProperties {
|
|||||||
[SerializeField] private Vector2 _textureOffset;
|
[SerializeField] private Vector2 _textureOffset;
|
||||||
[SerializeField] private Vector2 _textureScale = Vector2.one;
|
[SerializeField] private Vector2 _textureScale = Vector2.one;
|
||||||
|
|
||||||
|
[SerializeField] private float _aspectRatioOverride = -1.0f;
|
||||||
|
|
||||||
public Texture2D Texture {
|
public Texture2D Texture {
|
||||||
get => _texture;
|
get => _texture;
|
||||||
set => _texture = value;
|
set => _texture = value;
|
||||||
@ -41,7 +43,15 @@ namespace ConformalDecals.MaterialProperties {
|
|||||||
public Vector2 Dimensions => new Vector2(_texture.width, _texture.height);
|
public Vector2 Dimensions => new Vector2(_texture.width, _texture.height);
|
||||||
public Vector2 MaskedDimensions => _hasTile ? _tileRect.size : Dimensions;
|
public Vector2 MaskedDimensions => _hasTile ? _tileRect.size : Dimensions;
|
||||||
|
|
||||||
public float AspectRatio => MaskedHeight / (float) MaskedWidth;
|
public float AspectRatio {
|
||||||
|
get {
|
||||||
|
if (_aspectRatioOverride > 0) return _aspectRatioOverride;
|
||||||
|
if (_texture == null) return 1;
|
||||||
|
return MaskedHeight / (float) MaskedWidth;
|
||||||
|
}
|
||||||
|
|
||||||
|
set => _aspectRatioOverride = value;
|
||||||
|
}
|
||||||
|
|
||||||
public override void ParseNode(ConfigNode node) {
|
public override void ParseNode(ConfigNode node) {
|
||||||
base.ParseNode(node);
|
base.ParseNode(node);
|
||||||
|
@ -31,10 +31,12 @@ namespace ConformalDecals {
|
|||||||
|
|
||||||
[KSPField] public bool scaleAdjustable = true;
|
[KSPField] public bool scaleAdjustable = true;
|
||||||
[KSPField] public float defaultScale = 1;
|
[KSPField] public float defaultScale = 1;
|
||||||
[KSPField] public Vector2 scaleRange = new Vector2(0, 4);
|
[KSPField] public Vector2 scaleRange = new Vector2(0, 5);
|
||||||
|
|
||||||
[KSPField] public DecalScaleMode scaleMode = DecalScaleMode.HEIGHT;
|
[KSPField] public DecalScaleMode scaleMode = DecalScaleMode.HEIGHT;
|
||||||
|
|
||||||
|
[KSPField] public float aspectRatio = -1.0f; // < 0 = use texture
|
||||||
|
|
||||||
[KSPField] public bool depthAdjustable = true;
|
[KSPField] public bool depthAdjustable = true;
|
||||||
[KSPField] public float defaultDepth = 0.1f;
|
[KSPField] public float defaultDepth = 0.1f;
|
||||||
[KSPField] public Vector2 depthRange = new Vector2(0, 2);
|
[KSPField] public Vector2 depthRange = new Vector2(0, 2);
|
||||||
@ -60,19 +62,19 @@ namespace ConformalDecals {
|
|||||||
|
|
||||||
// INTERNAL VALUES
|
// INTERNAL VALUES
|
||||||
[KSPField(guiName = "#LOC_ConformalDecals_gui-scale", guiActive = false, guiActiveEditor = true, isPersistant = true, guiFormat = "F2", guiUnits = "m"),
|
[KSPField(guiName = "#LOC_ConformalDecals_gui-scale", guiActive = false, guiActiveEditor = true, isPersistant = true, guiFormat = "F2", guiUnits = "m"),
|
||||||
UI_FloatRange(stepIncrement = 0.05f)]
|
UI_FloatRange()]
|
||||||
public float scale = 1.0f;
|
public float scale = 1.0f;
|
||||||
|
|
||||||
[KSPField(guiName = "#LOC_ConformalDecals_gui-depth", guiActive = false, guiActiveEditor = true, isPersistant = true, guiFormat = "F2", guiUnits = "m"),
|
[KSPField(guiName = "#LOC_ConformalDecals_gui-depth", guiActive = false, guiActiveEditor = true, isPersistant = true, guiFormat = "F2", guiUnits = "m"),
|
||||||
UI_FloatRange(stepIncrement = 0.02f)]
|
UI_FloatRange()]
|
||||||
public float depth = 0.2f;
|
public float depth = 0.2f;
|
||||||
|
|
||||||
[KSPField(guiName = "#LOC_ConformalDecals_gui-opacity", guiActive = false, guiActiveEditor = true, isPersistant = true, guiFormat = "P0"),
|
[KSPField(guiName = "#LOC_ConformalDecals_gui-opacity", guiActive = false, guiActiveEditor = true, isPersistant = true, guiFormat = "P0"),
|
||||||
UI_FloatRange(stepIncrement = 0.05f)]
|
UI_FloatRange()]
|
||||||
public float opacity = 1.0f;
|
public float opacity = 1.0f;
|
||||||
|
|
||||||
[KSPField(guiName = "#LOC_ConformalDecals_gui-cutoff", guiActive = false, guiActiveEditor = true, isPersistant = true, guiFormat = "P0"),
|
[KSPField(guiName = "#LOC_ConformalDecals_gui-cutoff", guiActive = false, guiActiveEditor = true, isPersistant = true, guiFormat = "P0"),
|
||||||
UI_FloatRange(stepIncrement = 0.05f)]
|
UI_FloatRange()]
|
||||||
public float cutoff = 0.5f;
|
public float cutoff = 0.5f;
|
||||||
|
|
||||||
[KSPField(guiName = "#LOC_ConformalDecals_gui-wear", guiActive = false, guiActiveEditor = true, isPersistant = true, guiFormat = "F0"),
|
[KSPField(guiName = "#LOC_ConformalDecals_gui-wear", guiActive = false, guiActiveEditor = true, isPersistant = true, guiFormat = "F0"),
|
||||||
@ -122,8 +124,7 @@ namespace ConformalDecals {
|
|||||||
|
|
||||||
if (materialProperties == null) {
|
if (materialProperties == null) {
|
||||||
materialProperties = ScriptableObject.CreateInstance<MaterialPropertyCollection>();
|
materialProperties = ScriptableObject.CreateInstance<MaterialPropertyCollection>();
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
materialProperties = ScriptableObject.Instantiate(materialProperties);
|
materialProperties = ScriptableObject.Instantiate(materialProperties);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -153,14 +154,12 @@ namespace ConformalDecals {
|
|||||||
if (backRenderer == null) {
|
if (backRenderer == null) {
|
||||||
this.LogError($"Specified decalBack transform {decalBack} has no renderer attached! Setting updateBackScale to false.");
|
this.LogError($"Specified decalBack transform {decalBack} has no renderer attached! Setting updateBackScale to false.");
|
||||||
updateBackScale = false;
|
updateBackScale = false;
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
backMaterial = backRenderer.material;
|
backMaterial = backRenderer.material;
|
||||||
if (backMaterial == null) {
|
if (backMaterial == null) {
|
||||||
this.LogError($"Specified decalBack transform {decalBack} has a renderer but no material! Setting updateBackScale to false.");
|
this.LogError($"Specified decalBack transform {decalBack} has a renderer but no material! Setting updateBackScale to false.");
|
||||||
updateBackScale = false;
|
updateBackScale = false;
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
if (backTextureBaseScale == default) backTextureBaseScale = backMaterial.GetTextureScale(PropertyIDs._MainTex);
|
if (backTextureBaseScale == default) backTextureBaseScale = backMaterial.GetTextureScale(PropertyIDs._MainTex);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -201,12 +200,14 @@ namespace ConformalDecals {
|
|||||||
|
|
||||||
if (tileRect.x >= 0) {
|
if (tileRect.x >= 0) {
|
||||||
materialProperties.UpdateTile(tileRect);
|
materialProperties.UpdateTile(tileRect);
|
||||||
}
|
} else if (tileIndex >= 0) {
|
||||||
else if (tileIndex >= 0) {
|
|
||||||
materialProperties.UpdateTile(tileIndex, tileSize);
|
materialProperties.UpdateTile(tileIndex, tileSize);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
catch (Exception e) {
|
// handle aspect ratio overrides
|
||||||
|
materialProperties.AspectRatio = aspectRatio;
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
this.LogException("Exception parsing partmodule", e);
|
this.LogException("Exception parsing partmodule", e);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -222,8 +223,7 @@ namespace ConformalDecals {
|
|||||||
|
|
||||||
if (HighLogic.LoadedSceneIsGame) {
|
if (HighLogic.LoadedSceneIsGame) {
|
||||||
UpdateScale();
|
UpdateScale();
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
scale = defaultScale;
|
scale = defaultScale;
|
||||||
depth = defaultDepth;
|
depth = defaultDepth;
|
||||||
opacity = defaultOpacity;
|
opacity = defaultOpacity;
|
||||||
@ -250,6 +250,7 @@ namespace ConformalDecals {
|
|||||||
if (HighLogic.LoadedSceneIsEditor) {
|
if (HighLogic.LoadedSceneIsEditor) {
|
||||||
GameEvents.onEditorPartEvent.Add(OnEditorEvent);
|
GameEvents.onEditorPartEvent.Add(OnEditorEvent);
|
||||||
GameEvents.onVariantApplied.Add(OnVariantApplied);
|
GameEvents.onVariantApplied.Add(OnVariantApplied);
|
||||||
|
GameEvents.onEditorUndo.Add(OnEditorUndo);
|
||||||
|
|
||||||
UpdateTweakables();
|
UpdateTweakables();
|
||||||
}
|
}
|
||||||
@ -261,8 +262,7 @@ namespace ConformalDecals {
|
|||||||
// set initial attachment state
|
// set initial attachment state
|
||||||
if (part.parent == null) {
|
if (part.parent == null) {
|
||||||
OnDetach();
|
OnDetach();
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
OnAttach();
|
OnAttach();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -288,6 +288,7 @@ namespace ConformalDecals {
|
|||||||
if (HighLogic.LoadedSceneIsEditor) {
|
if (HighLogic.LoadedSceneIsEditor) {
|
||||||
GameEvents.onEditorPartEvent.Remove(OnEditorEvent);
|
GameEvents.onEditorPartEvent.Remove(OnEditorEvent);
|
||||||
GameEvents.onVariantApplied.Remove(OnVariantApplied);
|
GameEvents.onVariantApplied.Remove(OnVariantApplied);
|
||||||
|
GameEvents.onEditorUndo.Remove(OnEditorUndo);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (HighLogic.LoadedSceneIsFlight) {
|
if (HighLogic.LoadedSceneIsFlight) {
|
||||||
@ -351,6 +352,10 @@ namespace ConformalDecals {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected void OnEditorUndo(ShipConstruct sc) {
|
||||||
|
UpdateTargets();
|
||||||
|
}
|
||||||
|
|
||||||
protected void OnPartWillDie(Part willDie) {
|
protected void OnPartWillDie(Part willDie) {
|
||||||
if (willDie == part.parent) {
|
if (willDie == part.parent) {
|
||||||
this.Log("Parent part about to be destroyed! Killing decal part.");
|
this.Log("Parent part about to be destroyed! Killing decal part.");
|
||||||
@ -400,30 +405,32 @@ namespace ConformalDecals {
|
|||||||
protected void UpdateScale() {
|
protected void UpdateScale() {
|
||||||
scale = Mathf.Max(0.01f, scale);
|
scale = Mathf.Max(0.01f, scale);
|
||||||
depth = Mathf.Max(0.01f, depth);
|
depth = Mathf.Max(0.01f, depth);
|
||||||
var aspectRatio = materialProperties.AspectRatio;
|
|
||||||
|
var sizeRatio = Mathf.Max(0.01f, materialProperties.AspectRatio);
|
||||||
|
|
||||||
Vector2 size;
|
Vector2 size;
|
||||||
|
|
||||||
switch (scaleMode) {
|
switch (scaleMode) {
|
||||||
default:
|
default:
|
||||||
case DecalScaleMode.HEIGHT:
|
case DecalScaleMode.HEIGHT:
|
||||||
size = new Vector2(scale / aspectRatio, scale);
|
size = new Vector2(scale / sizeRatio, scale);
|
||||||
break;
|
break;
|
||||||
case DecalScaleMode.WIDTH:
|
case DecalScaleMode.WIDTH:
|
||||||
size = new Vector2(scale, scale * aspectRatio);
|
size = new Vector2(scale, scale * sizeRatio);
|
||||||
break;
|
break;
|
||||||
case DecalScaleMode.AVERAGE:
|
case DecalScaleMode.AVERAGE:
|
||||||
var width1 = 2 * scale / (1 + aspectRatio);
|
var width1 = 2 * scale / (1 + sizeRatio);
|
||||||
size = new Vector2(width1, width1 * aspectRatio);
|
size = new Vector2(width1, width1 * sizeRatio);
|
||||||
break;
|
break;
|
||||||
case DecalScaleMode.AREA:
|
case DecalScaleMode.AREA:
|
||||||
var width2 = Mathf.Sqrt(scale / aspectRatio);
|
var width2 = Mathf.Sqrt(scale / sizeRatio);
|
||||||
size = new Vector2(width2, width2 * aspectRatio);
|
size = new Vector2(width2, width2 * sizeRatio);
|
||||||
break;
|
break;
|
||||||
case DecalScaleMode.MINIMUM:
|
case DecalScaleMode.MINIMUM:
|
||||||
if (aspectRatio > 1) goto case DecalScaleMode.WIDTH;
|
if (sizeRatio > 1) goto case DecalScaleMode.WIDTH;
|
||||||
else goto case DecalScaleMode.HEIGHT;
|
else goto case DecalScaleMode.HEIGHT;
|
||||||
case DecalScaleMode.MAXIMUM:
|
case DecalScaleMode.MAXIMUM:
|
||||||
if (aspectRatio > 1) goto case DecalScaleMode.HEIGHT;
|
if (sizeRatio > 1) goto case DecalScaleMode.HEIGHT;
|
||||||
else goto case DecalScaleMode.WIDTH;
|
else goto case DecalScaleMode.WIDTH;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -440,10 +447,13 @@ namespace ConformalDecals {
|
|||||||
|
|
||||||
// update projection
|
// update projection
|
||||||
foreach (var target in _targets) {
|
foreach (var target in _targets) {
|
||||||
target.Project(_orthoMatrix, decalProjectorTransform, _boundsRenderer.bounds, useBaseNormal);
|
if (target.target == null) {
|
||||||
|
_targets.Remove(target);
|
||||||
|
} else {
|
||||||
|
target.Project(_orthoMatrix, decalProjectorTransform, _boundsRenderer.bounds, useBaseNormal);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
// rescale preview model
|
// rescale preview model
|
||||||
decalModelTransform.localScale = new Vector3(size.x, size.y, (size.x + size.y) / 2);
|
decalModelTransform.localScale = new Vector3(size.x, size.y, (size.x + size.y) / 2);
|
||||||
|
|
||||||
@ -471,8 +481,7 @@ namespace ConformalDecals {
|
|||||||
protected void UpdateTargets() {
|
protected void UpdateTargets() {
|
||||||
if (_targets == null) {
|
if (_targets == null) {
|
||||||
_targets = new List<ProjectionTarget>();
|
_targets = new List<ProjectionTarget>();
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
_targets.Clear();
|
_targets.Clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -512,7 +521,7 @@ namespace ConformalDecals {
|
|||||||
cutoffField.guiActiveEditor = cutoffAdjustable;
|
cutoffField.guiActiveEditor = cutoffAdjustable;
|
||||||
wearField.guiActiveEditor = useBaseNormal;
|
wearField.guiActiveEditor = useBaseNormal;
|
||||||
|
|
||||||
var steps = 40;
|
var steps = 20;
|
||||||
|
|
||||||
if (scaleAdjustable) {
|
if (scaleAdjustable) {
|
||||||
var minValue = Mathf.Max(Mathf.Epsilon, scaleRange.x);
|
var minValue = Mathf.Max(Mathf.Epsilon, scaleRange.x);
|
||||||
@ -521,7 +530,7 @@ namespace ConformalDecals {
|
|||||||
var scaleEditor = (UI_FloatRange) scaleField.uiControlEditor;
|
var scaleEditor = (UI_FloatRange) scaleField.uiControlEditor;
|
||||||
scaleEditor.minValue = minValue;
|
scaleEditor.minValue = minValue;
|
||||||
scaleEditor.maxValue = maxValue;
|
scaleEditor.maxValue = maxValue;
|
||||||
scaleEditor.stepIncrement = (maxValue - minValue) / steps;
|
scaleEditor.stepIncrement = 0.01f; //1cm
|
||||||
scaleEditor.onFieldChanged = OnSizeTweakEvent;
|
scaleEditor.onFieldChanged = OnSizeTweakEvent;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -532,7 +541,7 @@ namespace ConformalDecals {
|
|||||||
var depthEditor = (UI_FloatRange) depthField.uiControlEditor;
|
var depthEditor = (UI_FloatRange) depthField.uiControlEditor;
|
||||||
depthEditor.minValue = minValue;
|
depthEditor.minValue = minValue;
|
||||||
depthEditor.maxValue = maxValue;
|
depthEditor.maxValue = maxValue;
|
||||||
depthEditor.stepIncrement = (maxValue - minValue) / steps;
|
depthEditor.stepIncrement = 0.01f; //1cm
|
||||||
depthEditor.onFieldChanged = OnSizeTweakEvent;
|
depthEditor.onFieldChanged = OnSizeTweakEvent;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -577,7 +586,8 @@ namespace ConformalDecals {
|
|||||||
|
|
||||||
// render on each target object
|
// render on each target object
|
||||||
foreach (var target in _targets) {
|
foreach (var target in _targets) {
|
||||||
target.Render(_decalMaterial, part.mpb, camera);
|
if (ReferenceEquals(target.target, null)) _targets.Remove(target);
|
||||||
|
else target.Render(_decalMaterial, part.mpb, camera);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -9,6 +9,7 @@ namespace ConformalDecals {
|
|||||||
|
|
||||||
[KSPField(isPersistant = true)] public bool useCustomFlag;
|
[KSPField(isPersistant = true)] public bool useCustomFlag;
|
||||||
|
|
||||||
|
// The URL of the flag for the current mission or agency
|
||||||
public string MissionFlagUrl {
|
public string MissionFlagUrl {
|
||||||
get {
|
get {
|
||||||
if (HighLogic.LoadedSceneIsEditor) {
|
if (HighLogic.LoadedSceneIsEditor) {
|
||||||
@ -19,6 +20,7 @@ namespace ConformalDecals {
|
|||||||
return string.IsNullOrEmpty(part.flagURL) ? HighLogic.CurrentGame.flagURL : part.flagURL;
|
return string.IsNullOrEmpty(part.flagURL) ? HighLogic.CurrentGame.flagURL : part.flagURL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// If we are not in game, use the default flag (for icon rendering)
|
||||||
return DefaultFlag;
|
return DefaultFlag;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -26,84 +28,108 @@ namespace ConformalDecals {
|
|||||||
public override void OnLoad(ConfigNode node) {
|
public override void OnLoad(ConfigNode node) {
|
||||||
base.OnLoad(node);
|
base.OnLoad(node);
|
||||||
|
|
||||||
if (useCustomFlag) {
|
// Since OnLoad is called for all modules, we only need to update this module
|
||||||
SetFlag(flagUrl);
|
// Updating symmetry counterparts would be redundent
|
||||||
}
|
UpdateFlag();
|
||||||
else {
|
|
||||||
SetFlag(MissionFlagUrl);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void OnStart(StartState state) {
|
public override void OnStart(StartState state) {
|
||||||
base.OnStart(state);
|
base.OnStart(state);
|
||||||
|
|
||||||
if (HighLogic.LoadedSceneIsGame) {
|
|
||||||
GameEvents.onMissionFlagSelect.Add(OnEditorFlagSelected);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (HighLogic.LoadedSceneIsEditor) {
|
if (HighLogic.LoadedSceneIsEditor) {
|
||||||
|
// Register flag change event
|
||||||
|
GameEvents.onMissionFlagSelect.Add(OnEditorFlagSelected);
|
||||||
|
|
||||||
|
// Register reset button event
|
||||||
Events[nameof(ResetFlag)].guiActiveEditor = useCustomFlag;
|
Events[nameof(ResetFlag)].guiActiveEditor = useCustomFlag;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (useCustomFlag) {
|
// Since OnStart is called for all modules, we only need to update this module
|
||||||
SetFlag(flagUrl);
|
// Updating symmetry counterparts would be redundent
|
||||||
}
|
UpdateFlag();
|
||||||
else {
|
|
||||||
SetFlag(MissionFlagUrl);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void OnDestroy() {
|
public override void OnDestroy() {
|
||||||
GameEvents.onMissionFlagSelect.Remove(SetFlag);
|
if (HighLogic.LoadedSceneIsEditor) {
|
||||||
|
// Unregister flag change event
|
||||||
|
GameEvents.onMissionFlagSelect.Remove(OnEditorFlagSelected);
|
||||||
|
}
|
||||||
|
|
||||||
base.OnDestroy();
|
base.OnDestroy();
|
||||||
}
|
}
|
||||||
|
|
||||||
[KSPEvent(guiActive = false, guiActiveEditor = true, guiName = "#LOC_ConformalDecals_gui-select-flag")]
|
[KSPEvent(guiActive = false, guiActiveEditor = true, guiName = "#LOC_ConformalDecals_gui-select-flag")]
|
||||||
public void SelectFlag() {
|
public void SelectFlag() {
|
||||||
|
// Button for selecting a flag
|
||||||
|
// This is a bit of a hack to bring up the stock flag selection menu
|
||||||
|
// When its done, it calls OnCustomFlagSelected()
|
||||||
|
|
||||||
|
// ReSharper disable once PossibleNullReferenceException
|
||||||
var flagBrowser = (Instantiate((Object) (new FlagBrowserGUIButton(null, null, null, null)).FlagBrowserPrefab) as GameObject).GetComponent<FlagBrowser>();
|
var flagBrowser = (Instantiate((Object) (new FlagBrowserGUIButton(null, null, null, null)).FlagBrowserPrefab) as GameObject).GetComponent<FlagBrowser>();
|
||||||
flagBrowser.OnFlagSelected = OnCustomFlagSelected;
|
flagBrowser.OnFlagSelected = OnCustomFlagSelected;
|
||||||
}
|
}
|
||||||
|
|
||||||
[KSPEvent(guiActive = false, guiActiveEditor = true, guiName = "#LOC_ConformalDecals_gui-reset-flag")]
|
[KSPEvent(guiActive = false, guiActiveEditor = true, guiName = "#LOC_ConformalDecals_gui-reset-flag")]
|
||||||
public void ResetFlag() {
|
public void ResetFlag() {
|
||||||
SetFlag(MissionFlagUrl);
|
|
||||||
SetFlagSymmetryCounterparts(MissionFlagUrl);
|
|
||||||
|
|
||||||
|
// we are no longer using a custom flag, so instead use the mission or agency flag
|
||||||
useCustomFlag = false;
|
useCustomFlag = false;
|
||||||
|
flagUrl = "Mission";
|
||||||
|
UpdateFlag(true);
|
||||||
|
|
||||||
|
// disable the reset button, since it no longer makes sense
|
||||||
Events[nameof(ResetFlag)].guiActiveEditor = false;
|
Events[nameof(ResetFlag)].guiActiveEditor = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void OnCustomFlagSelected(FlagBrowser.FlagEntry newFlagEntry) {
|
private void OnCustomFlagSelected(FlagBrowser.FlagEntry newFlagEntry) {
|
||||||
SetFlag(newFlagEntry.textureInfo.name);
|
// Callback for when a flag is selected in the menu spawned by SelectFlag()
|
||||||
SetFlagSymmetryCounterparts(newFlagEntry.textureInfo.name);
|
|
||||||
|
|
||||||
|
// we are now using a custom flag with the URL of the new flag entry
|
||||||
useCustomFlag = true;
|
useCustomFlag = true;
|
||||||
|
flagUrl = newFlagEntry.textureInfo.name;
|
||||||
|
UpdateFlag(true);
|
||||||
|
|
||||||
|
// make sure the reset button is now available
|
||||||
Events[nameof(ResetFlag)].guiActiveEditor = true;
|
Events[nameof(ResetFlag)].guiActiveEditor = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void OnEditorFlagSelected(string newFlagUrl) {
|
private void OnEditorFlagSelected(string newFlagUrl) {
|
||||||
if (!useCustomFlag) {
|
if (!useCustomFlag) {
|
||||||
SetFlag(newFlagUrl);
|
flagUrl = newFlagUrl;
|
||||||
SetFlagSymmetryCounterparts(newFlagUrl);
|
// Since this callback is called for all modules, we only need to update this module
|
||||||
|
// Updating symmetry counterparts would be redundent
|
||||||
|
UpdateFlag();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void SetFlag(string newFlagUrl) {
|
// Update the displayed flag texture for this decal or optionally any symmetry counterparts
|
||||||
this.Log($"Loading flag texture '{newFlagUrl}'.");
|
private void UpdateFlag(bool recursive = false) {
|
||||||
|
// get the decal material property for the decal texture
|
||||||
|
var textureProperty = materialProperties.AddOrGetTextureProperty("_Decal", true);
|
||||||
|
|
||||||
flagUrl = newFlagUrl;
|
string textureURL = useCustomFlag ? flagUrl : MissionFlagUrl;
|
||||||
materialProperties.AddOrGetTextureProperty("_Decal", true).TextureUrl = newFlagUrl;
|
textureProperty.TextureUrl = textureURL;
|
||||||
|
|
||||||
|
if (DecalConfig.AspectRatios.ContainsKey(textureURL)) {
|
||||||
|
var ratio = DecalConfig.AspectRatios[textureURL];
|
||||||
|
this.Log($"Overriding aspect ratio for {textureURL} with {ratio}");
|
||||||
|
textureProperty.AspectRatio = ratio;
|
||||||
|
} else {
|
||||||
|
textureProperty.AspectRatio = -1.0f;
|
||||||
|
}
|
||||||
|
|
||||||
UpdateMaterials();
|
UpdateMaterials();
|
||||||
UpdateScale();
|
UpdateScale();
|
||||||
}
|
|
||||||
|
|
||||||
private void SetFlagSymmetryCounterparts(string newFlagUrl) {
|
if (recursive) {
|
||||||
foreach (var counterpart in part.symmetryCounterparts) {
|
// for each symmetry counterpart, copy this part's properties and update it in turn
|
||||||
var decal = counterpart.GetComponent<ModuleConformalFlag>();
|
foreach (var counterpart in part.symmetryCounterparts) {
|
||||||
|
var decal = counterpart.GetComponent<ModuleConformalFlag>();
|
||||||
|
|
||||||
decal.SetFlag(newFlagUrl);
|
decal.useCustomFlag = useCustomFlag;
|
||||||
decal.useCustomFlag = useCustomFlag;
|
decal.flagUrl = flagUrl;
|
||||||
|
decal.UpdateFlag();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -89,17 +89,29 @@ namespace ConformalDecals {
|
|||||||
private MaterialColorProperty _outlineColorProperty;
|
private MaterialColorProperty _outlineColorProperty;
|
||||||
private MaterialFloatProperty _outlineWidthProperty;
|
private MaterialFloatProperty _outlineWidthProperty;
|
||||||
|
|
||||||
private TextRenderJob _currentJob;
|
|
||||||
private DecalText _currentText;
|
private DecalText _currentText;
|
||||||
|
|
||||||
public override void OnLoad(ConfigNode node) {
|
public override void OnLoad(ConfigNode node) {
|
||||||
base.OnLoad(node);
|
base.OnLoad(node);
|
||||||
text = WebUtility.UrlDecode(ParseUtil.ParseString(node, "text"));
|
|
||||||
font = DecalConfig.GetFont(ParseUtil.ParseString(node, "font", true, "Calibri SDF"));
|
string textRaw = "";
|
||||||
|
if (ParseUtil.ParseStringIndirect(ref textRaw, node, "text")) {
|
||||||
|
text = WebUtility.UrlDecode(textRaw);
|
||||||
|
}
|
||||||
|
|
||||||
|
string fontName = "";
|
||||||
|
if (ParseUtil.ParseStringIndirect(ref fontName, node, "fontName")) {
|
||||||
|
font = DecalConfig.GetFont(fontName);
|
||||||
|
}
|
||||||
|
else if (font == null) font = DecalConfig.GetFont("Calibri SDF");
|
||||||
|
|
||||||
int styleInt = 0;
|
int styleInt = 0;
|
||||||
if (ParseUtil.ParseIntIndirect(ref styleInt, node, "style")) style = (FontStyles) styleInt;
|
if (ParseUtil.ParseIntIndirect(ref styleInt, node, "style")) {
|
||||||
if (!ParseUtil.ParseColor32Indirect(ref fillColor, node, "fillColor")) fillColor = Color.magenta;
|
style = (FontStyles) styleInt;
|
||||||
if (!ParseUtil.ParseColor32Indirect(ref outlineColor, node, "outlineColor")) outlineColor = Color.magenta;
|
}
|
||||||
|
|
||||||
|
ParseUtil.ParseColor32Indirect(ref fillColor, node, "fillColor");
|
||||||
|
ParseUtil.ParseColor32Indirect(ref outlineColor, node, "outlineColor");
|
||||||
|
|
||||||
if (HighLogic.LoadedSceneIsGame) {
|
if (HighLogic.LoadedSceneIsGame) {
|
||||||
// For some reason, rendering doesnt work right on the first frame a scene is loaded
|
// For some reason, rendering doesnt work right on the first frame a scene is loaded
|
||||||
@ -141,7 +153,7 @@ namespace ConformalDecals {
|
|||||||
this.vertical = newVertical;
|
this.vertical = newVertical;
|
||||||
this.lineSpacing = newLineSpacing;
|
this.lineSpacing = newLineSpacing;
|
||||||
this.charSpacing = newCharSpacing;
|
this.charSpacing = newCharSpacing;
|
||||||
UpdateTextRecursive();
|
UpdateText(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void OnFillColorUpdate(Color rgb, Util.ColorHSV hsv) {
|
public void OnFillColorUpdate(Color rgb, Util.ColorHSV hsv) {
|
||||||
@ -228,38 +240,37 @@ namespace ConformalDecals {
|
|||||||
base.OnDetach();
|
base.OnDetach();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void UpdateTextRecursive() {
|
|
||||||
UpdateText();
|
|
||||||
|
|
||||||
foreach (var counterpart in part.symmetryCounterparts) {
|
|
||||||
var decal = counterpart.GetComponent<ModuleConformalText>();
|
|
||||||
decal.text = text;
|
|
||||||
decal.font = font;
|
|
||||||
decal.style = style;
|
|
||||||
|
|
||||||
decal._currentJob = _currentJob;
|
|
||||||
decal._currentText = _currentText;
|
|
||||||
decal.UpdateText();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private IEnumerator UpdateTextLate() {
|
private IEnumerator UpdateTextLate() {
|
||||||
yield return null;
|
yield return null;
|
||||||
UpdateText();
|
UpdateText();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void UpdateText() {
|
private void UpdateText(bool recursive = false) {
|
||||||
// Render text
|
// Render text
|
||||||
var newText = new DecalText(text, font, style, vertical, lineSpacing, charSpacing);
|
var newText = new DecalText(text, font, style, vertical, lineSpacing, charSpacing);
|
||||||
var output = TextRenderer.UpdateTextNow(_currentText, newText);
|
var output = TextRenderer.UpdateText(_currentText, newText);
|
||||||
|
|
||||||
|
// update the _currentText state variable
|
||||||
|
// this is the ONLY place this variable should be set! otherwise the current state is lost
|
||||||
_currentText = newText;
|
_currentText = newText;
|
||||||
|
|
||||||
|
// Update the texture with the new rendered output
|
||||||
UpdateTexture(output);
|
UpdateTexture(output);
|
||||||
|
|
||||||
// TODO: ASYNC RENDERING
|
// If recursive, copy parameters to other parts and perform the same operation
|
||||||
// var newText = new DecalText(text, _font, _style);
|
if (recursive) {
|
||||||
// _currentJob = TextRenderer.UpdateText(_currentText, newText, UpdateTexture);
|
foreach (var counterpart in part.symmetryCounterparts) {
|
||||||
// _currentText = newText;
|
var decal = counterpart.GetComponent<ModuleConformalText>();
|
||||||
|
decal.text = text;
|
||||||
|
decal.font = font;
|
||||||
|
decal.style = style;
|
||||||
|
decal.vertical = vertical;
|
||||||
|
decal.charSpacing = charSpacing;
|
||||||
|
decal.lineSpacing = lineSpacing;
|
||||||
|
|
||||||
|
decal.UpdateText();
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void UpdateTexture(TextRenderOutput output) {
|
public void UpdateTexture(TextRenderOutput output) {
|
||||||
|
@ -1,38 +1 @@
|
|||||||
using System.Reflection;
|
[assembly: KSPAssembly("ConformalDecals", 0, 2)]
|
||||||
using System.Runtime.CompilerServices;
|
|
||||||
using System.Runtime.InteropServices;
|
|
||||||
|
|
||||||
// General Information about an assembly is controlled through the following
|
|
||||||
// set of attributes. Change these attribute values to modify the information
|
|
||||||
// associated with an assembly.
|
|
||||||
[assembly: AssemblyTitle("ConformalDecals")]
|
|
||||||
[assembly: AssemblyDescription("")]
|
|
||||||
[assembly: AssemblyConfiguration("")]
|
|
||||||
[assembly: AssemblyCompany("Cineboxandrew")]
|
|
||||||
[assembly: AssemblyProduct("ConformalDecals")]
|
|
||||||
[assembly: AssemblyCopyright("Copyright © Andrew Cassidy 2020")]
|
|
||||||
[assembly: AssemblyTrademark("")]
|
|
||||||
[assembly: AssemblyCulture("")]
|
|
||||||
|
|
||||||
// Setting ComVisible to false makes the types in this assembly not visible
|
|
||||||
// to COM components. If you need to access a type in this assembly from
|
|
||||||
// COM, set the ComVisible attribute to true on that type.
|
|
||||||
[assembly: ComVisible(false)]
|
|
||||||
|
|
||||||
// The following GUID is for the ID of the typelib if this project is exposed to COM
|
|
||||||
[assembly: Guid("1ea983f9-42e5-494e-9683-fdac9c9121f4")]
|
|
||||||
|
|
||||||
// Version information for an assembly consists of the following four values:
|
|
||||||
//
|
|
||||||
// Major Version
|
|
||||||
// Minor Version
|
|
||||||
// Build Number
|
|
||||||
// Revision
|
|
||||||
//
|
|
||||||
// You can specify all the values or you can default the Build and Revision Numbers
|
|
||||||
// by using the '*' as shown below:
|
|
||||||
// [assembly: AssemblyVersion("1.0.*")]
|
|
||||||
[assembly: AssemblyVersion("1.0.0.0")]
|
|
||||||
[assembly: AssemblyFileVersion("1.0.0.0")]
|
|
||||||
|
|
||||||
[assembly: KSPAssembly("ConformalDecals", 0, 1, 0)]
|
|
@ -105,5 +105,9 @@ namespace ConformalDecals.Text {
|
|||||||
public void OnBeforeSerialize() { }
|
public void OnBeforeSerialize() { }
|
||||||
|
|
||||||
public void OnAfterDeserialize() { }
|
public void OnAfterDeserialize() { }
|
||||||
|
|
||||||
|
public override string ToString() {
|
||||||
|
return _title;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -32,6 +32,7 @@ namespace ConformalDecals.Text {
|
|||||||
/// The text formatted with newlines for vertical text
|
/// The text formatted with newlines for vertical text
|
||||||
public string FormattedText {
|
public string FormattedText {
|
||||||
get {
|
get {
|
||||||
|
if (string.IsNullOrWhiteSpace(Text)) return "•";
|
||||||
if (Vertical) {
|
if (Vertical) {
|
||||||
return Regex.Replace(Text, @"(.)", "$1\n");
|
return Regex.Replace(Text, @"(.)", "$1\n");
|
||||||
}
|
}
|
||||||
@ -85,5 +86,9 @@ namespace ConformalDecals.Text {
|
|||||||
public static bool operator !=(DecalText left, DecalText right) {
|
public static bool operator !=(DecalText left, DecalText right) {
|
||||||
return !Equals(left, right);
|
return !Equals(left, right);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public override string ToString() {
|
||||||
|
return $"{nameof(_text)}: {_text}, {nameof(_font)}: {_font}, {nameof(_style)}: {_style}, {nameof(_vertical)}: {_vertical}, {nameof(_lineSpacing)}: {_lineSpacing}, {nameof(_charSpacing)}: {_charSpacing}";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -1,35 +0,0 @@
|
|||||||
using System;
|
|
||||||
using UnityEngine.Events;
|
|
||||||
|
|
||||||
namespace ConformalDecals.Text {
|
|
||||||
public class TextRenderJob {
|
|
||||||
public DecalText OldText { get; }
|
|
||||||
public DecalText NewText { get; }
|
|
||||||
public bool Needed { get; private set; }
|
|
||||||
public bool IsStarted { get; private set; }
|
|
||||||
public bool IsDone { get; private set; }
|
|
||||||
|
|
||||||
public readonly TextRenderer.TextRenderEvent onRenderFinished = new TextRenderer.TextRenderEvent();
|
|
||||||
|
|
||||||
public TextRenderJob(DecalText oldText, DecalText newText, UnityAction<TextRenderOutput> renderFinishedCallback) {
|
|
||||||
OldText = oldText;
|
|
||||||
NewText = newText ?? throw new ArgumentNullException(nameof(newText));
|
|
||||||
Needed = true;
|
|
||||||
|
|
||||||
if (renderFinishedCallback != null) onRenderFinished.AddListener(renderFinishedCallback);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Cancel() {
|
|
||||||
Needed = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Start() {
|
|
||||||
IsStarted = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Finish(TextRenderOutput output) {
|
|
||||||
IsDone = true;
|
|
||||||
onRenderFinished.Invoke(output);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -9,7 +9,7 @@ namespace ConformalDecals.Text {
|
|||||||
/// The rectangle that the rendered text takes up within the texture
|
/// The rectangle that the rendered text takes up within the texture
|
||||||
public Rect Window { get; private set; }
|
public Rect Window { get; private set; }
|
||||||
|
|
||||||
/// The number of users for this render output. If 0, it can be discarded from the cache and the texture reused
|
/// The number of users for this render output. If 0, it can be discarded from the cache
|
||||||
public int UserCount { get; set; }
|
public int UserCount { get; set; }
|
||||||
|
|
||||||
public TextRenderOutput(Texture2D texture, Rect window) {
|
public TextRenderOutput(Texture2D texture, Rect window) {
|
||||||
|
@ -3,16 +3,12 @@ using System.Collections.Generic;
|
|||||||
using ConformalDecals.Util;
|
using ConformalDecals.Util;
|
||||||
using TMPro;
|
using TMPro;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using UnityEngine.Events;
|
|
||||||
using UnityEngine.Rendering;
|
using UnityEngine.Rendering;
|
||||||
|
using Object = UnityEngine.Object;
|
||||||
|
|
||||||
namespace ConformalDecals.Text {
|
namespace ConformalDecals.Text {
|
||||||
// TODO: Testing shows the job system is unnecessary, so remove job system code.
|
|
||||||
|
|
||||||
/// Class handing text rendering.
|
/// Class handing text rendering.
|
||||||
/// Is a singleton referencing a single gameobject in the scene which contains the TextMeshPro component
|
public static class TextRenderer {
|
||||||
[KSPAddon(KSPAddon.Startup.Instantly, true)]
|
|
||||||
public class TextRenderer : MonoBehaviour {
|
|
||||||
/// Texture format used for returned textures.
|
/// Texture format used for returned textures.
|
||||||
/// Unfortunately due to how Unity textures work, this cannot be R8 or Alpha8,
|
/// Unfortunately due to how Unity textures work, this cannot be R8 or Alpha8,
|
||||||
/// so theres always a superfluous green channel using memory
|
/// so theres always a superfluous green channel using memory
|
||||||
@ -22,163 +18,73 @@ namespace ConformalDecals.Text {
|
|||||||
/// Overriden below to be ARGB32 on DirectX because DirectX is dumb
|
/// Overriden below to be ARGB32 on DirectX because DirectX is dumb
|
||||||
public static RenderTextureFormat textRenderTextureFormat = RenderTextureFormat.R8;
|
public static RenderTextureFormat textRenderTextureFormat = RenderTextureFormat.R8;
|
||||||
|
|
||||||
/// The text renderer object within the scene which contains the TextMeshPro component used for rendering.
|
|
||||||
public static TextRenderer Instance {
|
|
||||||
get {
|
|
||||||
if (!_instance._isSetup) {
|
|
||||||
_instance.Setup();
|
|
||||||
}
|
|
||||||
|
|
||||||
return _instance;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Text Render unityevent, used with the job system to signal render completion
|
|
||||||
[Serializable]
|
|
||||||
public class TextRenderEvent : UnityEvent<TextRenderOutput> { }
|
|
||||||
|
|
||||||
private const string ShaderName = "ConformalDecals/Text Blit";
|
private const string ShaderName = "ConformalDecals/Text Blit";
|
||||||
private const int MaxTextureSize = 4096;
|
private const int MaxTextureSize = 4096;
|
||||||
private const float FontSize = 100;
|
private const float FontSize = 100;
|
||||||
private const float PixelDensity = 5;
|
private const float PixelDensity = 5;
|
||||||
|
|
||||||
private static TextRenderer _instance;
|
private static Shader _blitShader;
|
||||||
|
private static Texture2D _blankTexture;
|
||||||
private bool _isSetup;
|
|
||||||
private TextMeshPro _tmp;
|
|
||||||
private Shader _blitShader;
|
|
||||||
|
|
||||||
private static readonly Dictionary<DecalText, TextRenderOutput> RenderCache = new Dictionary<DecalText, TextRenderOutput>();
|
private static readonly Dictionary<DecalText, TextRenderOutput> RenderCache = new Dictionary<DecalText, TextRenderOutput>();
|
||||||
private static readonly Queue<TextRenderJob> RenderJobs = new Queue<TextRenderJob>();
|
|
||||||
|
|
||||||
/// Update text using the job queue
|
|
||||||
public static TextRenderJob UpdateText(DecalText oldText, DecalText newText, UnityAction<TextRenderOutput> renderFinishedCallback) {
|
|
||||||
if (newText == null) throw new ArgumentNullException(nameof(newText));
|
|
||||||
|
|
||||||
var job = new TextRenderJob(oldText, newText, renderFinishedCallback);
|
|
||||||
RenderJobs.Enqueue(job);
|
|
||||||
return job;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Update text immediately without using job queue
|
/// Update text immediately without using job queue
|
||||||
public static TextRenderOutput UpdateTextNow(DecalText oldText, DecalText newText) {
|
public static TextRenderOutput UpdateText(DecalText oldText, DecalText newText) {
|
||||||
if (newText == null) throw new ArgumentNullException(nameof(newText));
|
if (newText == null) throw new ArgumentNullException(nameof(newText));
|
||||||
|
|
||||||
return Instance.RunJob(new TextRenderJob(oldText, newText, null), out _);
|
if (!(oldText is null)) UnregisterText(oldText);
|
||||||
|
|
||||||
|
// now that all old references are handled, begin rendering the new output
|
||||||
|
if (!RenderCache.TryGetValue(newText, out var renderOutput)) {
|
||||||
|
renderOutput = RenderText(newText);
|
||||||
|
RenderCache.Add(newText, renderOutput);
|
||||||
|
}
|
||||||
|
|
||||||
|
renderOutput.UserCount++;
|
||||||
|
return renderOutput;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Unregister a user of a piece of text
|
/// Unregister a user of a piece of text
|
||||||
public static void UnregisterText(DecalText text) {
|
public static void UnregisterText(DecalText text) {
|
||||||
|
if (text == null) throw new ArgumentNullException(nameof(text));
|
||||||
|
|
||||||
if (RenderCache.TryGetValue(text, out var renderedText)) {
|
if (RenderCache.TryGetValue(text, out var renderedText)) {
|
||||||
renderedText.UserCount--;
|
renderedText.UserCount--;
|
||||||
if (renderedText.UserCount <= 0) {
|
if (renderedText.UserCount <= 0) {
|
||||||
RenderCache.Remove(text);
|
RenderCache.Remove(text);
|
||||||
Destroy(renderedText.Texture);
|
var texture = renderedText.Texture;
|
||||||
|
if (texture != _blankTexture) Object.Destroy(texture);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void Start() {
|
|
||||||
if (_instance != null) {
|
|
||||||
Logging.LogError("Duplicate TextRenderer created???");
|
|
||||||
}
|
|
||||||
|
|
||||||
Logging.Log("Creating TextRenderer Object");
|
|
||||||
_instance = this;
|
|
||||||
DontDestroyOnLoad(gameObject);
|
|
||||||
if (SystemInfo.graphicsDeviceType == GraphicsDeviceType.Direct3D11 || SystemInfo.graphicsDeviceType == GraphicsDeviceType.Direct3D12) {
|
|
||||||
textRenderTextureFormat = RenderTextureFormat.ARGB32; // DirectX is dumb
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!SystemInfo.SupportsTextureFormat(textTextureFormat)) {
|
|
||||||
Logging.LogError($"Text texture format {textTextureFormat} not supported on this platform.");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!SystemInfo.SupportsRenderTextureFormat(textRenderTextureFormat)) {
|
|
||||||
Logging.LogError($"Text texture format {textRenderTextureFormat} not supported on this platform.");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Setup this text renderer instance for rendering
|
|
||||||
private void Setup() {
|
|
||||||
if (_isSetup) return;
|
|
||||||
|
|
||||||
Logging.Log("Setting Up TextRenderer Object");
|
|
||||||
|
|
||||||
_tmp = gameObject.AddComponent<TextMeshPro>();
|
|
||||||
_tmp.renderer.enabled = false; // dont automatically render
|
|
||||||
|
|
||||||
_blitShader = Shabby.Shabby.FindShader(ShaderName);
|
|
||||||
if (_blitShader == null) Logging.LogError($"Could not find text blit shader named '{ShaderName}'");
|
|
||||||
|
|
||||||
_isSetup = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Run a text render job
|
|
||||||
private TextRenderOutput RunJob(TextRenderJob job, out bool renderNeeded) {
|
|
||||||
if (!job.Needed) {
|
|
||||||
renderNeeded = false;
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
job.Start();
|
|
||||||
|
|
||||||
Texture2D texture = null;
|
|
||||||
if (job.OldText != null && RenderCache.TryGetValue(job.OldText, out var oldRender)) {
|
|
||||||
// old output still exists
|
|
||||||
|
|
||||||
oldRender.UserCount--;
|
|
||||||
|
|
||||||
if (oldRender.UserCount <= 0) {
|
|
||||||
// this is the only usage of this output, so we are free to re-render into the texture
|
|
||||||
|
|
||||||
texture = oldRender.Texture;
|
|
||||||
RenderCache.Remove(job.OldText);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// now that all old references are handled, begin rendering the new output
|
|
||||||
|
|
||||||
if (RenderCache.TryGetValue(job.NewText, out var renderOutput)) {
|
|
||||||
renderNeeded = false;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
renderNeeded = true;
|
|
||||||
|
|
||||||
renderOutput = RenderText(job.NewText, texture);
|
|
||||||
RenderCache.Add(job.NewText, renderOutput);
|
|
||||||
}
|
|
||||||
|
|
||||||
renderOutput.UserCount++;
|
|
||||||
|
|
||||||
job.Finish(renderOutput);
|
|
||||||
return renderOutput;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Render a piece of text to a given texture
|
/// Render a piece of text to a given texture
|
||||||
public TextRenderOutput RenderText(DecalText text, Texture2D texture) {
|
public static TextRenderOutput RenderText(DecalText text) {
|
||||||
if (text == null) throw new ArgumentNullException(nameof(text));
|
if (text == null) throw new ArgumentNullException(nameof(text));
|
||||||
if (_tmp == null) throw new InvalidOperationException("TextMeshPro object not yet created.");
|
|
||||||
|
var tmpObject = new GameObject("Text Mesh Pro renderer");
|
||||||
|
var tmp = tmpObject.AddComponent<TextMeshPro>();
|
||||||
|
|
||||||
// SETUP TMP OBJECT FOR RENDERING
|
// SETUP TMP OBJECT FOR RENDERING
|
||||||
_tmp.text = text.FormattedText;
|
tmp.text = text.FormattedText;
|
||||||
_tmp.font = text.Font.FontAsset;
|
tmp.font = text.Font.FontAsset;
|
||||||
_tmp.fontStyle = text.Style | text.Font.FontStyle;
|
tmp.fontStyle = text.Style | text.Font.FontStyle;
|
||||||
_tmp.lineSpacing = text.LineSpacing;
|
tmp.lineSpacing = text.LineSpacing;
|
||||||
_tmp.characterSpacing = text.CharSpacing;
|
tmp.characterSpacing = text.CharSpacing;
|
||||||
|
|
||||||
_tmp.extraPadding = true;
|
tmp.extraPadding = true;
|
||||||
_tmp.enableKerning = true;
|
tmp.enableKerning = true;
|
||||||
_tmp.enableWordWrapping = false;
|
tmp.enableWordWrapping = false;
|
||||||
_tmp.overflowMode = TextOverflowModes.Overflow;
|
tmp.overflowMode = TextOverflowModes.Overflow;
|
||||||
_tmp.alignment = TextAlignmentOptions.Center;
|
tmp.alignment = TextAlignmentOptions.Center;
|
||||||
_tmp.fontSize = FontSize;
|
tmp.fontSize = FontSize;
|
||||||
|
|
||||||
// GENERATE MESH
|
// GENERATE MESH
|
||||||
_tmp.ClearMesh(false);
|
tmp.ClearMesh(false);
|
||||||
_tmp.ForceMeshUpdate();
|
tmp.ForceMeshUpdate();
|
||||||
|
|
||||||
var meshFilters = gameObject.GetComponentsInChildren<MeshFilter>();
|
var meshFilters = tmpObject.GetComponentsInChildren<MeshFilter>();
|
||||||
var meshes = new Mesh[meshFilters.Length];
|
var meshes = new Mesh[meshFilters.Length];
|
||||||
var materials = new Material[meshFilters.Length];
|
var materials = new Material[meshFilters.Length];
|
||||||
|
|
||||||
@ -189,9 +95,9 @@ namespace ConformalDecals.Text {
|
|||||||
var renderer = meshFilters[i].gameObject.GetComponent<MeshRenderer>();
|
var renderer = meshFilters[i].gameObject.GetComponent<MeshRenderer>();
|
||||||
|
|
||||||
meshes[i] = meshFilters[i].mesh;
|
meshes[i] = meshFilters[i].mesh;
|
||||||
if (i == 0) meshes[i] = _tmp.mesh;
|
if (i == 0) meshes[i] = tmp.mesh;
|
||||||
|
|
||||||
materials[i] = Instantiate(renderer.material);
|
materials[i] = Object.Instantiate(renderer.material);
|
||||||
materials[i].shader = _blitShader;
|
materials[i].shader = _blitShader;
|
||||||
|
|
||||||
if (renderer == null) throw new FormatException($"Object {meshFilters[i].gameObject.name} has filter but no renderer");
|
if (renderer == null) throw new FormatException($"Object {meshFilters[i].gameObject.name} has filter but no renderer");
|
||||||
@ -216,8 +122,9 @@ namespace ConformalDecals.Text {
|
|||||||
};
|
};
|
||||||
|
|
||||||
if (textureSize.x == 0 || textureSize.y == 0) {
|
if (textureSize.x == 0 || textureSize.y == 0) {
|
||||||
Logging.LogWarning("No text present or error in texture size calculation. Aborting.");
|
Logging.LogError("No text present or error in texture size calculation. Aborting.");
|
||||||
return new TextRenderOutput(Texture2D.blackTexture, Rect.zero);
|
Object.Destroy(tmpObject);
|
||||||
|
return new TextRenderOutput(_blankTexture, Rect.zero);
|
||||||
}
|
}
|
||||||
|
|
||||||
// make sure texture isnt too big, scale it down if it is
|
// make sure texture isnt too big, scale it down if it is
|
||||||
@ -242,12 +149,7 @@ namespace ConformalDecals.Text {
|
|||||||
};
|
};
|
||||||
|
|
||||||
// SETUP TEXTURE
|
// SETUP TEXTURE
|
||||||
if (texture == null) {
|
var texture = new Texture2D(textureSize.x, textureSize.y, textTextureFormat, false);
|
||||||
texture = new Texture2D(textureSize.x, textureSize.y, textTextureFormat, true);
|
|
||||||
}
|
|
||||||
else if (texture.width != textureSize.x || texture.height != textureSize.y || texture.format != textTextureFormat) {
|
|
||||||
texture.Resize(textureSize.x, textureSize.y, textTextureFormat, true);
|
|
||||||
}
|
|
||||||
|
|
||||||
// GENERATE PROJECTION MATRIX
|
// GENERATE PROJECTION MATRIX
|
||||||
var halfSize = (Vector2) textureSize / PixelDensity / 2 / sizeRatio;
|
var halfSize = (Vector2) textureSize / PixelDensity / 2 / sizeRatio;
|
||||||
@ -255,8 +157,7 @@ namespace ConformalDecals.Text {
|
|||||||
bounds.center.y - halfSize.y, bounds.center.y + halfSize.y, -1, 1);
|
bounds.center.y - halfSize.y, bounds.center.y + halfSize.y, -1, 1);
|
||||||
|
|
||||||
// GET RENDERTEX
|
// GET RENDERTEX
|
||||||
var renderTex = RenderTexture.GetTemporary(textureSize.x, textureSize.y, 0, textRenderTextureFormat, RenderTextureReadWrite.Linear, 1);
|
var renderTex = RenderTexture.GetTemporary(textureSize.x, textureSize.y, 0, textRenderTextureFormat, RenderTextureReadWrite.Linear);
|
||||||
renderTex.autoGenerateMips = false;
|
|
||||||
|
|
||||||
// RENDER
|
// RENDER
|
||||||
Graphics.SetRenderTarget(renderTex);
|
Graphics.SetRenderTarget(renderTex);
|
||||||
@ -272,25 +173,42 @@ namespace ConformalDecals.Text {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
GL.PopMatrix();
|
// COPY RENDERTEX INTO TEXTURE
|
||||||
|
var prevRT = RenderTexture.active;
|
||||||
// COPY TEXTURE BACK INTO RAM
|
|
||||||
RenderTexture.active = renderTex;
|
RenderTexture.active = renderTex;
|
||||||
texture.ReadPixels(new Rect(0, 0, textureSize.x, textureSize.y), 0, 0, true);
|
texture.ReadPixels(new Rect(0, 0, textureSize.x, textureSize.y), 0, 0, false);
|
||||||
texture.Apply();
|
texture.Apply(false, true);
|
||||||
|
RenderTexture.active = prevRT;
|
||||||
|
|
||||||
|
GL.PopMatrix();
|
||||||
|
|
||||||
// RELEASE RENDERTEX
|
// RELEASE RENDERTEX
|
||||||
RenderTexture.ReleaseTemporary(renderTex);
|
RenderTexture.ReleaseTemporary(renderTex);
|
||||||
|
|
||||||
// CLEAR SUBMESHES
|
// DESTROY THE RENDERER OBJECT
|
||||||
_tmp.text = "";
|
Object.Destroy(tmpObject);
|
||||||
|
|
||||||
for (int i = 0; i < transform.childCount; i++) {
|
|
||||||
var child = transform.GetChild(i);
|
|
||||||
Destroy(child.gameObject);
|
|
||||||
}
|
|
||||||
|
|
||||||
return new TextRenderOutput(texture, window);
|
return new TextRenderOutput(texture, window);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Setup shader and texture
|
||||||
|
public static void ModuleManagerPostLoad() {
|
||||||
|
if (SystemInfo.graphicsDeviceType == GraphicsDeviceType.Direct3D11 || SystemInfo.graphicsDeviceType == GraphicsDeviceType.Direct3D12) {
|
||||||
|
textRenderTextureFormat = RenderTextureFormat.ARGB32; // DirectX is dumb
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!SystemInfo.SupportsTextureFormat(textTextureFormat)) {
|
||||||
|
Logging.LogError($"Text texture format {textTextureFormat} not supported on this platform.");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!SystemInfo.SupportsRenderTextureFormat(textRenderTextureFormat)) {
|
||||||
|
Logging.LogError($"Text texture format {textRenderTextureFormat} not supported on this platform.");
|
||||||
|
}
|
||||||
|
|
||||||
|
_blankTexture = Texture2D.blackTexture;
|
||||||
|
_blitShader = Shabby.Shabby.FindShader(ShaderName);
|
||||||
|
if (_blitShader == null) Logging.LogError($"Could not find text blit shader named '{ShaderName}'");
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -3,7 +3,6 @@ using ConformalDecals.Text;
|
|||||||
using ConformalDecals.Util;
|
using ConformalDecals.Util;
|
||||||
using TMPro;
|
using TMPro;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using UnityEngine.Events;
|
|
||||||
using UnityEngine.UI;
|
using UnityEngine.UI;
|
||||||
|
|
||||||
namespace ConformalDecals.UI {
|
namespace ConformalDecals.UI {
|
||||||
@ -11,7 +10,6 @@ namespace ConformalDecals.UI {
|
|||||||
[Serializable]
|
[Serializable]
|
||||||
public delegate void TextUpdateDelegate(string newText, DecalFont newFont, FontStyles style, bool vertical, float linespacing, float charspacing);
|
public delegate void TextUpdateDelegate(string newText, DecalFont newFont, FontStyles style, bool vertical, float linespacing, float charspacing);
|
||||||
|
|
||||||
|
|
||||||
[SerializeField] private Selectable _textBox;
|
[SerializeField] private Selectable _textBox;
|
||||||
[SerializeField] private Button _fontButton;
|
[SerializeField] private Button _fontButton;
|
||||||
|
|
||||||
@ -36,11 +34,15 @@ namespace ConformalDecals.UI {
|
|||||||
private Vector2 _lineSpacingRange;
|
private Vector2 _lineSpacingRange;
|
||||||
private Vector2 _charSpacingRange;
|
private Vector2 _charSpacingRange;
|
||||||
private TMP_InputField _textBoxTMP;
|
private TMP_InputField _textBoxTMP;
|
||||||
|
private FontMenuController _fontMenu;
|
||||||
private TextUpdateDelegate _onValueChanged;
|
private TextUpdateDelegate _onValueChanged;
|
||||||
|
|
||||||
private FontMenuController _fontMenu;
|
private static int _lockCounter;
|
||||||
|
|
||||||
private bool _ignoreUpdates;
|
private bool _isLocked;
|
||||||
|
private string _lockString;
|
||||||
|
private bool _ignoreUpdates;
|
||||||
|
private bool _textUpdated;
|
||||||
|
|
||||||
public static TextEntryController Create(
|
public static TextEntryController Create(
|
||||||
string text, DecalFont font, FontStyles style, bool vertical, float linespacing, float charspacing,
|
string text, DecalFont font, FontStyles style, bool vertical, float linespacing, float charspacing,
|
||||||
@ -70,10 +72,21 @@ namespace ConformalDecals.UI {
|
|||||||
Destroy(gameObject);
|
Destroy(gameObject);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void SetControlLock(string value = null) {
|
||||||
|
if (_isLocked) return;
|
||||||
|
InputLockManager.SetControlLock(ControlTypes.EDITOR_UI, _lockString);
|
||||||
|
_isLocked = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void RemoveControlLock(string value = null) {
|
||||||
|
if (!_isLocked) return;
|
||||||
|
InputLockManager.RemoveControlLock(_lockString);
|
||||||
|
_isLocked = false;
|
||||||
|
}
|
||||||
|
|
||||||
public void OnTextUpdate(string newText) {
|
public void OnTextUpdate(string newText) {
|
||||||
this._text = newText;
|
this._text = newText;
|
||||||
|
_textUpdated = true;
|
||||||
OnValueChanged();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void OnFontMenu() {
|
public void OnFontMenu() {
|
||||||
@ -91,7 +104,7 @@ namespace ConformalDecals.UI {
|
|||||||
_textBoxTMP.fontAsset = _font.FontAsset;
|
_textBoxTMP.fontAsset = _font.FontAsset;
|
||||||
|
|
||||||
UpdateStyleButtons();
|
UpdateStyleButtons();
|
||||||
OnValueChanged();
|
_textUpdated = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void OnLineSpacingUpdate(float value) {
|
public void OnLineSpacingUpdate(float value) {
|
||||||
@ -100,7 +113,7 @@ namespace ConformalDecals.UI {
|
|||||||
_lineSpacing = Mathf.Lerp(_lineSpacingRange.x, _lineSpacingRange.y, value);
|
_lineSpacing = Mathf.Lerp(_lineSpacingRange.x, _lineSpacingRange.y, value);
|
||||||
|
|
||||||
UpdateLineSpacing();
|
UpdateLineSpacing();
|
||||||
OnValueChanged();
|
_textUpdated = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void OnLineSpacingUpdate(string text) {
|
public void OnLineSpacingUpdate(string text) {
|
||||||
@ -114,7 +127,7 @@ namespace ConformalDecals.UI {
|
|||||||
}
|
}
|
||||||
|
|
||||||
UpdateLineSpacing();
|
UpdateLineSpacing();
|
||||||
OnValueChanged();
|
_textUpdated = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void OnCharSpacingUpdate(float value) {
|
public void OnCharSpacingUpdate(float value) {
|
||||||
@ -123,7 +136,7 @@ namespace ConformalDecals.UI {
|
|||||||
_charSpacing = Mathf.Lerp(_charSpacingRange.x, _charSpacingRange.y, value);
|
_charSpacing = Mathf.Lerp(_charSpacingRange.x, _charSpacingRange.y, value);
|
||||||
|
|
||||||
UpdateCharSpacing();
|
UpdateCharSpacing();
|
||||||
OnValueChanged();
|
_textUpdated = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void OnCharSpacingUpdate(string text) {
|
public void OnCharSpacingUpdate(string text) {
|
||||||
@ -137,7 +150,7 @@ namespace ConformalDecals.UI {
|
|||||||
}
|
}
|
||||||
|
|
||||||
UpdateCharSpacing();
|
UpdateCharSpacing();
|
||||||
OnValueChanged();
|
_textUpdated = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void OnBoldUpdate(bool state) {
|
public void OnBoldUpdate(bool state) {
|
||||||
@ -149,7 +162,7 @@ namespace ConformalDecals.UI {
|
|||||||
_style &= ~FontStyles.Bold;
|
_style &= ~FontStyles.Bold;
|
||||||
|
|
||||||
_textBoxTMP.textComponent.fontStyle = _style | _font.FontStyle & ~_font.FontStyleMask;
|
_textBoxTMP.textComponent.fontStyle = _style | _font.FontStyle & ~_font.FontStyleMask;
|
||||||
OnValueChanged();
|
_textUpdated = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void OnItalicUpdate(bool state) {
|
public void OnItalicUpdate(bool state) {
|
||||||
@ -161,7 +174,7 @@ namespace ConformalDecals.UI {
|
|||||||
_style &= ~FontStyles.Italic;
|
_style &= ~FontStyles.Italic;
|
||||||
|
|
||||||
_textBoxTMP.textComponent.fontStyle = _style | _font.FontStyle & ~_font.FontStyleMask;
|
_textBoxTMP.textComponent.fontStyle = _style | _font.FontStyle & ~_font.FontStyleMask;
|
||||||
OnValueChanged();
|
_textUpdated = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void OnUnderlineUpdate(bool state) {
|
public void OnUnderlineUpdate(bool state) {
|
||||||
@ -173,7 +186,7 @@ namespace ConformalDecals.UI {
|
|||||||
_style &= ~FontStyles.Underline;
|
_style &= ~FontStyles.Underline;
|
||||||
|
|
||||||
_textBoxTMP.textComponent.fontStyle = _style | _font.FontStyle & ~_font.FontStyleMask;
|
_textBoxTMP.textComponent.fontStyle = _style | _font.FontStyle & ~_font.FontStyleMask;
|
||||||
OnValueChanged();
|
_textUpdated = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void OnSmallCapsUpdate(bool state) {
|
public void OnSmallCapsUpdate(bool state) {
|
||||||
@ -185,22 +198,25 @@ namespace ConformalDecals.UI {
|
|||||||
_style &= ~FontStyles.SmallCaps;
|
_style &= ~FontStyles.SmallCaps;
|
||||||
|
|
||||||
_textBoxTMP.textComponent.fontStyle = _style | _font.FontStyle & ~_font.FontStyleMask;
|
_textBoxTMP.textComponent.fontStyle = _style | _font.FontStyle & ~_font.FontStyleMask;
|
||||||
OnValueChanged();
|
_textUpdated = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void OnVerticalUpdate(bool state) {
|
public void OnVerticalUpdate(bool state) {
|
||||||
if (_ignoreUpdates) return;
|
if (_ignoreUpdates) return;
|
||||||
|
|
||||||
_vertical = state;
|
_vertical = state;
|
||||||
OnValueChanged();
|
_textUpdated = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private void Start() {
|
private void Start() {
|
||||||
|
_lockString = $"ConformalDecals_TextEditor_{_lockCounter++}";
|
||||||
|
|
||||||
_textBoxTMP = ((TMP_InputField) _textBox);
|
_textBoxTMP = ((TMP_InputField) _textBox);
|
||||||
_textBoxTMP.text = _text;
|
_textBoxTMP.text = _text;
|
||||||
_textBoxTMP.textComponent.fontStyle = _style | _font.FontStyle & ~_font.FontStyleMask;
|
_textBoxTMP.textComponent.fontStyle = _style | _font.FontStyle & ~_font.FontStyleMask;
|
||||||
_textBoxTMP.fontAsset = _font.FontAsset;
|
_textBoxTMP.fontAsset = _font.FontAsset;
|
||||||
|
_textBoxTMP.onSelect.AddListener(SetControlLock);
|
||||||
|
_textBoxTMP.onDeselect.AddListener(RemoveControlLock);
|
||||||
|
|
||||||
_font.SetupSample(_fontButton.GetComponentInChildren<TextMeshProUGUI>());
|
_font.SetupSample(_fontButton.GetComponentInChildren<TextMeshProUGUI>());
|
||||||
|
|
||||||
@ -209,8 +225,15 @@ namespace ConformalDecals.UI {
|
|||||||
UpdateCharSpacing();
|
UpdateCharSpacing();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void OnValueChanged() {
|
private void OnDestroy() {
|
||||||
_onValueChanged(_text, _font, _style, _vertical, _lineSpacing, _charSpacing);
|
RemoveControlLock();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void LateUpdate() {
|
||||||
|
if (_textUpdated) {
|
||||||
|
_onValueChanged(_text, _font, _style, _vertical, _lineSpacing, _charSpacing);
|
||||||
|
_textUpdated = false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void UpdateStyleButtons() {
|
private void UpdateStyleButtons() {
|
||||||
|
@ -1,83 +0,0 @@
|
|||||||
v0.2.3
|
|
||||||
------
|
|
||||||
- Fixes:
|
|
||||||
- Fixed TMP subobjects being deleted, causing fallback fonts to fail in some situations.
|
|
||||||
- Started using URL-style encoding for text decals behind the scenes to prevent issues with certain characters.
|
|
||||||
- Fixed text decals having zero size when they had only whitespace or an empty string
|
|
||||||
- Fixed decals having drag and causing issues when using FAR
|
|
||||||
|
|
||||||
v0.2.2
|
|
||||||
------
|
|
||||||
- Fixes:
|
|
||||||
- Fixed corrupted text rendering when a vessel loads during a scene change.
|
|
||||||
|
|
||||||
v0.2.1
|
|
||||||
------
|
|
||||||
- Changes:
|
|
||||||
- Pressing enter in the text entry window now types a newline.
|
|
||||||
- Fixes:
|
|
||||||
- Renamed font assetbundle. The old extension was causing the game to try to load it twice on Windows due to legacy compatability features.
|
|
||||||
- Fixed text rendering on DirectX resulting in black boxes by using ARGB32 instead of RG16 for the render texture in DirectX.
|
|
||||||
|
|
||||||
v0.2.0
|
|
||||||
------
|
|
||||||
- New Parts:
|
|
||||||
- CDL-3 Surface Base Decal: A set of conformal decals based on the symbols from the movie Moon (2009) designed by Gavin Rothery
|
|
||||||
- CDL-T Custom Text Decal: A customizable text decal with a variety of fonts
|
|
||||||
- Changes:
|
|
||||||
- New ModuleConformalText module for customizable text
|
|
||||||
- Text, font, and style can all be customized, as well as text fill and outline colors and widths
|
|
||||||
- Same projection and opacity options as other conformal decals
|
|
||||||
- New StandardText decal shader supporting the text module
|
|
||||||
- Unified all decal shaders into a single "StandardDecal" shader with variants supporting any combination of bump, specular and emissive maps, plus SDF alphas.
|
|
||||||
- Old shaders are remapped to Standard shader plus keywords automatically.
|
|
||||||
- New SDF-based antialiasing for when decals extend to their borders, e.g. on opaque flags.
|
|
||||||
- New "KEYWORD" material modifier, allowing for shader features to be enabled and disabled.
|
|
||||||
- Material modifiers can now be removed in variants by setting `remove = true` inside them.
|
|
||||||
- Fixes:
|
|
||||||
- Fixed WIDTH and HEIGHT scale modes being flipped
|
|
||||||
- Removed some debug log statements
|
|
||||||
- Dependencies:
|
|
||||||
- Updated ModuleManager to version 4.1.4
|
|
||||||
|
|
||||||
v0.1.4
|
|
||||||
------
|
|
||||||
- Supported KSP versions: 1.8.x to 1.10.x
|
|
||||||
- Fixes:
|
|
||||||
- Fixed decals rendering onto disabled B9PS part variants
|
|
||||||
- Decals will still not update whan their parent part's B9PS variant is changed, both in flight and in the editor. This is known and awaiting a change to B9PS to be fixed.
|
|
||||||
- Fixed decal bounds rendering as dark cubes when shadowed by EVE clouds.
|
|
||||||
- Fixed decals being shadowed by EVE clouds, causing the part underneath to appear overly dark.
|
|
||||||
|
|
||||||
v0.1.3
|
|
||||||
------
|
|
||||||
Fixes:
|
|
||||||
- Fixed decals being able to be scaled down to 0
|
|
||||||
|
|
||||||
Changes:
|
|
||||||
- Made decal bounds no longer collide in flight, this is done by repurposing layer 31 (which is configurable in the ConformalDecals.cfg file)
|
|
||||||
- Decals will now be unselectable in flight by default. This can be disabled with the `selectableInFlight` value in ConformalDecals.cfg, or in the module config itself.
|
|
||||||
- Decal parts will now destroy themselves automatically when the parent part is destroyed
|
|
||||||
- Small refactor of node parsing code
|
|
||||||
- Colors can now be specified in hex (#RGB, #RGBA, #RRGGBB, or #RRGGBBAA) or using the colors specified in the XKCDColors class
|
|
||||||
|
|
||||||
v0.1.2
|
|
||||||
------
|
|
||||||
Fixes:
|
|
||||||
- Disabled writing to the zbuffer in the decal bounds shader. Should fix any issues with Scatterer or EVE.
|
|
||||||
|
|
||||||
v0.1.1
|
|
||||||
------
|
|
||||||
Fixes:
|
|
||||||
- Fixed flag decal not adjusting to new texture sizes immediately.
|
|
||||||
- Fixed decal bounds being visible on launch.
|
|
||||||
- Fixed decal bounds being visible in the part icon.
|
|
||||||
|
|
||||||
v0.1.0
|
|
||||||
------
|
|
||||||
Initial release!
|
|
||||||
|
|
||||||
New parts:
|
|
||||||
- CDL-F Flag Decal: Conformal flag decal, which uses either the mission flag or a flag of your choosing.
|
|
||||||
- CDL-1 Generic Decal: A set of conformal generic decals for planes and rockets
|
|
||||||
- CDL-2 Semiotic Standard Decal: A set of conformal decals based on the Semiotic Standard for All Commercial Trans-Stellar Utility Lifter and Transport Spacecraft designed by Ron Cobb for the movie Alien
|
|