Configurator #467
Merged
Configurator #467
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…oject instead of clicking it
…it is not yet completely tested. Also some features are missing, such as arranging the modules at the same position as when they were saved. Also exception checks are missing completely, so beware. Still, better than no import
…ues. Also encountered new issues with inconsistent naming in lua project files, fix is in progress
… reads the confPos of the corresponding modules. Adapted the load function to now correctly read and load modules if the name in the lua file does not contain the project name (see testspheres.lua for example)
check of separate configurator changes
…would go out of bounds and added a feature: pressing middle mousebutton while hovered over a module now removes the (top) module
…e in the lua loadfunction caused errors
…slashes got doubled every time the file was read
tobiasrau
requested changes
Nov 7, 2019
Comment on lines
401
to
407
| <<<<<<< HEAD | ||
| gl_FragColor = vec4(LocalLighting(ray, normal, lightPos.xyz, color), 1.0); | ||
| ======= | ||
| normal = rotMatIT * normal; | ||
| ray = rotMatIT * ray; | ||
| gl_FragColor = vec4(LocalLighting(ray, normal, lightDir.xyz, color), 1.0); | ||
| >>>>>>> upstream/master |
There was a problem hiding this comment.
There is definitely something wrong...
tobiasrau
added
missing in changelog
tobiasrau
approved these changes
Nov 11, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
lua import and slot name highlighting with right click connection