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

Font rendering #16

Merged
merged 20 commits into from
Dec 23, 2021
Merged

Font rendering #16

merged 20 commits into from
Dec 23, 2021

Conversation

ravi688
Copy link
Owner

@ravi688 ravi688 commented Dec 23, 2021

No description provided.

… TextureMapping

# Conflicts:
#	source/renderer/shader.c
1. Added ttf2mesh submodule
2. Added color_shader.glsl and texture_shader.glsl
3. Added time.h & time.c
4. Added text_mesh.h
stack_newv() was defined as heap_alloc resulting memory leak.
Header: include/renderer/internal/vulkan/vulkan_buffer.h
Source: source/renderer/vulkan/vulkan_buffer.c
… FontRendering

# Conflicts:
#	include/renderer/internal/vulkan/vulkan_mesh.h
#	source/renderer/material.c
#	source/renderer/mesh.c
#	source/renderer/vulkan/vulkan_mesh.c
#	testbed/resource/shaders/albedo_shader.glsl
#	testbed/resource/shaders/color_shader.glsl
#	testbed/resource/shaders/diffuse.glsl
#	testbed/resource/shaders/instanced_color_shader.glsl
#	testbed/resource/shaders/texture_shader.glsl
#	testbed/source/main.c
@ravi688 ravi688 added the enhancement New feature or request label Dec 23, 2021
@ravi688 ravi688 self-assigned this Dec 23, 2021
@ravi688 ravi688 merged commit 7fe2d60 into main Dec 23, 2021
@ravi688 ravi688 deleted the FontRendering branch December 23, 2021 13:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant