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

adding block statements to Technique to retain any added Defines #331

Merged
merged 4 commits into from
Jun 2, 2022

Conversation

neph1
Copy link
Contributor

@neph1 neph1 commented May 11, 2022

Maybe something for 3.5

@neph1
Copy link
Contributor Author

neph1 commented May 16, 2022

One might argue that defines don't belong in shader nodes, which i guess is true for pure shader nodes. I'm however working on a hybrid PBR model ref here which uses them to define textures (like PBRLighting). Possibly this is unnecessary duplication, since there is a DefinitionsBlock used in other places.

@neph1
Copy link
Contributor Author

neph1 commented May 20, 2022

This is included in #334

Copy link
Member

@MeFisto94 MeFisto94 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking good besides the whitespace changes.
Do you know why they happen (i.e. what is the Line Endings in the file? Or is it coming from tabs vs spaces?)

import java.util.List;

/**
* A statement that will be enclosed with curly braces
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice!

@neph1
Copy link
Contributor Author

neph1 commented May 26, 2022

Looking good besides the whitespace changes. Do you know why they happen (i.e. what is the Line Endings in the file? Or is it coming from tabs vs spaces?)

I think it's line endings, why I don't know. I use "autocrlf = false". But mostly I don't know what to do about it. I could try "autocrlf = input" and create a new branch from master and see if it helps.

@neph1
Copy link
Contributor Author

neph1 commented May 27, 2022

Ok. I have this plugin in netbeans from before that shows the type of line ending. It seems a lot of files have windows encoding (clrf). I probably had git set to change to unix endings (lf) before. But I have changed that since I started noticing these issues and I just tried reverting Uberstatement to the one on the server and reapply the change I did. And now it retains the clrf ending. So I could redo those files that have the problems.

@neph1 neph1 merged commit 491b192 into jMonkeyEngine:master Jun 2, 2022
@neph1 neph1 deleted the 329-fixes_deleted_defines branch May 6, 2023 07:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants