Reworked geometry memory management #259
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tribal-tec
approved these changes
Dec 14, 2017
brayns/common/geometry/Cone.h
Outdated
| { | ||
| _centerRadius = radius; | ||
| center = c; |
brayns/common/geometry/Cylinder.h
Outdated
| Cylinder(const Vector3f c, const Vector3f u, const float r, | ||
| const float ts = 0.f, const Vector2f v = Vector2f(0.f, 0.f)) | ||
| { | ||
| center = c; |
brayns/common/geometry/Sphere.h
Outdated
| Sphere(const Vector3f c, float r, float ts = 0.f, | ||
| const Vector2f v = Vector2f(0.f, 0.f)) | ||
| { | ||
| center = c; |
brayns/common/scene/Scene.cpp
Outdated
| } | ||
|
|
||
| size_t material = NB_SYSTEM_MATERIALS + 7; | ||
|
|
||
| // Sphere | ||
| { | ||
| _spheres[material].push_back( | ||
| SpherePtr(new Sphere(Vector3f(0.25f, 0.26f, 0.30f), 0.25f))); | ||
| addSphere(material, Sphere(Vector3f(0.25f, 0.26f, 0.30f), 0.25f)); |
There was a problem hiding this comment.
brace-initializers {} should work too, so you can omit the redundant Sphere()
brayns/common/scene/Scene.cpp
Outdated
| { | ||
| ++material; | ||
| addCylinder(material, Cylinder(Vector3f(0.25f, 0.126f, 0.75f), |
brayns/common/scene/Scene.cpp
Outdated
| { | ||
| ++material; | ||
| addCone(material, Cone(Vector3f(0.75f, 0.01f, 0.25f), |
There was a problem hiding this comment.
dito. Actually also for Vector3f
| @@ -621,4 +605,68 @@ bool Scene::empty() const | |||
| return _spheres.empty() && _cylinders.empty() && _cones.empty() && | |||
| _trianglesMeshes.empty(); | |||
| } | |||
|
|
|||
| uint64_t Scene::addSphere(const size_t materialId, const Sphere& sphere) | |||
There was a problem hiding this comment.
We could consider using Sphere&&. i guess usually things will be moved it here
brayns/io/MorphologyLoader.cpp
Outdated
| TrianglesMeshMap& _trianglesMeshes; | ||
| MaterialsMap& _materials; | ||
| Boxf& _worldBounds; | ||
| void add(const size_t materialId, const Sphere& sphere) |
There was a problem hiding this comment.
use addSphere etc. here also to be consistent with Scene?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.