mirror of
https://github.com/drewcassidy/KSP-Conformal-Decals.git
synced 2024-06-11 05:54:07 +00:00
Compare commits
65 Commits
f20119565f
...
7a909c18bc
Author | SHA1 | Date | |
---|---|---|---|
7a909c18bc | |||
d714c498fb | |||
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 | |||
1e7c6d81c9 | |||
900061f7f6 | |||
d8d3d4ed92 | |||
a6d58690f9 | |||
f108341068 | |||
fb0070f92f |
23
.github/workflows/ff-release.yml
vendored
Normal file
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
|
139
.github/workflows/ksp-publish.yml
vendored
Normal file
139
.github/workflows/ksp-publish.yml
vendored
Normal file
|
@ -0,0 +1,139 @@
|
||||||
|
name: Build and Release
|
||||||
|
on: [ push ]
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v2
|
||||||
|
|
||||||
|
- name: Setup Python
|
||||||
|
uses: actions/setup-python@v2
|
||||||
|
with:
|
||||||
|
python-version: '3.x'
|
||||||
|
|
||||||
|
- name: Setup .NET Core SDK
|
||||||
|
uses: actions/setup-dotnet@v1.7.2
|
||||||
|
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: |
|
||||||
|
echo "VERSION_TITLE=$(yaclog show -n)" >> $GITHUB_ENV
|
||||||
|
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 http://pileof.rocks/KSP/Shabby_v0.2.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@v3
|
||||||
|
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@v3
|
||||||
|
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@v2
|
||||||
|
|
||||||
|
- name: Set up Python
|
||||||
|
uses: actions/setup-python@v2
|
||||||
|
with:
|
||||||
|
python-version: '3.x'
|
||||||
|
|
||||||
|
- 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
|
||||||
|
echo "$(yaclog show -mb)" >> RELEASE.md
|
||||||
|
|
||||||
|
- name: Download Build Artifacts
|
||||||
|
uses: actions/download-artifact@v3
|
||||||
|
|
||||||
|
- name: Zip Download Packages
|
||||||
|
run: |
|
||||||
|
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: |
|
||||||
|
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.3" \
|
||||||
|
-F "notify-followers=yes" \
|
||||||
|
-F "zipball=@bundled/ConformalDecals-$VERSION_TITLE.zip" \
|
||||||
|
"https://spacedock.info/api/mod/2451/update"
|
||||||
|
|
||||||
|
- name: Publish to Github
|
||||||
|
uses: softprops/action-gh-release@v1
|
||||||
|
with:
|
||||||
|
files: |
|
||||||
|
bundled/ConformalDecals-*.zip
|
||||||
|
ConformalDecals/GameData/ConformalDecals/Versioning/ConformalDecals.version
|
||||||
|
name: Conformal Decals ${{ env.VERSION_TITLE }}
|
||||||
|
body_path: RELEASE.md
|
||||||
|
env:
|
||||||
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
5
.gitignore
vendored
5
.gitignore
vendored
|
@ -16,6 +16,9 @@ Temp/
|
||||||
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
|
||||||
|
@ -52,4 +55,4 @@ Source/ConformalDecals/bin
|
||||||
.vs
|
.vs
|
||||||
obj
|
obj
|
||||||
*.swp
|
*.swp
|
||||||
Source/.editorconfig
|
@thumbs
|
||||||
|
|
|
@ -16,11 +16,15 @@ dependencies: # Configure dependencies
|
||||||
zip: false
|
zip: false
|
||||||
B9PartSwitch:
|
B9PartSwitch:
|
||||||
location: url
|
location: url
|
||||||
url: http://pileof.rocks/KSP/B9PartSwitch-v2.16.0.zip
|
url: http://pileof.rocks/KSP/B9PartSwitch-v2.18.0.zip
|
||||||
zip: true
|
zip: true
|
||||||
Shabby:
|
Shabby:
|
||||||
location: url
|
location: url
|
||||||
url: http://taniwha.org/~bill/Shabby_v0.1.2.zip
|
url: http://pileof.rocks/KSP/Shabby_v0.2.0.zip
|
||||||
|
zip: true
|
||||||
|
HarmonyKSP:
|
||||||
|
location: url
|
||||||
|
url: https://github.com/KSPModdingLibs/HarmonyKSP/releases/download/2.0.4.0/HarmonyKSP_2.0.4.0_for_KSP1.8+.zip
|
||||||
zip: true
|
zip: true
|
||||||
deploy:
|
deploy:
|
||||||
SpaceDock:
|
SpaceDock:
|
||||||
|
|
25
.travis.yml
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
|
|
BIN
Assets/Textures/Decal-Back.afdesign
Normal file
BIN
Assets/Textures/Decal-Back.afdesign
Normal file
Binary file not shown.
BIN
Assets/Textures/Icons Generic.afdesign
Normal file
BIN
Assets/Textures/Icons Generic.afdesign
Normal file
Binary file not shown.
BIN
Assets/Textures/Munar.afdesign
Normal file
BIN
Assets/Textures/Munar.afdesign
Normal file
Binary file not shown.
BIN
Assets/Textures/Semiotic.afdesign
Normal file
BIN
Assets/Textures/Semiotic.afdesign
Normal file
Binary file not shown.
193
CHANGELOG.md
Normal file
193
CHANGELOG.md
Normal file
|
@ -0,0 +1,193 @@
|
||||||
|
# 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.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
|
7
GameData/ConformalDecals/Patches/Waterfall.cfg
Normal file
7
GameData/ConformalDecals/Patches/Waterfall.cfg
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
// Prevent projection onto Waterfall plumes
|
||||||
|
|
||||||
|
CONFORMALDECALS:NEEDS[Waterfall] {
|
||||||
|
SHADERBLACKLIST {
|
||||||
|
shaderRegex = Waterfall/.*
|
||||||
|
}
|
||||||
|
}
|
Binary file not shown.
|
@ -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 {
|
||||||
|
|
|
@ -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":7,
|
"PATCH": 9,
|
||||||
"BUILD":0
|
"BUILD": 100000
|
||||||
},
|
},
|
||||||
"KSP_VERSION":
|
"KSP_VERSION": {
|
||||||
{
|
"MAJOR": 1,
|
||||||
"MAJOR":1,
|
"MINOR": 12
|
||||||
"MINOR":11,
|
|
||||||
"PATCH":0
|
|
||||||
},
|
},
|
||||||
"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":11,
|
"MINOR": 12
|
||||||
"PATCH":99
|
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -1,5 +1,5 @@
|
||||||
# Conformal Decals v0.2.7
|
# Conformal Decals
|
||||||
[![Build Status](https://travis-ci.com/drewcassidy/KSP-Conformal-Decals.svg?branch=release)](https://travis-ci.com/drewcassidy/KSP-Conformal-Decals) [![Art: CC BY-SA 4.0](https://img.shields.io/badge/Art%20License-CC%20BY--SA%204.0-orange.svg)](https://creativecommons.org/licenses/by-sa/4.0/) [![Code: GPL v3](https://img.shields.io/badge/Code%20License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
|
[![Art: CC BY-SA 4.0](https://img.shields.io/badge/Art%20License-CC%20BY--SA%204.0-orange.svg)](https://creativecommons.org/licenses/by-sa/4.0/) [![Code: GPL v3](https://img.shields.io/badge/Code%20License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
|
||||||
|
|
||||||
![Screenshot](http://pileof.rocks/KSP/images/ConformalDecalsHeader.png)
|
![Screenshot](http://pileof.rocks/KSP/images/ConformalDecalsHeader.png)
|
||||||
|
|
||||||
|
@ -9,9 +9,10 @@ Conformal Decals adds a set of decal stickers to KSP, as well as providing a fra
|
||||||
|
|
||||||
Required:
|
Required:
|
||||||
- KSP (1.8.x to 1.10.x)
|
- KSP (1.8.x to 1.10.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
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,11 +1,11 @@
|
||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<?xml version="1.0" ?><Project Sdk="Microsoft.NET.Sdk">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net48</TargetFramework>
|
<TargetFramework>net48</TargetFramework>
|
||||||
<LangVersion>8</LangVersion>
|
<LangVersion>8</LangVersion>
|
||||||
<IsPackable>false</IsPackable>
|
<IsPackable>false</IsPackable>
|
||||||
<PlatformTarget>x64</PlatformTarget>
|
<PlatformTarget>x64</PlatformTarget>
|
||||||
<NoWarn>1701;1702;CS0649;CS1591</NoWarn>
|
<NoWarn>1701;1702;CS0649;CS1591</NoWarn>
|
||||||
<AssemblyVersion>0.2.7</AssemblyVersion>
|
<AssemblyVersion>9.9.9</AssemblyVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
@ -36,23 +36,23 @@
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Compile Remove="dlls\**" />
|
<Compile Remove="dlls\**"/>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<EmbeddedResource Remove="dlls\**" />
|
<EmbeddedResource Remove="dlls\**"/>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<None Remove="dlls\**" />
|
<None Remove="dlls\**"/>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<None Include="..\.editorconfig" />
|
<None Include="..\.editorconfig" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
|
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
|
||||||
<Exec Command="/bin/cp -v '$(OutDir)ConformalDecals.dll' '$(SolutionDir)../GameData/ConformalDecals/Plugins'" />
|
<Exec Command="/bin/cp -v '$(OutDir)ConformalDecals.dll' '$(SolutionDir)../GameData/ConformalDecals/Plugins/ConformalDecals.dll'" IgnoreExitCode="true"/>
|
||||||
|
<!--Fuck you MSBuild stop trying to run CMD.exe on macOS-->
|
||||||
</Target>
|
</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;
|
||||||
|
@ -9,6 +10,7 @@ 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;
|
||||||
|
@ -55,7 +57,17 @@ namespace ConformalDecals {
|
||||||
}
|
}
|
||||||
|
|
||||||
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) {
|
||||||
|
@ -88,6 +100,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>();
|
||||||
|
@ -121,13 +137,14 @@ 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>();
|
||||||
|
|
||||||
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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -143,4 +160,4 @@ namespace ConformalDecals {
|
||||||
_blankNormal = MakeBlankNormal();
|
_blankNormal = MakeBlankNormal();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,6 +2,7 @@ using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Diagnostics.CodeAnalysis;
|
using System.Diagnostics.CodeAnalysis;
|
||||||
using ConformalDecals.MaterialProperties;
|
using ConformalDecals.MaterialProperties;
|
||||||
|
using ConformalDecals.Targets;
|
||||||
using ConformalDecals.Util;
|
using ConformalDecals.Util;
|
||||||
using UniLinq;
|
using UniLinq;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
|
@ -440,12 +441,14 @@ namespace ConformalDecals {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Setup decal by calling update functions relevent for the current situation
|
// find all valid renderers
|
||||||
protected virtual void SetupDecal() {
|
var renderers = part.parent.FindModelComponents<MeshRenderer>();
|
||||||
if (HighLogic.LoadedSceneIsEditor) {
|
foreach (var renderer in renderers) {
|
||||||
// Update tweakables in editor mode
|
// skip disabled renderers
|
||||||
UpdateTweakables();
|
if (renderer.gameObject.activeInHierarchy == false) continue;
|
||||||
}
|
|
||||||
|
// skip blacklisted shaders
|
||||||
|
if (DecalConfig.IsBlacklisted(renderer.material.shader)) continue;
|
||||||
|
|
||||||
if (HighLogic.LoadedSceneIsGame) {
|
if (HighLogic.LoadedSceneIsGame) {
|
||||||
UpdateAll();
|
UpdateAll();
|
||||||
|
@ -670,4 +673,4 @@ namespace ConformalDecals {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -22,35 +22,64 @@ 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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public override void OnLoad(ConfigNode node) {
|
||||||
|
base.OnLoad(node);
|
||||||
|
|
||||||
|
// Since OnLoad is called for all modules, we only need to update this module
|
||||||
|
// Updating symmetry counterparts would be redundent
|
||||||
|
UpdateFlag();
|
||||||
|
}
|
||||||
|
|
||||||
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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Since OnStart is called for all modules, we only need to update this module
|
||||||
|
// Updating symmetry counterparts would be redundent
|
||||||
|
UpdateFlag();
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void OnDestroy() {
|
public override void OnDestroy() {
|
||||||
GameEvents.onMissionFlagSelect.Remove(OnEditorFlagSelected);
|
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() {
|
||||||
var flagBrowser = (Instantiate((Object) (new FlagBrowserGUIButton(null, null, null, null)).FlagBrowserPrefab) as GameObject)?.GetComponent<FlagBrowser>();
|
// Button for selecting a flag
|
||||||
if (flagBrowser is { }) flagBrowser.OnFlagSelected = OnCustomFlagSelected;
|
// 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>();
|
||||||
|
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() {
|
||||||
|
|
||||||
|
// we are no longer using a custom flag, so instead use the mission or agency flag
|
||||||
|
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;
|
||||||
flagUrl = MissionFlagUrl;
|
flagUrl = MissionFlagUrl;
|
||||||
useCustomFlag = false;
|
useCustomFlag = false;
|
||||||
|
@ -64,33 +93,55 @@ namespace ConformalDecals {
|
||||||
}
|
}
|
||||||
|
|
||||||
private void OnCustomFlagSelected(FlagBrowser.FlagEntry newFlagEntry) {
|
private void OnCustomFlagSelected(FlagBrowser.FlagEntry newFlagEntry) {
|
||||||
|
// Callback for when a flag is selected in the menu spawned by SelectFlag()
|
||||||
|
|
||||||
|
// we are now using a custom flag with the URL of the new flag entry
|
||||||
|
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;
|
||||||
flagUrl = newFlagEntry.textureInfo.name;
|
flagUrl = newFlagEntry.textureInfo.name;
|
||||||
useCustomFlag = true;
|
useCustomFlag = true;
|
||||||
UpdateAll();
|
UpdateAll();
|
||||||
|
|
||||||
foreach (var decal in part.symmetryCounterparts.Select(o => o.GetComponent<ModuleConformalFlag>())) {
|
private void OnEditorFlagSelected(string newFlagUrl) {
|
||||||
decal.Events[nameof(ResetFlag)].guiActiveEditor = true;
|
if (!useCustomFlag) {
|
||||||
decal.flagUrl = flagUrl;
|
flagUrl = newFlagUrl;
|
||||||
decal.useCustomFlag = true;
|
// Since this callback is called for all modules, we only need to update this module
|
||||||
decal.UpdateAll();
|
// Updating symmetry counterparts would be redundent
|
||||||
|
UpdateFlag();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void OnEditorFlagSelected(string newFlagUrl) {
|
// Update the displayed flag texture for this decal or optionally any symmetry counterparts
|
||||||
if (!useCustomFlag) UpdateAll();
|
private void UpdateFlag(bool recursive = false) {
|
||||||
}
|
// get the decal material property for the decal texture
|
||||||
|
var textureProperty = materialProperties.AddOrGetTextureProperty("_Decal", true);
|
||||||
protected override void UpdateTextures() {
|
|
||||||
_flagTextureProperty ??= materialProperties.AddOrGetTextureProperty("_Decal", true);
|
if(useCustomFlag) {
|
||||||
|
// set the texture to the custom flag
|
||||||
base.UpdateTextures();
|
textureProperty.TextureUrl = flagUrl;
|
||||||
if (useCustomFlag) {
|
|
||||||
_flagTextureProperty.TextureUrl = flagUrl;
|
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
_flagTextureProperty.TextureUrl = MissionFlagUrl;
|
// set the texture to the mission flag
|
||||||
|
textureProperty.TextureUrl = MissionFlagUrl;
|
||||||
|
}
|
||||||
|
|
||||||
|
UpdateMaterials();
|
||||||
|
UpdateScale();
|
||||||
|
|
||||||
|
if (recursive) {
|
||||||
|
// for each symmetry counterpart, copy this part's properties and update it in turn
|
||||||
|
foreach (var counterpart in part.symmetryCounterparts) {
|
||||||
|
var decal = counterpart.GetComponent<ModuleConformalFlag>();
|
||||||
|
|
||||||
|
decal.useCustomFlag = useCustomFlag;
|
||||||
|
decal.flagUrl = flagUrl;
|
||||||
|
decal.UpdateFlag();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -281,6 +281,9 @@ namespace ConformalDecals {
|
||||||
// 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.UpdateText(_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;
|
||||||
|
|
||||||
_decalTextureProperty.Texture = output.Texture;
|
_decalTextureProperty.Texture = output.Texture;
|
||||||
|
@ -317,4 +320,4 @@ namespace ConformalDecals {
|
||||||
base.UpdateTweakables();
|
base.UpdateTweakables();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
|
|
||||||
namespace ConformalDecals {
|
namespace ConformalDecals.Targets {
|
||||||
public interface IProjectionTarget {
|
public interface IProjectionTarget {
|
||||||
bool Project(Matrix4x4 orthoMatrix, Transform projector, Bounds projectionBounds);
|
bool Project(Matrix4x4 orthoMatrix, Transform projector, Bounds projectionBounds);
|
||||||
void Render(Material decalMaterial, MaterialPropertyBlock partMPB, Camera camera);
|
void Render(Material decalMaterial, MaterialPropertyBlock partMPB, Camera camera);
|
|
@ -1,7 +1,7 @@
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using UnityEngine.Rendering;
|
using UnityEngine.Rendering;
|
||||||
|
|
||||||
namespace ConformalDecals {
|
namespace ConformalDecals.Targets {
|
||||||
public class ProjectionMeshTarget : IProjectionTarget {
|
public class ProjectionMeshTarget : IProjectionTarget {
|
||||||
public const string NodeName = "MESH_TARGET";
|
public const string NodeName = "MESH_TARGET";
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
|
|
||||||
namespace ConformalDecals {
|
namespace ConformalDecals.Targets {
|
||||||
public class ProjectionPartTarget : IProjectionTarget {
|
public class ProjectionPartTarget : IProjectionTarget {
|
||||||
public const string NodeName = "PART_TARGET";
|
public const string NodeName = "PART_TARGET";
|
||||||
|
|
33
Source/ConformalDecals/Tweakables/TweakableData.cs
Normal file
33
Source/ConformalDecals/Tweakables/TweakableData.cs
Normal file
|
@ -0,0 +1,33 @@
|
||||||
|
using System;
|
||||||
|
using ConformalDecals.Util;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
namespace ConformalDecals.Tweakables {
|
||||||
|
[AttributeUsage(AttributeTargets.Field)]
|
||||||
|
public abstract class TweakableData : System.Attribute, ISerializationCallbackReceiver {
|
||||||
|
public string name;
|
||||||
|
|
||||||
|
public bool adjustable = true;
|
||||||
|
public string adjustableKey;
|
||||||
|
|
||||||
|
// public string fieldChangedCallback;
|
||||||
|
public bool useSymmetry = true;
|
||||||
|
|
||||||
|
protected TweakableData(string name) {
|
||||||
|
this.name = name;
|
||||||
|
adjustableKey = name + "Adjustable";
|
||||||
|
}
|
||||||
|
|
||||||
|
public virtual void Load(ConfigNode node) {
|
||||||
|
ParseUtil.ParseBoolIndirect(ref adjustable, node, adjustableKey);
|
||||||
|
}
|
||||||
|
|
||||||
|
public virtual void Apply(BaseField baseField, PartModule module) {
|
||||||
|
baseField.guiActiveEditor = adjustable;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void OnBeforeSerialize() { }
|
||||||
|
|
||||||
|
public void OnAfterDeserialize() { }
|
||||||
|
}
|
||||||
|
}
|
30
Source/ConformalDecals/Tweakables/TweakableDataCollection.cs
Normal file
30
Source/ConformalDecals/Tweakables/TweakableDataCollection.cs
Normal file
|
@ -0,0 +1,30 @@
|
||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using UniLinq;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
namespace ConformalDecals.Tweakables {
|
||||||
|
public class TweakableDataCollection : IEnumerable<TweakableData>, ISerializationCallbackReceiver {
|
||||||
|
public readonly Dictionary<string, TweakableData> tweakables = new Dictionary<string, TweakableData>();
|
||||||
|
|
||||||
|
[SerializeField] private TweakableData[] _serializedTweakables;
|
||||||
|
|
||||||
|
public IEnumerator<TweakableData> GetEnumerator() {
|
||||||
|
return tweakables.Values.GetEnumerator();
|
||||||
|
}
|
||||||
|
|
||||||
|
IEnumerator IEnumerable.GetEnumerator() {
|
||||||
|
return GetEnumerator();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void OnBeforeSerialize() {
|
||||||
|
_serializedTweakables = tweakables.Values.ToArray();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void OnAfterDeserialize() {
|
||||||
|
foreach (var tweakable in _serializedTweakables) {
|
||||||
|
tweakables.Add(tweakable.name, tweakable);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
56
Source/ConformalDecals/Tweakables/TweakableSlider.cs
Normal file
56
Source/ConformalDecals/Tweakables/TweakableSlider.cs
Normal file
|
@ -0,0 +1,56 @@
|
||||||
|
using System;
|
||||||
|
using ConformalDecals.Util;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
namespace ConformalDecals.Tweakables {
|
||||||
|
[AttributeUsage(AttributeTargets.Field)]
|
||||||
|
public class TweakableSlider : TweakableData {
|
||||||
|
// The default value for the slider
|
||||||
|
public float defaultValue;
|
||||||
|
public string defaultValueKey;
|
||||||
|
|
||||||
|
// The range of the slider as a vector of <min, max>
|
||||||
|
public float min = 0;
|
||||||
|
public float max = 1;
|
||||||
|
public string rangeKey;
|
||||||
|
|
||||||
|
// The step size of the slider
|
||||||
|
public float step;
|
||||||
|
public string stepKey;
|
||||||
|
|
||||||
|
public TweakableSlider(string name) : base(name) {
|
||||||
|
defaultValueKey = name + "Default";
|
||||||
|
rangeKey = name + "Range";
|
||||||
|
stepKey = name + "Step";
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void Load(ConfigNode node) {
|
||||||
|
base.Load(node);
|
||||||
|
|
||||||
|
var range = new Vector2(min, max);
|
||||||
|
ParseUtil.ParseVector2Indirect(ref range, node, rangeKey);
|
||||||
|
min = Mathf.Max(Mathf.Epsilon, range.x);
|
||||||
|
max = Mathf.Max(min, range.y);
|
||||||
|
|
||||||
|
ParseUtil.ParseFloatIndirect(ref step, node, stepKey);
|
||||||
|
|
||||||
|
if (!HighLogic.LoadedSceneIsEditor && !HighLogic.LoadedSceneIsFlight) {
|
||||||
|
ParseUtil.ParseFloatIndirect(ref defaultValue, node, defaultValueKey);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void Apply(BaseField baseField, PartModule module) {
|
||||||
|
base.Apply(baseField, module);
|
||||||
|
var uiControlEditor = (UI_FloatRange) baseField.uiControlEditor;
|
||||||
|
|
||||||
|
uiControlEditor.minValue = min;
|
||||||
|
uiControlEditor.maxValue = max;
|
||||||
|
uiControlEditor.stepIncrement = step;
|
||||||
|
|
||||||
|
// Set the default value on first load
|
||||||
|
if (!HighLogic.LoadedSceneIsEditor && !HighLogic.LoadedSceneIsFlight) {
|
||||||
|
baseField.FieldInfo.SetValue(module, defaultValue);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
34
Source/ConformalDecals/Tweakables/TweakableToggle.cs
Normal file
34
Source/ConformalDecals/Tweakables/TweakableToggle.cs
Normal file
|
@ -0,0 +1,34 @@
|
||||||
|
using System;
|
||||||
|
using System.Reflection;
|
||||||
|
using ConformalDecals.Util;
|
||||||
|
|
||||||
|
namespace ConformalDecals.Tweakables {
|
||||||
|
[AttributeUsage(AttributeTargets.Field)]
|
||||||
|
public class TweakableToggle : TweakableData {
|
||||||
|
// The default value for the toggle
|
||||||
|
public bool defaultValue;
|
||||||
|
public string defaultValueKey;
|
||||||
|
|
||||||
|
public TweakableToggle(string name) : base(name) {
|
||||||
|
defaultValueKey = name + "Default";
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void Load(ConfigNode node) {
|
||||||
|
base.Load(node);
|
||||||
|
|
||||||
|
// Set the default value on first load
|
||||||
|
if (!HighLogic.LoadedSceneIsEditor && !HighLogic.LoadedSceneIsFlight) {
|
||||||
|
ParseUtil.ParseBoolIndirect(ref defaultValue, node, defaultValueKey);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void Apply(BaseField baseField, PartModule module) {
|
||||||
|
base.Apply(baseField, module);
|
||||||
|
|
||||||
|
// Set the default value on first load
|
||||||
|
if (!HighLogic.LoadedSceneIsEditor && !HighLogic.LoadedSceneIsFlight) {
|
||||||
|
baseField.FieldInfo.SetValue(module, defaultValue);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,7 +1,6 @@
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
using UniLinq;
|
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
|
|
||||||
namespace ConformalDecals.Util {
|
namespace ConformalDecals.Util {
|
||||||
|
@ -32,7 +31,7 @@ namespace ConformalDecals.Util {
|
||||||
|
|
||||||
public static string ParseString(ConfigNode node, string valueName, bool isOptional = false, string defaultValue = "") {
|
public static string ParseString(ConfigNode node, string valueName, bool isOptional = false, string defaultValue = "") {
|
||||||
if (node.HasValue(valueName)) return node.GetValue(valueName);
|
if (node.HasValue(valueName)) return node.GetValue(valueName);
|
||||||
|
|
||||||
if (isOptional) {
|
if (isOptional) {
|
||||||
return defaultValue;
|
return defaultValue;
|
||||||
}
|
}
|
||||||
|
@ -121,7 +120,6 @@ namespace ConformalDecals.Util {
|
||||||
|
|
||||||
public static bool ParseMatrix4x4Indirect(ref Matrix4x4 value, ConfigNode node, string valueName) {
|
public static bool ParseMatrix4x4Indirect(ref Matrix4x4 value, ConfigNode node, string valueName) {
|
||||||
return ParseValueIndirect(ref value, node, valueName, ParseUtil.TryParseMatrix4x4);
|
return ParseValueIndirect(ref value, node, valueName, ParseUtil.TryParseMatrix4x4);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static T ParseValue<T>(ConfigNode node, string valueName, TryParseDelegate<T> tryParse, bool isOptional = false, T defaultValue = default) {
|
public static T ParseValue<T>(ConfigNode node, string valueName, TryParseDelegate<T> tryParse, bool isOptional = false, T defaultValue = default) {
|
||||||
|
|
115
changelog.txt
115
changelog.txt
|
@ -1,115 +0,0 @@
|
||||||
v0.2.7
|
|
||||||
------
|
|
||||||
- Supported KSP versions: 1.8.x to 1.11.x
|
|
||||||
- Notes:
|
|
||||||
- Attaching decal parts in flight using engineer kerbals is not supported.
|
|
||||||
- Fixes:
|
|
||||||
- Fixed certain non-ascii strings not rendering correctly under certain circumstances.
|
|
||||||
- Yet another attempted fix for the planet text glitch.
|
|
||||||
|
|
||||||
v0.2.6
|
|
||||||
------
|
|
||||||
- Fixes:
|
|
||||||
- Fixed stock flags appearing stretched by forcing their aspect ratio to be correct.
|
|
||||||
- Another attempted fix for the planet text glitch.
|
|
||||||
|
|
||||||
v0.2.5
|
|
||||||
------
|
|
||||||
- Fixes:
|
|
||||||
- Fixed line spacing, character spacing, and vertical settings not applying to symmetry counterparts
|
|
||||||
|
|
||||||
v0.2.4
|
|
||||||
------
|
|
||||||
- Fixes:
|
|
||||||
- Fixed red text appearing on planets due to KSP bug by clearing render textures afterwards.
|
|
||||||
- Fixed fonts not saving correctly.
|
|
||||||
- Changes:
|
|
||||||
- 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.
|
|
||||||
|
|
||||||
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.
|
|
||||||
- Fixed broken saving of text decals in certain circumstances.
|
|
||||||
|
|
||||||
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
|
|
Loading…
Reference in New Issue
Block a user