-
Notifications
You must be signed in to change notification settings - Fork 76
Adds Texture Upload and Custom Uniforms #15
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
Open
alexottoboni
wants to merge
29
commits into
BKcore:master
Choose a base branch
from
alexottoboni:cleanup-uniforms
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains hidden or 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
Custom model files can be uploaded by the user from an additional menu bar item. They will appear in the dropdown model selection list and can be selected like any other model. Once the user refreshes the page the user provided models will no longer be available. This pull also includes josepharhar's build.js, package.json, gitignore, and README changes. It made it much easier to work with this project since the generated JS files don't need to be manually modified and it is easier to build the project by simply running `npm install` then `npm start`. If he likes I can remove those changes from this pull and he can submit them seperately. Working with
Vec4 parse code was broken. Fixed now. Added some syntax error messages for uniform assignment.
Users can upload custom textures to apply to their models. They can also add custom Uniform variables that are float, int, bools, vec2, vec3, vec4, or sampler2d. After a texture is uploaded it can be accessed by specifying the filename in the uniforms tab. In the default text for Uniform there is a default texture specified as `sampler2D my_texture = "textures/beanie.jpg";` There is a new snippet showing how to apply a texture that is available in the Uniforms tab. The uniforms tab now highlights parsing errors.
Thanks for submitting this. |
@BKcore, Hey! So, how your vacation? Are you alive? :D |
Up :) |
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.
Users can upload custom textures to apply to their models. They can also
add custom Uniform variables that are float, int, bools, vec2, vec3, vec4,
or sampler2D.
After a texture is uploaded it can be accessed by specifying the filename in
the uniforms tab. In the default text for Uniform there is a default texture
specified as
sampler2D my_texture = "textures/beanie.jpg";
If a custom uploaded model has UV coordinates, then they can be used to map the texture to the model.
There is a new snippet showing how to apply a texture that is available
in the Uniforms tab.
The uniforms tab now highlights parsing errors.
Draw distance is increased.
When Shdr is opened the pause/play button shows play instead of pause.
I took the beanie texture picture, MIT license. If someone has a better default texture we can use that instead.
@atran67

@josepharhar