Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
libRendering
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
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
STORM
repos
Radium
libRendering
Commits
3fcd650b
Commit
3fcd650b
authored
4 years ago
by
Mathias Paulin
Browse files
Options
Downloads
Patches
Plain Diff
Typos in doc
parent
d248bc07
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/Mara/Gui/ControlDialogWindow.hpp
+1
-1
1 addition, 1 deletion
src/Mara/Gui/ControlDialogWindow.hpp
src/Mara/Gui/RendererControl.hpp
+15
-3
15 additions, 3 deletions
src/Mara/Gui/RendererControl.hpp
with
16 additions
and
4 deletions
src/Mara/Gui/ControlDialogWindow.hpp
+
1
−
1
View file @
3fcd650b
...
...
@@ -29,7 +29,7 @@ class InformationTab : public QWidget
~
InformationTab
()
override
=
default
;
/**@}*/
/// Di
a
ply the information about the file
/// Di
s
pl
a
y the information about the file
void
setFileInfo
(
const
QString
&
fileName
,
const
std
::
tuple
<
size_t
,
size_t
,
size_t
>&
sceneStats
);
...
...
This diff is collapsed.
Click to expand it.
src/Mara/Gui/RendererControl.hpp
+
15
−
3
View file @
3fcd650b
...
...
@@ -14,8 +14,17 @@ namespace Mara {
*
* Allow to switch from a renderer to the other and to select renderer outputs (textures).
*
* When a renderer is activated, this control is filld by the renderer specific control panel in
* When a renderer is activated, this control is fill
e
d by the renderer specific control panel in
* addition of the renderer common controlers.
*
* This gui presents the following interaction elements
* - Renderers combo box : filled by the set of rmanaged renderers, this combo box allow to
* switch from one renderer to another.
* - Camera buttons : two button, independant from the renderer, that allow to manage the active
* camera.
* - Renderer specific control : This control contains two things :
* - for any renderer, a combox to select the displayed AOV produced by the renderer.
* - A control panel specific to the active renderer to manage its internal state
*/
class
RendererControl
:
public
QFrame
,
private
Ui
::
RendererControler
{
...
...
@@ -38,7 +47,8 @@ class RendererControl : public QFrame, private Ui::RendererControler
* Add a renderer to the control panel
* @param rendererName The name that will appear in the renderer selection combobox.
* @param renderer A pointer to the renderer to add. The ownership is left to the caller.
* @param callback The function to call when a renderer is activated.
* @param callback The function to call to activate a renderer. Must return true if the
* activation succeed.
* @param controlPanel The renderer specific control gui.
*/
void
addRenderer
(
const
std
::
string
&
rendererName
,
...
...
@@ -50,7 +60,9 @@ class RendererControl : public QFrame, private Ui::RendererControler
/// Signal emitted when an internal state of the active renderer was changed.
void
rendererStateChanged
();
/// Signal emitted when the "fit camera" button is pressed
void
fitCamera
();
/// Signal emitted when the "Reset camera" is pressed
void
resetCamera
();
private
slots
:
...
...
@@ -61,7 +73,7 @@ class RendererControl : public QFrame, private Ui::RendererControler
void
changeTexture
(
const
std
::
string
&
texture
);
private:
/// The association between a renderer and its
callback
/// The association between a renderer and its
activation function
using
RendererInfo
=
std
::
pair
<
Ra
::
Engine
::
Renderer
*
const
,
std
::
function
<
bool
()
>>
;
/// The active renderer
int
m_currentRenderer
{
-
1
};
...
...
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