Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/material properties rework #17

Merged
merged 44 commits into from
Sep 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
10b77ba
Material properties init
PassiveModding Sep 1, 2024
6680584
UI Updates + lightshaft and bg init work
PassiveModding Sep 2, 2024
1ce93f3
BgColorChange & various other material things
PassiveModding Sep 2, 2024
bd6d1df
wip
PassiveModding Sep 4, 2024
ebbe6d1
More wip
PassiveModding Sep 5, 2024
9c105c1
Update .gitignore
PassiveModding Sep 5, 2024
3eec38d
Blend seems better here
PassiveModding Sep 5, 2024
5527e80
Update .gitignore
PassiveModding Sep 5, 2024
ee1d082
Update BgMaterialBuilder.cs
PassiveModding Sep 5, 2024
e01e0d7
Performance improvements
PassiveModding Sep 5, 2024
adb2a09
Naming changes
PassiveModding Sep 5, 2024
5c279b5
Init blender plugin
PassiveModding Sep 5, 2024
80b9678
Set bg.shpk IOR to 1.0
PassiveModding Sep 5, 2024
d9703d0
Handle errors
PassiveModding Sep 5, 2024
10bfb02
yawn
PassiveModding Sep 5, 2024
4bd65ea
Avoid computing any bg materials
PassiveModding Sep 5, 2024
80fb21b
Only apply volume to skin and iris
PassiveModding Sep 6, 2024
dd483e8
Init refactor to support legacy color table
PassiveModding Sep 6, 2024
cab0727
Add param for swapping bg channels
PassiveModding Sep 6, 2024
e7c5eea
Kill blue channel in bg normals
PassiveModding Sep 6, 2024
e1ed9b0
Include spec and remove swap based on key
PassiveModding Sep 7, 2024
39cb0ac
Always include color if paintbuilder is used
PassiveModding Sep 7, 2024
5950c8f
Bump SharpGLTF to 1.0.2 (fixes IOR issues)
PassiveModding Sep 7, 2024
3b22933
More keys + set IOR on all materials
PassiveModding Sep 7, 2024
e0ccc1f
Correct some names
PassiveModding Sep 8, 2024
870af1b
Tangent auto correction
PassiveModding Sep 8, 2024
9e3833f
Found light colour influence :D
PassiveModding Sep 9, 2024
321675b
Lighting init
PassiveModding Sep 11, 2024
0088a56
Update Material.cs
PassiveModding Sep 11, 2024
f3e775d
Add ktisis credit for lighting structs
PassiveModding Sep 11, 2024
15eed8b
Attach support returns
PassiveModding Sep 13, 2024
23b5e3f
skip lights with 0 range
PassiveModding Sep 13, 2024
83a9db7
Staining support & blender plugin cleanup
PassiveModding Sep 13, 2024
da19577
Allow animation exports to specify directory
PassiveModding Sep 15, 2024
82c9cf4
More shader keys
PassiveModding Sep 15, 2024
daa8b38
Update blender addon buttons
PassiveModding Sep 15, 2024
d98e4a8
Create blender.yml
PassiveModding Sep 15, 2024
0f59b37
Bump
PassiveModding Sep 15, 2024
40ad6db
Update blender.yml
PassiveModding Sep 15, 2024
c7d8dd4
Update blender.yml
PassiveModding Sep 15, 2024
e5bce51
Add manifest
PassiveModding Sep 15, 2024
4be3af2
Bump pipeline versions
PassiveModding Sep 15, 2024
27d5ce8
Update blender.yml
PassiveModding Sep 15, 2024
d6cfb0d
Include blender plugin in release
PassiveModding Sep 15, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions .github/workflows/blender.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: Blender Release

# Add a concurrency group incase a tag is created, deleted, and then recreated while a release is in progress.
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

on:
push:
paths:
- 'Blender/**'
- '.github/workflows/blender.yml'

permissions:
contents: write

jobs:
BlenderRelease:
if: github.event.pull_request.draft == false # Ignore draft PRs
runs-on: ubuntu-latest
defaults:
run:
shell: bash
steps:
- name: Checkout Repository
uses: actions/checkout@v4

- name: Upload Artifact
uses: actions/upload-artifact@v4
with:
name: MeddleTools
path: Blender/
14 changes: 10 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ jobs:
IsCI: true
steps:
- name: Checkout Repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: true # Grab any submodules that may be required

- name: Setup .NET
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: 7.0.x

Expand All @@ -52,21 +52,27 @@ jobs:
working-directory: Meddle/Meddle.Plugin/bin/Release/Meddle.Plugin
run: |
sha512sum latest.zip >> checksums.sha512

- name: Zip Blender Plugin
working-directory: Blender/
run: |
zip -r MeddleTools.zip .

- name: Create GitHub Release
uses: softprops/action-gh-release@v1
with:
files: |
Meddle/Meddle.Plugin/bin/Release/Meddle.Plugin/latest.zip
Meddle/Meddle.Plugin/bin/Release/Meddle.Plugin/checksums.sha512
Blender/MeddleTools.zip
prerelease: false # Releases cant be marked as prereleases as Dalamud wont be able to find them
append_body: true # Append the release notes to the release body
body_path: .github/release-notices.md # These notes are automatically added to the release body every time.
generate_release_notes: true # Automatically makes a release body from PRs since the last release.
fail_on_unmatched_files: true # If the files arent found, fail the workflow and abort the release.

- name: Upload Artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Release Artifacts
path: |
Expand All @@ -92,4 +98,4 @@ jobs:
git config --local user.email "[email protected]"
git commit -m "Update repo.json for ${{ github.ref_name }}"

git push origin HEAD:main
git push origin HEAD:main
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ jobs:
IsCI: true
steps:
- name: Checkout Repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0 # We don't need the history for testing builds, so we can save some time by not fetching it
submodules: true # Grab any submodules that may be required

- name: Setup .NET
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: ${{ matrix.dotnet-version }}

Expand All @@ -56,7 +56,7 @@ jobs:
run: dotnet build -c Release --no-restore --nologo

- name: Upload Artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Build Artifacts
path: Meddle/Meddle.Plugin/bin/
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ riderModule.iml
.idea/*
/.vs/

.venv/
__pycache__/

# Created by https://www.toptal.com/developers/gitignore/api/intellij
# Edit at https://www.toptal.com/developers/gitignore?templates=intellij

Expand Down
Binary file modified AttachStuff.rcnet
Binary file not shown.
Loading
Loading