Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
BornAgain
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
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
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
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mlz
BornAgain
Commits
a9453d7d
Commit
a9453d7d
authored
2 years ago
by
Wuttke, Joachim
Browse files
Options
Downloads
Patches
Plain Diff
ba3d geo -> const/mutable
parent
1ceb9a9a
No related branches found
No related tags found
1 merge request
!1067
break include cycle in ba3d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
GUI/ba3d/model/object.cpp
+1
-1
1 addition, 1 deletion
GUI/ba3d/model/object.cpp
GUI/ba3d/model/object.h
+2
-2
2 additions, 2 deletions
GUI/ba3d/model/object.h
GUI/ba3d/view/canvas.h
+1
-0
1 addition, 0 deletions
GUI/ba3d/view/canvas.h
with
4 additions
and
3 deletions
GUI/ba3d/model/object.cpp
+
1
−
1
View file @
a9453d7d
...
@@ -98,7 +98,7 @@ void Object::releaseGeometry()
...
@@ -98,7 +98,7 @@ void Object::releaseGeometry()
m_geo
.
reset
();
m_geo
.
reset
();
}
}
const
Geometry
&
Object
::
geo
()
const
Geometry
&
Object
::
geo
()
const
{
{
if
(
!
m_geo
)
if
(
!
m_geo
)
m_geo
=
geometryStore
().
getGeometry
(
gky
);
m_geo
=
geometryStore
().
getGeometry
(
gky
);
...
...
This diff is collapsed.
Click to expand it.
GUI/ba3d/model/object.h
+
2
−
2
View file @
a9453d7d
...
@@ -44,7 +44,7 @@ public:
...
@@ -44,7 +44,7 @@ public:
void
setColor
(
QColor
color
)
{
m_color
=
color
;
}
void
setColor
(
QColor
color
)
{
m_color
=
color
;
}
bool
valid
()
const
{
return
!
isNull
;
}
bool
valid
()
const
{
return
!
isNull
;
}
const
Geometry
&
geo
();
const
Geometry
&
geo
()
const
;
const
QMatrix4x4
&
matrix
()
const
{
return
m_matrix
;
}
const
QMatrix4x4
&
matrix
()
const
{
return
m_matrix
;
}
protected
:
protected
:
...
@@ -54,7 +54,7 @@ private:
...
@@ -54,7 +54,7 @@ private:
QColor
m_color
;
QColor
m_color
;
Model
*
model
;
Model
*
model
;
GeometricID
::
Key
gky
;
GeometricID
::
Key
gky
;
GeometryHandle
m_geo
;
// retrieved on demand
mutable
GeometryHandle
m_geo
;
// retrieved on demand
QMatrix4x4
m_matrix
;
QMatrix4x4
m_matrix
;
void
releaseGeometry
();
// can be released whenever
void
releaseGeometry
();
// can be released whenever
...
...
This diff is collapsed.
Click to expand it.
GUI/ba3d/view/canvas.h
+
1
−
0
View file @
a9453d7d
...
@@ -58,6 +58,7 @@ public:
...
@@ -58,6 +58,7 @@ public:
Camera
*
cam
()
{
return
camera
;
}
Camera
*
cam
()
{
return
camera
;
}
// void drawObject(const Object
private
:
private
:
QRect
viewport
;
QRect
viewport
;
float
aspectRatio
,
colorBgR
,
colorBgG
,
colorBgB
;
float
aspectRatio
,
colorBgR
,
colorBgG
,
colorBgB
;
...
...
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