Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cycles: Add name field to scene

Browse Source 
Doesn't mean much for Cycles itself, but allows to have nice logs
and progress reports without access of original scene.
This commit is contained in:
Sergey Sharybin
2018-11-09 16:04:53 +01:00
parent 1ed31bef1a
commit cbbf991f62
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
intern/cycles/blender/blender_session.cpp
View File

@@ -140,6 +140,7 @@ void BlenderSession::create_session()
/* create scene */ /* create scene */
scene = new Scene(scene_params, session->device); scene = new Scene(scene_params, session->device);
scene->name = b_scene.name();
/* setup callbacks for builtin image support */ /* setup callbacks for builtin image support */
scene->image_manager->builtin_image_info_cb = function_bind(&BlenderSession::builtin_image_info, this, _1, _2, _3); scene->image_manager->builtin_image_info_cb = function_bind(&BlenderSession::builtin_image_info, this, _1, _2, _3);
@@ -950,7 +951,7 @@ void BlenderSession::update_bake_progress()
void BlenderSession::update_status_progress() void BlenderSession::update_status_progress()
{ {
string timestatus, status, substatus; string timestatus, status, substatus;
string scene = ""; string scene_status = "";
float progress; float progress;
double total_time, remaining_time = 0, render_time; double total_time, remaining_time = 0, render_time;
char time_str[128]; char time_str[128];
@@ -964,12 +965,12 @@ void BlenderSession::update_status_progress()
remaining_time = (1.0 - (double)progress) * (render_time / (double)progress); remaining_time = (1.0 - (double)progress) * (render_time / (double)progress);
if(background) { if(background) {
scene += " | " + b_scene.name(); scene_status += " | " + scene->name;
if(b_rlay_name != "") if(b_rlay_name != "")
scene += ", " + b_rlay_name; scene_status += ", " + b_rlay_name;
if(b_rview_name != "") if(b_rview_name != "")
scene += ", " + b_rview_name; scene_status += ", " + b_rview_name;
if(remaining_time > 0) { if(remaining_time > 0) {
BLI_timecode_string_from_time_simple(time_str, sizeof(time_str), remaining_time); BLI_timecode_string_from_time_simple(time_str, sizeof(time_str), remaining_time);
@@ -988,7 +989,7 @@ void BlenderSession::update_status_progress()
/* When rendering in a window, redraw the status at least once per second to keep the elapsed and remaining time up-to-date. /* When rendering in a window, redraw the status at least once per second to keep the elapsed and remaining time up-to-date.
* For headless rendering, only report when something significant changes to keep the console output readable. */ * For headless rendering, only report when something significant changes to keep the console output readable. */
if(status != last_status || (!headless && (current_time - last_status_time) > 1.0)) { if(status != last_status || (!headless && (current_time - last_status_time) > 1.0)) {
b_engine.update_stats("", (timestatus + scene + status).c_str()); b_engine.update_stats("", (timestatus + scene_status + status).c_str());
b_engine.update_memory_stats(mem_used, mem_peak); b_engine.update_memory_stats(mem_used, mem_peak);
last_status = status; last_status = status;
last_status_time = current_time; last_status_time = current_time;

5
intern/cycles/render/scene.cpp
View File

@@ -83,7 +83,10 @@ DeviceScene::DeviceScene(Device *device)
} }
Scene::Scene(const SceneParams& params_, Device *device) Scene::Scene(const SceneParams& params_, Device *device)
: device(device), dscene(device), params(params_) : name("Scene"),
device(device),
dscene(device),
params(params_)
{ {
memset((void *)&dscene.data, 0, sizeof(dscene.data)); memset((void *)&dscene.data, 0, sizeof(dscene.data));

3
intern/cycles/render/scene.h
View File

@@ -196,6 +196,9 @@ public:
class Scene { class Scene {
public: public:
/* Optional name. Is used for logging and reporting. */
string name;
/* data */ /* data */
Camera *camera; Camera *camera;
Camera *dicing_camera; Camera *dicing_camera;