YourWishes/Dawn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Totally refactored UILabel

Browse Source
This commit is contained in:
Dominic Masters
2023-03-05 23:42:15 -08:00
parent aeb5014a07
commit ee2dc931f2
15 changed files with 463 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/dawn/display/RenderPipeline.cpp
View File

@ -132,7 +132,6 @@ void RenderPipeline::renderSceneCamera(Scene *scene, Camera *camera) {
auto itCanvas = canvases.begin();
while(itCanvas != canvases.end()) {
auto canvas = *itCanvas;
glm::mat4 model;
glm::mat4 projection;
glm::mat4 view;
@ -140,32 +139,23 @@ void RenderPipeline::renderSceneCamera(Scene *scene, Camera *camera) {
case UI_DRAW_TYPE_WORLD_ABSOLUTE:
projection = camera->getProjection();
view = camera->transform->getWorldTransform();
model = canvas->transform->getWorldTransform();
break;
case UI_DRAW_TYPE_WORLD_CAMERA_RELATIVE:
projection = glm::ortho(0.0f, renderTarget->getWidth(), renderTarget->getHeight(), 0.0f);
view = glm::mat4(1.0f);
model = canvas->transform->getWorldTransform();
break;
default:
assertUnreachable();
}
auto renderables = canvas->item->findChildrenDeep<UIComponentRendaerable>();
auto renderables = canvas->item->findChildrenDeep<UIComponentRenderable>();
auto itChild = renderables.begin();
while(itChild != renderables.end()) {
vectorAppend(&shaderPassItems,(*itChild)->getPassItems(projection, view));
++itChild;
}
// auto itChild = canvas->children.begin();
// while(itChild != canvas->children.end()) {
// vectorAppend(&shaderPassItems, (*itChild)->getPassItems(
// projection, view, model
// ));
// ++itChild;
// }
++itCanvas;
}