Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/intern/cycles/blender/blender_object.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'intern/cycles/blender/blender_object.cpp')
-rw-r--r--intern/cycles/blender/blender_object.cpp108
1 files changed, 60 insertions, 48 deletions
diff --git a/intern/cycles/blender/blender_object.cpp b/intern/cycles/blender/blender_object.cpp
index 609ca8f6f79..23faacc15da 100644
--- a/intern/cycles/blender/blender_object.cpp
+++ b/intern/cycles/blender/blender_object.cpp
@@ -199,13 +199,11 @@ Object *BlenderSync::sync_object(BL::Depsgraph &b_depsgraph,
/* Set transform at matching motion time step. */
int time_index = object->motion_step(motion_time);
if (time_index >= 0) {
- array<Transform> motion = object->get_motion();
- motion[time_index] = tfm;
- object->set_motion(motion);
+ object->motion[time_index] = tfm;
}
/* mesh deformation */
- if (object->get_geometry())
+ if (object->geometry)
sync_geometry_motion(b_depsgraph,
b_ob_instance,
object,
@@ -227,29 +225,38 @@ Object *BlenderSync::sync_object(BL::Depsgraph &b_depsgraph,
/* b_ob is owned by the iterator and will go out of scope at the end of the block.
* b_ob_instance is the original object and will remain valid for deferred geometry
* sync. */
- Geometry *geometry = sync_geometry(b_depsgraph,
- b_ob_instance,
- b_ob_instance,
- object_updated,
- use_particle_hair,
- object_geom_task_pool);
- object->set_geometry(geometry);
+ object->geometry = sync_geometry(b_depsgraph,
+ b_ob_instance,
+ b_ob_instance,
+ object_updated,
+ use_particle_hair,
+ object_geom_task_pool);
/* special case not tracked by object update flags */
/* holdout */
- object->set_use_holdout(use_holdout);
- if (object->use_holdout_is_modified()) {
+ if (use_holdout != object->use_holdout) {
+ object->use_holdout = use_holdout;
scene->object_manager->tag_update(scene);
+ object_updated = true;
}
- object->set_visibility(visibility);
+ if (visibility != object->visibility) {
+ object->visibility = visibility;
+ object_updated = true;
+ }
bool is_shadow_catcher = get_boolean(cobject, "is_shadow_catcher");
- object->set_is_shadow_catcher(is_shadow_catcher);
+ if (is_shadow_catcher != object->is_shadow_catcher) {
+ object->is_shadow_catcher = is_shadow_catcher;
+ object_updated = true;
+ }
float shadow_terminator_offset = get_float(cobject, "shadow_terminator_offset");
- object->set_shadow_terminator_offset(shadow_terminator_offset);
+ if (shadow_terminator_offset != object->shadow_terminator_offset) {
+ object->shadow_terminator_offset = shadow_terminator_offset;
+ object_updated = true;
+ }
/* sync the asset name for Cryptomatte */
BL::Object parent = b_ob.parent();
@@ -263,49 +270,48 @@ Object *BlenderSync::sync_object(BL::Depsgraph &b_depsgraph,
else {
parent_name = b_ob.name();
}
- object->set_asset_name(parent_name);
+ if (object->asset_name != parent_name) {
+ object->asset_name = parent_name;
+ object_updated = true;
+ }
/* object sync
* transform comparison should not be needed, but duplis don't work perfect
* in the depsgraph and may not signal changes, so this is a workaround */
- if (object->is_modified() || object_updated ||
- (object->get_geometry() && object->get_geometry()->is_modified()) ||
- tfm != object->get_tfm()) {
+ if (object_updated || (object->geometry && object->geometry->need_update) ||
+ tfm != object->tfm) {
object->name = b_ob.name().c_str();
- object->set_pass_id(b_ob.pass_index());
- object->set_color(get_float3(b_ob.color()));
- object->set_tfm(tfm);
- array<Transform> motion;
- object->set_motion(motion);
+ object->pass_id = b_ob.pass_index();
+ object->color = get_float3(b_ob.color());
+ object->tfm = tfm;
+ object->motion.clear();
/* motion blur */
Scene::MotionType need_motion = scene->need_motion();
- if (need_motion != Scene::MOTION_NONE && object->get_geometry()) {
- Geometry *geom = object->get_geometry();
- geom->set_use_motion_blur(false);
- geom->set_motion_steps(0);
+ if (need_motion != Scene::MOTION_NONE && object->geometry) {
+ Geometry *geom = object->geometry;
+ geom->use_motion_blur = false;
+ geom->motion_steps = 0;
uint motion_steps;
if (need_motion == Scene::MOTION_BLUR) {
motion_steps = object_motion_steps(b_parent, b_ob, Object::MAX_MOTION_STEPS);
- geom->set_motion_steps(motion_steps);
+ geom->motion_steps = motion_steps;
if (motion_steps && object_use_deform_motion(b_parent, b_ob)) {
- geom->set_use_motion_blur(true);
+ geom->use_motion_blur = true;
}
}
else {
motion_steps = 3;
- geom->set_motion_steps(motion_steps);
+ geom->motion_steps = motion_steps;
}
- motion.resize(motion_steps, transform_empty());
+ object->motion.clear();
+ object->motion.resize(motion_steps, transform_empty());
if (motion_steps) {
- motion[motion_steps / 2] = tfm;
-
- /* update motion socket before trying to access object->motion_time */
- object->set_motion(motion);
+ object->motion[motion_steps / 2] = tfm;
for (size_t step = 0; step < motion_steps; step++) {
motion_times.insert(object->motion_time(step));
@@ -315,15 +321,15 @@ Object *BlenderSync::sync_object(BL::Depsgraph &b_depsgraph,
/* dupli texture coordinates and random_id */
if (is_instance) {
- object->set_dupli_generated(0.5f * get_float3(b_instance.orco()) -
- make_float3(0.5f, 0.5f, 0.5f));
- object->set_dupli_uv(get_float2(b_instance.uv()));
- object->set_random_id(b_instance.random_id());
+ object->dupli_generated = 0.5f * get_float3(b_instance.orco()) -
+ make_float3(0.5f, 0.5f, 0.5f);
+ object->dupli_uv = get_float2(b_instance.uv());
+ object->random_id = b_instance.random_id();
}
else {
- object->set_dupli_generated(make_float3(0.0f, 0.0f, 0.0f));
- object->set_dupli_uv(make_float2(0.0f, 0.0f));
- object->set_random_id(hash_uint2(hash_string(object->name.c_str()), 0));
+ object->dupli_generated = make_float3(0.0f, 0.0f, 0.0f);
+ object->dupli_uv = make_float2(0.0f, 0.0f);
+ object->random_id = hash_uint2(hash_string(object->name.c_str()), 0);
}
object->tag_update(scene);
@@ -455,18 +461,20 @@ void BlenderSync::sync_motion(BL::RenderSettings &b_render,
if (b_override)
b_cam = b_override;
+ Camera prevcam = *(scene->camera);
+
int frame_center = b_scene.frame_current();
float subframe_center = b_scene.frame_subframe();
float frame_center_delta = 0.0f;
if (scene->need_motion() != Scene::MOTION_PASS &&
- scene->camera->get_motion_position() != Camera::MOTION_POSITION_CENTER) {
- float shuttertime = scene->camera->get_shuttertime();
- if (scene->camera->get_motion_position() == Camera::MOTION_POSITION_END) {
+ scene->camera->motion_position != Camera::MOTION_POSITION_CENTER) {
+ float shuttertime = scene->camera->shuttertime;
+ if (scene->camera->motion_position == Camera::MOTION_POSITION_END) {
frame_center_delta = -shuttertime * 0.5f;
}
else {
- assert(scene->camera->get_motion_position() == Camera::MOTION_POSITION_START);
+ assert(scene->camera->motion_position == Camera::MOTION_POSITION_START);
frame_center_delta = shuttertime * 0.5f;
}
@@ -527,6 +535,10 @@ void BlenderSync::sync_motion(BL::RenderSettings &b_render,
python_thread_state_restore(python_thread_state);
b_engine.frame_set(frame_center, subframe_center);
python_thread_state_save(python_thread_state);
+
+ /* tag camera for motion update */
+ if (scene->camera->motion_modified(prevcam))
+ scene->camera->tag_update();
}
CCL_NAMESPACE_END
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-23 00:39:12 +0300