Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
K
Kayak UI 0.11
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Microhacks
Bevy Forks
Kayak UI 0.11
Commits
16aefe40
Commit
16aefe40
authored
2 years ago
by
John Mitchell
Browse files
Options
Downloads
Patches
Plain Diff
Fixed issue with clipping
parent
4ab3e0c1
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/render/material/pipeline.rs
+8
-1
8 additions, 1 deletion
src/render/material/pipeline.rs
src/render/unified/pipeline.rs
+7
-6
7 additions, 6 deletions
src/render/unified/pipeline.rs
with
15 additions
and
7 deletions
src/render/material/pipeline.rs
+
8
−
1
View file @
16aefe40
...
@@ -365,6 +365,14 @@ pub fn queue_material_ui_quads<M: MaterialUI>(
...
@@ -365,6 +365,14 @@ pub fn queue_material_ui_quads<M: MaterialUI>(
},
},
);
);
if
quad
.quad_type
==
UIQuadType
::
Clip
{
previous_clip_rect
=
quad
.rect
;
}
if
previous_clip_rect
.width
()
<
1.0
||
previous_clip_rect
.height
()
<
1.0
{
continue
;
}
queue_quads_inner
(
queue_quads_inner
(
&
mut
commands
,
&
mut
commands
,
&
render_device
,
&
render_device
,
...
@@ -382,7 +390,6 @@ pub fn queue_material_ui_quads<M: MaterialUI>(
...
@@ -382,7 +390,6 @@ pub fn queue_material_ui_quads<M: MaterialUI>(
&
mut
quad_meta
,
&
mut
quad_meta
,
&
mut
quad
,
&
mut
quad
,
camera_entity
,
camera_entity
,
&
mut
previous_clip_rect
,
*
quad_types_offsets
,
*
quad_types_offsets
,
&
mut
current_batch
,
&
mut
current_batch
,
&
mut
current_batch_entity
,
&
mut
current_batch_entity
,
...
...
This diff is collapsed.
Click to expand it.
src/render/unified/pipeline.rs
+
7
−
6
View file @
16aefe40
...
@@ -654,6 +654,13 @@ pub fn queue_quads(queue_quads: QueueQuads) {
...
@@ -654,6 +654,13 @@ pub fn queue_quads(queue_quads: QueueQuads) {
let
spec_pipeline
=
pipelines
.specialize
(
&
mut
pipeline_cache
,
&
quad_pipeline
,
key
);
let
spec_pipeline
=
pipelines
.specialize
(
&
mut
pipeline_cache
,
&
quad_pipeline
,
key
);
for
quad
in
extracted_quads
.iter_mut
()
{
for
quad
in
extracted_quads
.iter_mut
()
{
if
quad
.quad_type
==
UIQuadType
::
Clip
{
previous_clip_rect
=
quad
.rect
;
}
if
previous_clip_rect
.width
()
<
1.0
||
previous_clip_rect
.height
()
<
1.0
{
continue
;
}
queue_quads_inner
(
queue_quads_inner
(
&
mut
commands
,
&
mut
commands
,
&
render_device
,
&
render_device
,
...
@@ -671,7 +678,6 @@ pub fn queue_quads(queue_quads: QueueQuads) {
...
@@ -671,7 +678,6 @@ pub fn queue_quads(queue_quads: QueueQuads) {
&
mut
quad_meta
,
&
mut
quad_meta
,
quad
,
quad
,
camera_entity
,
camera_entity
,
&
mut
previous_clip_rect
,
*
quad_type_offsets
,
*
quad_type_offsets
,
&
mut
current_batch
,
&
mut
current_batch
,
&
mut
current_batch_entity
,
&
mut
current_batch_entity
,
...
@@ -698,7 +704,6 @@ pub fn queue_quads_inner(
...
@@ -698,7 +704,6 @@ pub fn queue_quads_inner(
quad_meta
:
&
mut
QuadMeta
,
quad_meta
:
&
mut
QuadMeta
,
quad
:
&
mut
ExtractedQuad
,
quad
:
&
mut
ExtractedQuad
,
camera_entity
:
Entity
,
camera_entity
:
Entity
,
previous_clip_rect
:
&
mut
Rect
,
quad_type_offsets
:
QuadTypeOffsets
,
quad_type_offsets
:
QuadTypeOffsets
,
current_batch
:
&
mut
QuadBatch
,
current_batch
:
&
mut
QuadBatch
,
current_batch_entity
:
&
mut
Entity
,
current_batch_entity
:
&
mut
Entity
,
...
@@ -708,10 +713,6 @@ pub fn queue_quads_inner(
...
@@ -708,10 +713,6 @@ pub fn queue_quads_inner(
return
;
return
;
}
}
if
quad
.quad_type
==
UIQuadType
::
Clip
{
*
previous_clip_rect
=
quad
.rect
;
}
match
quad
.quad_type
{
match
quad
.quad_type
{
UIQuadType
::
Quad
=>
quad
.type_index
=
quad_type_offsets
.quad_type_offset
,
UIQuadType
::
Quad
=>
quad
.type_index
=
quad_type_offsets
.quad_type_offset
,
UIQuadType
::
Text
=>
quad
.type_index
=
quad_type_offsets
.text_type_offset
,
UIQuadType
::
Text
=>
quad
.type_index
=
quad_type_offsets
.text_type_offset
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment