forked from blender/blender
Change log severity for better maintability #50
@ -61,6 +61,15 @@ void Engine::sync(Depsgraph *depsgraph, bContext *context)
|
||||
scene_delegate_->populate(depsgraph, context);
|
||||
}
|
||||
|
||||
void Engine::sync_usd(pxr::UsdStageRefPtr stage)
|
||||
{
|
||||
if (!usd_delegate_) {
|
||||
usd_delegate_ = std::make_unique<pxr::UsdImagingDelegate>(
|
||||
render_index_.get(), pxr::SdfPath::AbsoluteRootPath().AppendElementString("usd"));
|
||||
}
|
||||
usd_delegate_->Populate(stage->GetPseudoRoot());
|
||||
}
|
||||
|
||||
void Engine::set_sync_setting(const std::string &key, const pxr::VtValue &val)
|
||||
{
|
||||
scene_delegate_->set_setting(key, val);
|
||||
|
@ -10,6 +10,8 @@
|
||||
#include <pxr/imaging/hd/pluginRenderDelegateUniqueHandle.h>
|
||||
#include <pxr/imaging/hdx/freeCameraSceneDelegate.h>
|
||||
#include <pxr/imaging/hgi/hgi.h>
|
||||
#include <pxr/usd/usd/stage.h>
|
||||
#include <pxr/usdImaging/usdImaging/delegate.h>
|
||||
|
||||
#include "RE_engine.h"
|
||||
|
||||
@ -29,6 +31,7 @@ class Engine {
|
||||
virtual ~Engine() = default;
|
||||
|
||||
void sync(Depsgraph *depsgraph, bContext *context);
|
||||
void sync_usd(pxr::UsdStageRefPtr stage);
|
||||
virtual void render(Depsgraph *depsgraph) = 0;
|
||||
|
||||
void set_sync_setting(const std::string &key, const pxr::VtValue &val);
|
||||
@ -50,6 +53,7 @@ class Engine {
|
||||
std::unique_ptr<RenderTaskDelegate> render_task_delegate_;
|
||||
std::unique_ptr<pxr::HdxFreeCameraSceneDelegate> free_camera_delegate_;
|
||||
std::unique_ptr<SimpleLightTaskDelegate> simple_light_task_delegate_;
|
||||
std::unique_ptr<pxr::UsdImagingDelegate> usd_delegate_;
|
||||
std::unique_ptr<pxr::HdEngine> engine_;
|
||||
};
|
||||
|
||||
|
@ -3,8 +3,11 @@
|
||||
|
||||
#include <Python.h>
|
||||
|
||||
#include <boost/python/extract.hpp>
|
||||
|
||||
#include <pxr/base/plug/plugin.h>
|
||||
#include <pxr/base/plug/registry.h>
|
||||
#include <pxr/usd/usd/stage.h>
|
||||
#include <pxr/usdImaging/usdImagingGL/engine.h>
|
||||
|
||||
#include "BKE_appdir.h"
|
||||
@ -157,6 +160,24 @@ static PyObject *engine_sync_func(PyObject * /*self*/, PyObject *args)
|
||||
Py_RETURN_NONE;
|
||||
}
|
||||
|
||||
static PyObject *engine_sync_usd_func(PyObject * /*self*/, PyObject *args)
|
||||
{
|
||||
PyObject *pyengine, *pystage;
|
||||
if (!PyArg_ParseTuple(args, "OO", &pyengine, &pystage)) {
|
||||
Py_RETURN_NONE;
|
||||
}
|
||||
|
||||
Engine *engine = (Engine *)PyLong_AsVoidPtr(pyengine);
|
||||
|
||||
boost::python::extract<pxr::UsdStageRefPtr> extract(pystage);
|
||||
pxr::UsdStagePtr stage = extract();
|
||||
|
||||
engine->sync_usd(stage);
|
||||
|
||||
Vasyl-Pidhirskyi marked this conversation as resolved
Outdated
|
||||
CLOG_INFO(LOG_RENDER_HYDRA, 2, "Engine %016llx", engine);
|
||||
Py_RETURN_NONE;
|
||||
}
|
||||
|
||||
static PyObject *engine_render_func(PyObject * /*self*/, PyObject *args)
|
||||
{
|
||||
PyObject *pyengine, *pydepsgraph;
|
||||
@ -253,6 +274,7 @@ static PyMethodDef methods[] = {
|
||||
{"engine_create", engine_create_func, METH_VARARGS, ""},
|
||||
{"engine_free", engine_free_func, METH_VARARGS, ""},
|
||||
{"engine_sync", engine_sync_func, METH_VARARGS, ""},
|
||||
{"engine_sync_usd", engine_sync_usd_func, METH_VARARGS, ""},
|
||||
{"engine_render", engine_render_func, METH_VARARGS, ""},
|
||||
{"engine_view_draw", engine_view_draw_func, METH_VARARGS, ""},
|
||||
{"engine_set_sync_setting", engine_set_sync_setting_func, METH_VARARGS, ""},
|
||||
|
@ -211,14 +211,14 @@ void BlenderSceneDelegate::populate(Depsgraph *deps, bContext *cont)
|
||||
|
||||
void BlenderSceneDelegate::clear()
|
||||
{
|
||||
for (auto &it : objects_) {
|
||||
it.second->remove();
|
||||
for (auto &obj_data : objects_.values()) {
|
||||
obj_data->remove();
|
||||
}
|
||||
for (auto &it : instancers_) {
|
||||
it.second->remove();
|
||||
for (auto &i_data : instancers_.values()) {
|
||||
i_data->remove();
|
||||
}
|
||||
for (auto &it : materials_) {
|
||||
it.second->remove();
|
||||
for (auto &mat_data : materials_.values()) {
|
||||
mat_data->remove();
|
||||
}
|
||||
|
||||
objects_.clear();
|
||||
@ -269,9 +269,9 @@ pxr::SdfPath BlenderSceneDelegate::world_prim_id() const
|
||||
ObjectData *BlenderSceneDelegate::object_data(pxr::SdfPath const &id) const
|
||||
{
|
||||
pxr::SdfPath p_id = (id.GetName().find("SM_") == 0) ? id.GetParentPath() : id;
|
||||
auto it = objects_.find(p_id);
|
||||
if (it != objects_.end()) {
|
||||
return it->second.get();
|
||||
auto obj_data = objects_.lookup_ptr(p_id);
|
||||
if (obj_data) {
|
||||
return obj_data->get();
|
||||
}
|
||||
InstancerData *i_data = instancer_data(p_id, true);
|
||||
if (i_data) {
|
||||
@ -297,11 +297,11 @@ LightData *BlenderSceneDelegate::light_data(pxr::SdfPath const &id) const
|
||||
|
||||
MaterialData *BlenderSceneDelegate::material_data(pxr::SdfPath const &id) const
|
||||
{
|
||||
auto it = materials_.find(id);
|
||||
if (it == materials_.end()) {
|
||||
auto mat_data = materials_.lookup_ptr(id);
|
||||
if (!mat_data) {
|
||||
return nullptr;
|
||||
}
|
||||
return it->second.get();
|
||||
return mat_data->get();
|
||||
}
|
||||
|
||||
InstancerData *BlenderSceneDelegate::instancer_data(pxr::SdfPath const &id, bool child_id) const
|
||||
@ -322,9 +322,9 @@ InstancerData *BlenderSceneDelegate::instancer_data(pxr::SdfPath const &id, bool
|
||||
p_id = id;
|
||||
}
|
||||
|
||||
auto it = instancers_.find(p_id);
|
||||
if (it != instancers_.end()) {
|
||||
return it->second.get();
|
||||
auto i_data = instancers_.lookup_ptr(p_id);
|
||||
if (i_data) {
|
||||
return i_data->get();
|
||||
}
|
||||
return nullptr;
|
||||
}
|
||||
@ -349,7 +349,7 @@ void BlenderSceneDelegate::update_objects(Object *object)
|
||||
return;
|
||||
}
|
||||
|
||||
objects_[id] = ObjectData::create(this, object, id);
|
||||
objects_.add_new(id, ObjectData::create(this, object, id));
|
||||
obj_data = object_data(id);
|
||||
obj_data->update_parent();
|
||||
obj_data->init();
|
||||
@ -359,8 +359,8 @@ void BlenderSceneDelegate::update_objects(Object *object)
|
||||
void BlenderSceneDelegate::update_instancers(Object *object)
|
||||
{
|
||||
/* Check object inside instancers */
|
||||
for (auto &it : instancers_) {
|
||||
it.second->check_update(object);
|
||||
for (auto &i_data : instancers_.values()) {
|
||||
i_data->check_update(object);
|
||||
}
|
||||
|
||||
pxr::SdfPath id = instancer_prim_id(object);
|
||||
@ -369,7 +369,7 @@ void BlenderSceneDelegate::update_instancers(Object *object)
|
||||
if ((object->transflag & OB_DUPLI) == 0) {
|
||||
/* Object isn't instancer anymore and should be removed */
|
||||
i_data->remove();
|
||||
instancers_.erase(id);
|
||||
instancers_.remove(id);
|
||||
return;
|
||||
}
|
||||
|
||||
@ -386,8 +386,7 @@ void BlenderSceneDelegate::update_instancers(Object *object)
|
||||
return;
|
||||
}
|
||||
|
||||
instancers_[id] = std::make_unique<InstancerData>(this, object, id);
|
||||
i_data = instancer_data(id);
|
||||
i_data = instancers_.lookup_or_add(id, std::make_unique<InstancerData>(this, object, id)).get();
|
||||
i_data->init();
|
||||
i_data->insert();
|
||||
}
|
||||
@ -524,7 +523,7 @@ void BlenderSceneDelegate::add_new_objects()
|
||||
void BlenderSceneDelegate::remove_unused_objects()
|
||||
{
|
||||
/* Get available objects */
|
||||
std::set<std::string> available_objects;
|
||||
Set<std::string> available_objects;
|
||||
|
||||
DEGObjectIterSettings settings = {0};
|
||||
settings.depsgraph = depsgraph;
|
||||
@ -542,67 +541,66 @@ void BlenderSceneDelegate::remove_unused_objects()
|
||||
object)
|
||||
{
|
||||
if (ObjectData::is_supported(object)) {
|
||||
available_objects.insert(object_prim_id(object).GetName());
|
||||
available_objects.add(object_prim_id(object).GetName());
|
||||
}
|
||||
available_objects.insert(instancer_prim_id(object).GetName());
|
||||
available_objects.add(instancer_prim_id(object).GetName());
|
||||
}
|
||||
ITER_END;
|
||||
|
||||
/* Remove unused instancers */
|
||||
for (auto it = instancers_.begin(); it != instancers_.end(); ++it) {
|
||||
if (available_objects.find(it->first.GetName()) != available_objects.end()) {
|
||||
/* Remove objects from instancers */
|
||||
it->second->check_remove(available_objects);
|
||||
continue;
|
||||
instancers_.remove_if([&](auto item) {
|
||||
bool ret = !available_objects.contains(item.key.GetName());
|
||||
if (ret) {
|
||||
item.value->remove();
|
||||
}
|
||||
it->second->remove();
|
||||
instancers_.erase(it);
|
||||
it = instancers_.begin();
|
||||
}
|
||||
else {
|
||||
item.value->check_remove(available_objects);
|
||||
}
|
||||
return ret;
|
||||
});
|
||||
|
||||
/* Remove unused objects */
|
||||
for (auto it = objects_.begin(); it != objects_.end(); ++it) {
|
||||
if (available_objects.find(it->first.GetName()) != available_objects.end()) {
|
||||
continue;
|
||||
objects_.remove_if([&](auto item) {
|
||||
bool ret = !available_objects.contains(item.key.GetName());
|
||||
if (ret) {
|
||||
item.value->remove();
|
||||
}
|
||||
it->second->remove();
|
||||
objects_.erase(it);
|
||||
it = objects_.begin();
|
||||
}
|
||||
return ret;
|
||||
});
|
||||
|
||||
/* Remove unused materials */
|
||||
std::set<pxr::SdfPath> available_materials;
|
||||
for (auto &it : objects_) {
|
||||
MeshData *m_data = dynamic_cast<MeshData *>(it.second.get());
|
||||
Set<pxr::SdfPath> available_materials;
|
||||
for (auto &val : objects_.values()) {
|
||||
MeshData *m_data = dynamic_cast<MeshData *>(val.get());
|
||||
if (m_data) {
|
||||
m_data->available_materials(available_materials);
|
||||
}
|
||||
CurvesData *c_data = dynamic_cast<CurvesData *>(it.second.get());
|
||||
CurvesData *c_data = dynamic_cast<CurvesData *>(val.get());
|
||||
if (c_data) {
|
||||
c_data->available_materials(available_materials);
|
||||
}
|
||||
}
|
||||
for (auto &it : instancers_) {
|
||||
it.second->available_materials(available_materials);
|
||||
for (auto &val : instancers_.values()) {
|
||||
val->available_materials(available_materials);
|
||||
}
|
||||
for (auto it = materials_.begin(); it != materials_.end(); ++it) {
|
||||
if (available_materials.find(it->first) != available_materials.end()) {
|
||||
continue;
|
||||
|
||||
materials_.remove_if([&](auto item) {
|
||||
bool ret = !available_materials.contains(item.key);
|
||||
if (ret) {
|
||||
item.value->remove();
|
||||
}
|
||||
it->second->remove();
|
||||
materials_.erase(it);
|
||||
it = materials_.begin();
|
||||
}
|
||||
return ret;
|
||||
});
|
||||
}
|
||||
|
||||
void BlenderSceneDelegate::update_visibility()
|
||||
{
|
||||
/* Updating visibility of existing objects/instancers */
|
||||
for (auto &it : objects_) {
|
||||
it.second->update_visibility();
|
||||
for (auto &val : objects_.values()) {
|
||||
val->update_visibility();
|
||||
}
|
||||
for (auto &it : instancers_) {
|
||||
it.second->update_visibility();
|
||||
for (auto &val : instancers_.values()) {
|
||||
val->update_visibility();
|
||||
}
|
||||
|
||||
/* Add objects/instancers which were invisible before and not added yet */
|
||||
|
@ -11,6 +11,7 @@
|
||||
|
||||
#include "CLG_log.h"
|
||||
|
||||
#include "BLI_set.hh"
|
||||
#include "curves.h"
|
||||
#include "instancer.h"
|
||||
#include "light.h"
|
||||
|
@ -134,10 +134,10 @@ pxr::SdfPath CurvesData::material_id() const
|
||||
return mat_data_->prim_id;
|
||||
}
|
||||
|
||||
void CurvesData::available_materials(std::set<pxr::SdfPath> &paths) const
|
||||
void CurvesData::available_materials(Set<pxr::SdfPath> &paths) const
|
||||
{
|
||||
if (mat_data_ && !mat_data_->prim_id.IsEmpty()) {
|
||||
paths.insert(mat_data_->prim_id);
|
||||
paths.add(mat_data_->prim_id);
|
||||
}
|
||||
}
|
||||
|
||||
@ -199,7 +199,8 @@ void CurvesData::write_material()
|
||||
pxr::SdfPath p_id = scene_delegate_->material_prim_id(mat);
|
||||
mat_data_ = scene_delegate_->material_data(p_id);
|
||||
if (!mat_data_) {
|
||||
scene_delegate_->materials_[p_id] = std::make_unique<MaterialData>(scene_delegate_, mat, p_id);
|
||||
scene_delegate_->materials_.add_new(
|
||||
p_id, std::make_unique<MaterialData>(scene_delegate_, mat, p_id));
|
||||
mat_data_ = scene_delegate_->material_data(p_id);
|
||||
mat_data_->init();
|
||||
mat_data_->insert();
|
||||
|
@ -9,6 +9,7 @@
|
||||
#include "BKE_duplilist.h"
|
||||
#include "DNA_Curves_types.h"
|
||||
|
||||
#include "BLI_set.hh"
|
||||
#include "material.h"
|
||||
#include "object.h"
|
||||
|
||||
@ -29,7 +30,7 @@ class CurvesData : public ObjectData {
|
||||
pxr::HdBasisCurvesTopology curves_topology(pxr::SdfPath const &id) const;
|
||||
pxr::HdPrimvarDescriptorVector primvar_descriptors(pxr::HdInterpolation interpolation) const;
|
||||
pxr::SdfPath material_id() const;
|
||||
void available_materials(std::set<pxr::SdfPath> &paths) const;
|
||||
void available_materials(Set<pxr::SdfPath> &paths) const;
|
||||
|
||||
private:
|
||||
void write_curves(Curves *curves);
|
||||
|
@ -7,8 +7,16 @@
|
||||
#include <pxr/base/vt/value.h>
|
||||
#include <pxr/usd/sdf/path.h>
|
||||
|
||||
#include "BLI_hash.hh"
|
||||
#include "DNA_ID.h"
|
||||
|
||||
template<> struct blender::DefaultHash<pxr::SdfPath> {
|
||||
uint64_t operator()(const pxr::SdfPath &value) const
|
||||
{
|
||||
return pxr::SdfPath::Hash()(value);
|
||||
}
|
||||
};
|
||||
|
||||
namespace blender::render::hydra {
|
||||
|
||||
class BlenderSceneDelegate;
|
||||
|
@ -74,14 +74,14 @@ void InstancerData::insert()
|
||||
void InstancerData::remove()
|
||||
{
|
||||
CLOG_INFO(LOG_RENDER_HYDRA_SCENE, 2, "%s", prim_id.GetText());
|
||||
for (auto &it : mesh_instances_) {
|
||||
it.second.data->remove();
|
||||
for (auto &m_inst : mesh_instances_.values()) {
|
||||
m_inst.data->remove();
|
||||
}
|
||||
scene_delegate_->GetRenderIndex().RemoveInstancer(prim_id);
|
||||
|
||||
for (auto &it : light_instances_) {
|
||||
it.second.transforms.clear();
|
||||
update_light_instance(it.second);
|
||||
for (auto &l_inst : light_instances_.values()) {
|
||||
l_inst.transforms.clear();
|
||||
update_light_instance(l_inst);
|
||||
}
|
||||
}
|
||||
|
||||
@ -119,17 +119,17 @@ bool InstancerData::update_visibility()
|
||||
ID_LOG(2, "");
|
||||
Vasyl-Pidhirskyi marked this conversation as resolved
Outdated
Bogdan Nagirniak
commented
InstancerData init, remove, update/update_visibility -> 1 InstancerData init, remove, update/update_visibility -> 1
|
||||
auto &change_tracker = scene_delegate_->GetRenderIndex().GetChangeTracker();
|
||||
change_tracker.MarkInstancerDirty(prim_id, pxr::HdChangeTracker::DirtyVisibility);
|
||||
for (auto &it : mesh_instances_) {
|
||||
it.second.data->visible = visible;
|
||||
for (auto &p : it.second.data->submesh_paths()) {
|
||||
for (auto &m_inst : mesh_instances_.values()) {
|
||||
m_inst.data->visible = visible;
|
||||
for (auto &p : m_inst.data->submesh_paths()) {
|
||||
change_tracker.MarkRprimDirty(p, pxr::HdChangeTracker::DirtyVisibility);
|
||||
}
|
||||
}
|
||||
char name[16];
|
||||
for (auto &it : light_instances_) {
|
||||
for (int i = 0; i < it.second.count; ++i) {
|
||||
for (auto &l_inst : light_instances_.values()) {
|
||||
for (int i = 0; i < l_inst.count; ++i) {
|
||||
snprintf(name, 16, "L_%08x", i);
|
||||
change_tracker.MarkRprimDirty(it.second.data->prim_id.AppendElementString(name),
|
||||
change_tracker.MarkRprimDirty(l_inst.data->prim_id.AppendElementString(name),
|
||||
pxr::HdChangeTracker::DirtyVisibility);
|
||||
}
|
||||
}
|
||||
@ -180,8 +180,8 @@ ObjectData *InstancerData::object_data(pxr::SdfPath const &id) const
|
||||
pxr::SdfPathVector InstancerData::prototypes() const
|
||||
{
|
||||
pxr::SdfPathVector paths;
|
||||
for (auto &it : mesh_instances_) {
|
||||
for (auto &p : it.second.data->submesh_paths()) {
|
||||
for (auto &m_inst : mesh_instances_.values()) {
|
||||
for (auto &p : m_inst.data->submesh_paths()) {
|
||||
paths.push_back(p);
|
||||
}
|
||||
}
|
||||
@ -195,7 +195,7 @@ void InstancerData::check_update(Object *object)
|
||||
if (m_inst) {
|
||||
if (!is_instance_visible(object)) {
|
||||
m_inst->data->remove();
|
||||
mesh_instances_.erase(path);
|
||||
mesh_instances_.remove(path);
|
||||
scene_delegate_->GetRenderIndex().GetChangeTracker().MarkInstancerDirty(
|
||||
prim_id, pxr::HdChangeTracker::AllDirty);
|
||||
return;
|
||||
@ -216,7 +216,7 @@ void InstancerData::check_update(Object *object)
|
||||
if (!is_instance_visible(object)) {
|
||||
l_inst->transforms.clear();
|
||||
update_light_instance(*l_inst);
|
||||
light_instances_.erase(path);
|
||||
light_instances_.remove(path);
|
||||
return;
|
||||
}
|
||||
|
||||
@ -244,7 +244,7 @@ void InstancerData::check_update(Object *object)
|
||||
|
||||
if (do_write_instances) {
|
||||
write_instances();
|
||||
if (!mesh_instances_.empty()) {
|
||||
if (!mesh_instances_.is_empty()) {
|
||||
scene_delegate_->GetRenderIndex().GetChangeTracker().MarkInstancerDirty(
|
||||
prim_id, pxr::HdChangeTracker::AllDirty);
|
||||
}
|
||||
@ -252,40 +252,39 @@ void InstancerData::check_update(Object *object)
|
||||
}
|
||||
}
|
||||
|
||||
void InstancerData::check_remove(std::set<std::string> &available_objects)
|
||||
void InstancerData::check_remove(Set<std::string> &available_objects)
|
||||
{
|
||||
bool ret = false;
|
||||
for (auto it = mesh_instances_.begin(); it != mesh_instances_.end(); ++it) {
|
||||
if (available_objects.find(it->first.GetName()) != available_objects.end()) {
|
||||
continue;
|
||||
}
|
||||
it->second.data->remove();
|
||||
mesh_instances_.erase(it);
|
||||
it = mesh_instances_.begin();
|
||||
ret = true;
|
||||
}
|
||||
|
||||
mesh_instances_.remove_if([&](auto item) {
|
||||
bool res = !available_objects.contains(item.key.GetName());
|
||||
if (res) {
|
||||
item.value.data->remove();
|
||||
ret = true;
|
||||
};
|
||||
return res;
|
||||
});
|
||||
|
||||
if (ret) {
|
||||
write_instances();
|
||||
scene_delegate_->GetRenderIndex().GetChangeTracker().MarkInstancerDirty(
|
||||
prim_id, pxr::HdChangeTracker::AllDirty);
|
||||
}
|
||||
|
||||
for (auto it = light_instances_.begin(); it != light_instances_.end(); ++it) {
|
||||
if (available_objects.find(it->first.GetName()) != available_objects.end()) {
|
||||
continue;
|
||||
}
|
||||
it->second.transforms.clear();
|
||||
update_light_instance(it->second);
|
||||
|
||||
light_instances_.erase(it);
|
||||
it = light_instances_.begin();
|
||||
}
|
||||
light_instances_.remove_if([&](auto item) {
|
||||
bool res = !available_objects.contains(item.key.GetName());
|
||||
if (res) {
|
||||
item.value.transforms.clear();
|
||||
update_light_instance(item.value);
|
||||
};
|
||||
return res;
|
||||
});
|
||||
}
|
||||
|
||||
void InstancerData::available_materials(std::set<pxr::SdfPath> &paths) const
|
||||
void InstancerData::available_materials(Set<pxr::SdfPath> &paths) const
|
||||
{
|
||||
for (auto &it : mesh_instances_) {
|
||||
((MeshData *)it.second.data.get())->available_materials(paths);
|
||||
for (auto &m_inst : mesh_instances_.values()) {
|
||||
((MeshData *)m_inst.data.get())->available_materials(paths);
|
||||
}
|
||||
}
|
||||
|
||||
@ -298,8 +297,8 @@ void InstancerData::update_as_parent()
|
||||
|
||||
void InstancerData::update_double_sided(MaterialData *mat_data)
|
||||
{
|
||||
for (auto &it : mesh_instances_) {
|
||||
it.second.data->update_double_sided(mat_data);
|
||||
for (auto &m_inst : mesh_instances_.values()) {
|
||||
m_inst.data->update_double_sided(mat_data);
|
||||
}
|
||||
}
|
||||
|
||||
@ -344,11 +343,11 @@ int InstancerData::light_prim_id_index(pxr::SdfPath const &id) const
|
||||
void InstancerData::write_instances()
|
||||
{
|
||||
mesh_transforms_.clear();
|
||||
for (auto &it : mesh_instances_) {
|
||||
it.second.indices.clear();
|
||||
for (auto &m_inst : mesh_instances_.values()) {
|
||||
m_inst.indices.clear();
|
||||
}
|
||||
for (auto &it : light_instances_) {
|
||||
it.second.transforms.clear();
|
||||
for (auto &l_inst : light_instances_.values()) {
|
||||
l_inst.transforms.clear();
|
||||
}
|
||||
|
||||
ListBase *lb = object_duplilist(
|
||||
@ -363,7 +362,7 @@ void InstancerData::write_instances()
|
||||
if (ob->type == OB_LAMP) {
|
||||
LightInstance *inst = light_instance(p_id);
|
||||
if (!inst) {
|
||||
inst = &light_instances_[p_id];
|
||||
inst = &light_instances_.lookup_or_add_default(p_id);
|
||||
inst->data = std::make_unique<LightData>(scene_delegate_, ob, p_id);
|
||||
inst->data->init();
|
||||
}
|
||||
@ -373,7 +372,7 @@ void InstancerData::write_instances()
|
||||
else {
|
||||
MeshInstance *inst = mesh_instance(p_id);
|
||||
if (!inst) {
|
||||
inst = &mesh_instances_[p_id];
|
||||
inst = &mesh_instances_.lookup_or_add_default(p_id);
|
||||
inst->data = std::make_unique<MeshData>(scene_delegate_, ob, p_id);
|
||||
inst->data->init();
|
||||
inst->data->insert();
|
||||
@ -386,23 +385,19 @@ void InstancerData::write_instances()
|
||||
free_object_duplilist(lb);
|
||||
|
||||
/* Remove mesh intances without indices */
|
||||
for (auto it = mesh_instances_.begin(); it != mesh_instances_.end(); ++it) {
|
||||
if (!it->second.indices.empty()) {
|
||||
continue;
|
||||
mesh_instances_.remove_if([&](auto item) {
|
||||
bool res = item.value.indices.empty();
|
||||
if (res) {
|
||||
item.value.data->remove();
|
||||
}
|
||||
it->second.data->remove();
|
||||
mesh_instances_.erase(it);
|
||||
it = mesh_instances_.begin();
|
||||
}
|
||||
return res;
|
||||
});
|
||||
|
||||
/* Update light intances and remove instances without transforms */
|
||||
for (auto it = light_instances_.begin(); it != light_instances_.end(); ++it) {
|
||||
update_light_instance(it->second);
|
||||
if (it->second.transforms.empty()) {
|
||||
light_instances_.erase(it);
|
||||
it = light_instances_.begin();
|
||||
}
|
||||
}
|
||||
light_instances_.remove_if([&](auto item) {
|
||||
update_light_instance(item.value);
|
||||
return item.value.transforms.empty();
|
||||
});
|
||||
}
|
||||
|
||||
void InstancerData::update_light_instance(LightInstance &inst)
|
||||
@ -462,20 +457,22 @@ void InstancerData::update_light_instance(LightInstance &inst)
|
||||
|
||||
InstancerData::MeshInstance *InstancerData::mesh_instance(pxr::SdfPath const &id) const
|
||||
{
|
||||
auto it = mesh_instances_.find(id.GetPathElementCount() == 4 ? id.GetParentPath() : id);
|
||||
if (it == mesh_instances_.end()) {
|
||||
auto m_inst = mesh_instances_.lookup_ptr(id.GetPathElementCount() == 4 ? id.GetParentPath() :
|
||||
id);
|
||||
if (!m_inst) {
|
||||
return nullptr;
|
||||
}
|
||||
return const_cast<MeshInstance *>(&it->second);
|
||||
return const_cast<MeshInstance *>(m_inst);
|
||||
}
|
||||
|
||||
InstancerData::LightInstance *InstancerData::light_instance(pxr::SdfPath const &id) const
|
||||
{
|
||||
auto it = light_instances_.find(id.GetPathElementCount() == 4 ? id.GetParentPath() : id);
|
||||
if (it == light_instances_.end()) {
|
||||
auto l_inst = light_instances_.lookup_ptr(id.GetPathElementCount() == 4 ? id.GetParentPath() :
|
||||
id);
|
||||
if (!l_inst) {
|
||||
return nullptr;
|
||||
}
|
||||
return const_cast<LightInstance *>(&it->second);
|
||||
return const_cast<LightInstance *>(l_inst);
|
||||
}
|
||||
|
||||
} // namespace blender::render::hydra
|
||||
|
@ -4,6 +4,8 @@
|
||||
#pragma once
|
||||
|
||||
#include "BKE_duplilist.h"
|
||||
#include "BLI_map.hh"
|
||||
#include "BLI_set.hh"
|
||||
|
||||
#include "light.h"
|
||||
#include "mesh.h"
|
||||
@ -41,8 +43,8 @@ class InstancerData : public ObjectData {
|
||||
ObjectData *object_data(pxr::SdfPath const &id) const;
|
||||
pxr::SdfPathVector prototypes() const;
|
||||
void check_update(Object *object);
|
||||
void check_remove(std::set<std::string> &available_objects);
|
||||
void available_materials(std::set<pxr::SdfPath> &paths) const;
|
||||
void check_remove(Set<std::string> &available_objects);
|
||||
void available_materials(Set<pxr::SdfPath> &paths) const;
|
||||
void update_as_parent();
|
||||
void update_double_sided(MaterialData *mat_data);
|
||||
|
||||
@ -56,12 +58,11 @@ class InstancerData : public ObjectData {
|
||||
MeshInstance *mesh_instance(pxr::SdfPath const &id) const;
|
||||
LightInstance *light_instance(pxr::SdfPath const &id) const;
|
||||
|
||||
pxr::TfHashMap<pxr::SdfPath, MeshInstance, pxr::SdfPath::Hash> mesh_instances_;
|
||||
pxr::TfHashMap<pxr::SdfPath, LightInstance, pxr::SdfPath::Hash> light_instances_;
|
||||
Map<pxr::SdfPath, MeshInstance> mesh_instances_;
|
||||
Map<pxr::SdfPath, LightInstance> light_instances_;
|
||||
pxr::VtMatrix4dArray mesh_transforms_;
|
||||
};
|
||||
|
||||
using InstancerDataMap =
|
||||
pxr::TfHashMap<pxr::SdfPath, std::unique_ptr<InstancerData>, pxr::SdfPath::Hash>;
|
||||
using InstancerDataMap = Map<pxr::SdfPath, std::unique_ptr<InstancerData>>;
|
||||
|
||||
} // namespace blender::render::hydra
|
||||
|
@ -60,14 +60,14 @@ void MaterialData::update()
|
||||
scene_delegate_->GetRenderIndex().GetChangeTracker().MarkSprimDirty(prim_id,
|
||||
pxr::HdMaterial::AllDirty);
|
||||
if (prev_double_sided != double_sided) {
|
||||
for (auto &it : scene_delegate_->objects_) {
|
||||
MeshData *m_data = dynamic_cast<MeshData *>(it.second.get());
|
||||
for (auto &obj_data : scene_delegate_->objects_.values()) {
|
||||
MeshData *m_data = dynamic_cast<MeshData *>(obj_data.get());
|
||||
if (m_data) {
|
||||
m_data->update_double_sided(this);
|
||||
}
|
||||
}
|
||||
for (auto &it : scene_delegate_->instancers_) {
|
||||
it.second->update_double_sided(this);
|
||||
for (auto &i_data : scene_delegate_->instancers_.values()) {
|
||||
i_data->update_double_sided(this);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -7,6 +7,7 @@
|
||||
#include <pxr/usd/sdf/assetPath.h>
|
||||
#include <pxr/usd/sdf/path.h>
|
||||
|
||||
#include "BLI_map.hh"
|
||||
#include "DNA_material_types.h"
|
||||
|
||||
#include "id.h"
|
||||
@ -37,7 +38,6 @@ class MaterialData : public IdData {
|
||||
pxr::VtValue material_network_map_;
|
||||
};
|
||||
|
||||
using MaterialDataMap =
|
||||
pxr::TfHashMap<pxr::SdfPath, std::unique_ptr<MaterialData>, pxr::SdfPath::Hash>;
|
||||
using MaterialDataMap = Map<pxr::SdfPath, std::unique_ptr<MaterialData>>;
|
||||
|
||||
} // namespace blender::render::hydra
|
||||
|
@ -173,11 +173,11 @@ void MeshData::update_double_sided(MaterialData *mat_data)
|
||||
}
|
||||
}
|
||||
|
||||
void MeshData::available_materials(std::set<pxr::SdfPath> &paths) const
|
||||
void MeshData::available_materials(Set<pxr::SdfPath> &paths) const
|
||||
{
|
||||
for (auto &sm : submeshes_) {
|
||||
if (sm.mat_data && !sm.mat_data->prim_id.IsEmpty()) {
|
||||
paths.insert(sm.mat_data->prim_id);
|
||||
paths.add(sm.mat_data->prim_id);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -301,15 +301,14 @@ void MeshData::write_materials()
|
||||
m.mat_data = nullptr;
|
||||
continue;
|
||||
}
|
||||
|
||||
pxr::SdfPath p_id = scene_delegate_->material_prim_id(mat);
|
||||
m.mat_data = scene_delegate_->material_data(p_id);
|
||||
if (!m.mat_data) {
|
||||
scene_delegate_->materials_[p_id] = std::make_unique<MaterialData>(
|
||||
scene_delegate_, mat, p_id);
|
||||
m.mat_data = scene_delegate_->material_data(p_id);
|
||||
m.mat_data->init();
|
||||
m.mat_data->insert();
|
||||
}
|
||||
m.mat_data = scene_delegate_->materials_
|
||||
.lookup_or_add(p_id,
|
||||
std::make_unique<MaterialData>(scene_delegate_, mat, p_id))
|
||||
.get();
|
||||
m.mat_data->init();
|
||||
m.mat_data->insert();
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -7,6 +7,7 @@
|
||||
#include <pxr/imaging/hd/sceneDelegate.h>
|
||||
|
||||
#include "BKE_duplilist.h"
|
||||
#include "BLI_set.hh"
|
||||
|
||||
#include "material.h"
|
||||
#include "object.h"
|
||||
@ -39,7 +40,7 @@ class MeshData : public ObjectData {
|
||||
pxr::SdfPath material_id(pxr::SdfPath const &id) const;
|
||||
bool double_sided(pxr::SdfPath const &id) const;
|
||||
void update_double_sided(MaterialData *mat_data);
|
||||
void available_materials(std::set<pxr::SdfPath> &paths) const;
|
||||
void available_materials(Set<pxr::SdfPath> &paths) const;
|
||||
pxr::SdfPathVector submesh_paths() const;
|
||||
|
||||
pxr::HdCullStyle cull_style = pxr::HdCullStyleBackUnlessDoubleSided;
|
||||
|
@ -7,6 +7,7 @@
|
||||
#include <pxr/base/gf/matrix4d.h>
|
||||
|
||||
#include "BKE_layer.h"
|
||||
#include "BLI_map.hh"
|
||||
#include "DNA_object_types.h"
|
||||
|
||||
#include "id.h"
|
||||
@ -36,8 +37,7 @@ class ObjectData : public IdData {
|
||||
Object *parent_ = nullptr;
|
||||
};
|
||||
|
||||
using ObjectDataMap =
|
||||
pxr::TfHashMap<pxr::SdfPath, std::unique_ptr<ObjectData>, pxr::SdfPath::Hash>;
|
||||
using ObjectDataMap = Map<pxr::SdfPath, std::unique_ptr<ObjectData>>;
|
||||
|
||||
pxr::GfMatrix4d gf_matrix_from_transform(float m[4][4]);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user
sync, render -> 2