-
Notifications
You must be signed in to change notification settings - Fork 1.3k
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
feat: add vertex attribute bindings for short and byte #4906
Merged
Merged
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
24 changes: 24 additions & 0 deletions
24
...c/main/java/org/terasology/engine/rendering/assets/mesh/resource/VertexByteAttribute.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| // Copyright 2021 The Terasology Foundation | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| package org.terasology.engine.rendering.assets.mesh.resource; | ||
|
|
||
| public class VertexByteAttribute extends BaseVertexAttribute { | ||
| public final VertexByteAttribute.AttributeConfiguration configuration; | ||
|
|
||
| /** | ||
| * @param mapping maps a primitive to a given supported type. | ||
| * @param count the number elements that is described by the target | ||
| */ | ||
| protected VertexByteAttribute(VertexByteAttribute.AttributeConfiguration attributeConfiguration, | ||
| TypeMapping mapping, int count) { | ||
| super(mapping, count); | ||
| this.configuration = attributeConfiguration; | ||
| } | ||
|
|
||
| public interface AttributeConfiguration { | ||
| void write(byte value, int vertIdx, int offset, VertexResource resource); | ||
|
|
||
| byte read(int vertIdx, int offset, VertexResource resource); | ||
| } | ||
| } |
41 changes: 41 additions & 0 deletions
41
...java/org/terasology/engine/rendering/assets/mesh/resource/VertexByteAttributeBinding.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| // Copyright 2021 The Terasology Foundation | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| package org.terasology.engine.rendering.assets.mesh.resource; | ||
|
|
||
| public class VertexByteAttributeBinding extends VertexBinding { | ||
|
|
||
| private final VertexByteAttribute attribute; | ||
|
|
||
| public VertexByteAttributeBinding(VertexResource resource, int offset, VertexByteAttribute attribute) { | ||
| super(resource, offset); | ||
| this.attribute = attribute; | ||
| } | ||
|
|
||
| public int elements() { | ||
| return getResource().elements(); | ||
| } | ||
|
|
||
| @Override | ||
| public void reserve(int vertCount) { | ||
| resource.reserveElements(vertCount); | ||
| } | ||
|
|
||
| @Override | ||
| public void allocate(int elements) { | ||
| resource.allocateElements(elements); | ||
| resource.mark(); | ||
| } | ||
|
|
||
| public void put(byte value) { | ||
| resource.ensureElements(this.vertexIndex + 1); | ||
| attribute.configuration.write(value, this.vertexIndex, this.offset, resource); | ||
| this.vertexIndex++; | ||
| this.resource.mark(); | ||
| } | ||
|
|
||
| public void set(int index, byte value) { | ||
| attribute.configuration.write(value, index, this.offset, resource); | ||
| this.resource.mark(); | ||
| } | ||
| } |
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
24 changes: 24 additions & 0 deletions
24
.../main/java/org/terasology/engine/rendering/assets/mesh/resource/VertexShortAttribute.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| // Copyright 2021 The Terasology Foundation | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| package org.terasology.engine.rendering.assets.mesh.resource; | ||
|
|
||
| public class VertexShortAttribute extends BaseVertexAttribute { | ||
| public final VertexShortAttribute.AttributeConfiguration configuration; | ||
|
|
||
| /** | ||
| * @param mapping maps a primitive to a given supported type. | ||
| * @param count the number elements that is described by the target | ||
| */ | ||
| protected VertexShortAttribute(VertexShortAttribute.AttributeConfiguration attributeConfiguration, | ||
| TypeMapping mapping, int count) { | ||
| super(mapping, count); | ||
| this.configuration = attributeConfiguration; | ||
| } | ||
|
|
||
| public interface AttributeConfiguration { | ||
| void write(short value, int vertIdx, int offset, VertexResource resource); | ||
|
|
||
| short read(int vertIdx, int offset, VertexResource resource); | ||
| } | ||
| } |
41 changes: 41 additions & 0 deletions
41
...ava/org/terasology/engine/rendering/assets/mesh/resource/VertexShortAttributeBinding.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| // Copyright 2021 The Terasology Foundation | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| package org.terasology.engine.rendering.assets.mesh.resource; | ||
|
|
||
| public class VertexShortAttributeBinding extends VertexBinding { | ||
|
|
||
| private final VertexShortAttribute attribute; | ||
|
|
||
| public VertexShortAttributeBinding(VertexResource resource, int offset, VertexShortAttribute attribute) { | ||
| super(resource, offset); | ||
| this.attribute = attribute; | ||
| } | ||
|
|
||
| public int elements() { | ||
| return getResource().elements(); | ||
| } | ||
|
|
||
| @Override | ||
| public void reserve(int vertCount) { | ||
| resource.reserveElements(vertCount); | ||
| } | ||
|
|
||
| @Override | ||
| public void allocate(int elements) { | ||
| resource.allocateElements(elements); | ||
| resource.mark(); | ||
| } | ||
|
|
||
| public void put(short value) { | ||
| resource.ensureElements(this.vertexIndex + 1); | ||
| attribute.configuration.write(value, this.vertexIndex, this.offset, resource); | ||
| this.vertexIndex++; | ||
| this.resource.mark(); | ||
| } | ||
|
|
||
| public void set(int index, short value) { | ||
| attribute.configuration.write(value, index, this.offset, resource); | ||
| this.resource.mark(); | ||
| } | ||
| } |
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
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
you can verify this by starting CoreWorlds and giving a lava block and verifying the animations play correctly.