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.

Sign up for GitHub

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

Jump to bottom

[QLC+ 5] partial support of multi head fixture in 3D preview #1158

Merged
merged 58 commits into from Nov 16, 2018
Merged

[QLC+ 5] partial support of multi head fixture in 3D preview #1158

merged 58 commits into from Nov 16, 2018

Conversation

mcallegari
Copy link
Owner

This PR adds 2 new fixture types (LED bar beams/pixels) and the ability to preview them in 3D.
This also adds a new information to definitions called "Layout" which indicates the columns x rows layout of physical light emitters.
Fixture definitions have been reviewed accordingly.
Beam LED bars are still a work in progress cause of an issue in multi beam scattering.

Erkaman and others added 30 commits July 31, 2018 00:43
@Erkaman
Add a component GenericScreenQuadEntity, that will make it easier to …
5e4dfa3 
…add more fullscreen passes. It was utilized to remove ScreenQuadBlitEntity and ScreenQaudFXAAEntity
@Erkaman
add a single pass of bloom, on the brightness texture.
91dbcc1
@Erkaman
apply several blur filters in a row, for a bigger blur radius. Apply …
f851bc7 
…the bloom texture, in the gamma_correct.frag shader
@mcallegari
engine: add more fixture types to distinguish LED bars
02fc3e0
@mcallegari
qmlui: started to work on LED bars
12517c6
@mcallegari
fixtureeditor: expose LED bar types to the UI
2db5bf0
@mcallegari
resources: make use of LED bar fixture types
edcbbfe
@mcallegari
resources: add icons for new fixture types
6eb5acd
@mcallegari
qmlui: prepare to accept a fixture item without an external mesh
b5bb200
@mcallegari
resources: fix fixture schema with new types
abcaebe
@Erkaman
merge
a5e99cc
@mcallegari
engine: add more fixture types to distinguish LED bars
5dd09df
@mcallegari
qmlui: started to work on LED bars
ae27ba8
@mcallegari
fixtureeditor: expose LED bar types to the UI
1e8ec65
@mcallegari
resources: make use of LED bar fixture types
d919c20
@mcallegari
resources: add icons for new fixture types
9d1f553
@mcallegari
qmlui: prepare to accept a fixture item without an external mesh
ca89d31
@mcallegari
resources: fix fixture schema with new types
21eb15c
@mcallegari
qmlui: resume working towards multi head 3D support
de81c30
@mcallegari
Merge branch 'multihead' of github.com:mcallegari/qlcplus into multihead
e9f3bd3
@Erkaman
wip on adding bloom to qlc+
97445f4
@mcallegari
qmlui: add a function to retrieve a head Entity and use it to create …
fcd42e5 
…SceneGraph
@mcallegari
qmlui: more fixes to get multiple heads working
fcac782
@Erkaman
bloom is working now
f01f3fe
@mcallegari
Merge branch 'master' into multihead
fe3b9f1
@mcallegari
qmlui: more changes towards multi head
14b25f8
@mcallegari
Merge branch 'master' into multihead
59b25da
@mcallegari
qmlui: fix wrong casts
7d342c2
@mcallegari
qmlui: fix access to head entity cones
0406cb5
@mcallegari
qmlui: preliminary working pixel bar
948a8c2
Erkaman and others added 27 commits November 4, 2018 03:17
@Erkaman
temporarily disable bloom
9c363b6
@Erkaman
Merge branch 'multihead' into add-bloom
63806b8
@Erkaman
3dview: first attempt at integrating bloom effect into qlc+. PixelBar…
1c12eb7 
…3DItem now receive a bloom effect
@mcallegari
Merge branch 'master' into multihead
d5b95ee
@mcallegari
Merge branch 'master' into multihead
7cae181
@mcallegari
qmlui: add missing properties to multi beam bar
db3dfb8 
However, there is still a major issue with scattering filter, not resolved yet
@Erkaman
Merge branch 'multihead' into add-bloom
ca6650e
@mcallegari
qmlui: more on multi beam bars
0f4a513
@Erkaman
Merge branch 'multihead' into add-bloom
85f0115
@Erkaman
3DView: now smoke amount affects the bloom radius
2d46155
@mcallegari
Merge branch 'master' into multihead
5e0cc19
@Erkaman
3DView: Fix incorrect merge. headEntity -> fixtureItem
4ac74b9
@mcallegari
Merge pull request #1155 from Erkaman/add-bloom
2003e26 
Add bloom effect
@mcallegari
qmlui: code cleanup
2f69c56
@mcallegari
qmlui: abstract a light entity and create it via Qt.createComponent
055e17b
@mcallegari
engine: add heads layout parameters to fixture definitions
1fcff7d 
Reference #1156
@mcallegari
resources: add single head check to fixture validation
92af0dd
@mcallegari
resources: set layout of multi head fixtures
c3ab4dc 
Reference #1156
@mcallegari
resources: fix fixture schema
2647345
@mcallegari
engine: fix physical test unit
f701d78
@mcallegari
qmlui: increase the fixture counter earlier in 3D preview
a87c738 
Add a helper method to print the 3D framegraph
@mcallegari
qmlui: make fixture meshes darker
b044f6a 
To see them on a stage
@mcallegari
qmlui: some more 3D preview cleanup
2f32a6a
@mcallegari
qmlui: move textures away from RenderTarget for easier access
f4340cc 
Load QML component just once when building the framegraph
@mcallegari
qmlui: render PNG gobos too
b260dae
@mcallegari
qmlui: perform 3D rotations on absolute axes instead of relative
9ee0aae 
Otherwise it is impossible to achieve some rotations
@mcallegari
qmlui: a few improvements on rotations and bars
3754389
@mcallegari mcallegari merged commit ce97460 into master Nov 16, 2018
@coveralls
Copy link

Coverage Status

Coverage increased (+0.04%) to 30.897% when pulling 3754389 on multihead into 418bd7f on master.

@mcallegari mcallegari deleted the multihead branch November 23, 2018 10:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@mcallegari @coveralls @Erkaman