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.

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

Reworked material management #264

Merged
merged 6 commits into from
Dec 21, 2017
Merged

Reworked material management #264

merged 6 commits into from
Dec 21, 2017

Conversation

favreau
Copy link
Member

@favreau favreau commented Dec 20, 2017

No description provided.

@tribal-tec
Copy link
Contributor

your change shouldn't affect the visual appearance, so why the testdata has to be updated? Or it was broken before?

@tribal-tec
Copy link
Contributor

The update of CMake/common is necessary? It's the latest version?

@@ -98,15 +98,16 @@ class Engine

/**
Initializes materials for the current scene
@param materialType Predefined sets of colors
@param colorMap Predefined color map
MT_DEFAULT: Random colors
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

those MT_* values are no longer correct, no?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doc is now in the types.h file. Removed.

for (size_t i = 0; i < 6; ++i)
// Cornell box
Material material;
material.setColor(colors[i]);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

constructor for Material to take some/all of this values?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hum... it's either all or none, some would be a bit weird to me. And having them all makes it a long list of arguments. Maybe another idea would to be to define some presets, like Metal, Glass, etc?

file.write((char*)&boolean, sizeof(bool));
// TODO: Textures
}

// Save geometry
for (auto& material : _materials)
;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rm

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done


/**
Commit materials to renderers
@param updateOnly If true, materials are not recreated and textures are
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wrong doc

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

@@ -33,6 +33,9 @@

#include <brayns/common/scene/Scene.h>

#define BRAYNS_USE_ASSIMP \
1 //************* REMOVE BEFORE PUSH ******************
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

??

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comment was obliviously not big enough... 🙈

@favreau
Copy link
Member Author

favreau commented Dec 20, 2017

Regarding the new test file, the current one is broken and does now process material. This PR fixes the problem.

@favreau favreau merged commit 86e6992 into BlueBrain:master Dec 21, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants