lib+driver+python+blender: s/iterative/interactive

I had been using both terms interchangeably for a long while, and that
kept bugging me. Just use 'interactive' going forward.
Breaking API change, fixed the python wrapper + blender code setting
this.

Author: vkoskiv

bindings/python/cray_wrap.c

@@ -201,7 +201,7 @@ static PyObject *py_cr_renderer_get_num_pref(PyObject *self, PyObject *args) {
 	if (!PyArg_ParseTuple(args, "OI", &r_ext, &p)) {
 		return NULL;
 	}
-	if (p > cr_renderer_is_iterative) {
+	if (p > cr_renderer_is_interactive) {
 		PyErr_SetString(PyExc_ValueError, "cr_renderer_param not a number type");
 		return NULL;
 	}

bindings/python/lib/c_ray.py

@@ -19,7 +19,7 @@ class _cr_rparam(IntEnum):
 	override_width = 6
 	override_height = 7
 	override_cam = 8
-	is_iterative = 9
+	is_interactive = 9
 	# str
 	asset_path = 10
 	node_list = 11
@@ -146,11 +146,11 @@ def _set_cam_idx(self, value):
 		_r_set_num(self.r_ptr, _cr_rparam.override_cam, value)
 	cam_idx = property(_get_cam_idx, _set_cam_idx, None, "Select camera")
 
-	def _get_is_iterative(self):
-		return _r_get_num(self.r_ptr, _cr_rparam.is_iterative)
-	def _set_is_iterative(self, value):
-		_r_set_num(self.r_ptr, _cr_rparam.is_iterative, value)
-	is_iterative = property(_get_is_iterative, _set_is_iterative, None, "")
+	def _get_is_interactive(self):
+		return _r_get_num(self.r_ptr, _cr_rparam.is_interactive)
+	def _set_is_interactive(self, value):
+		_r_set_num(self.r_ptr, _cr_rparam.is_interactive, value)
+	is_interactive = property(_get_is_interactive, _set_is_interactive, None, "")
 
 	def _get_output_path(self):
 		return _r_get_str(self.r_ptr, _cr_rparam.output_path)

include/c-ray/c-ray.h

@@ -54,7 +54,7 @@ enum cr_renderer_param {
 	cr_renderer_override_width,
 	cr_renderer_override_height,
 	cr_renderer_override_cam,
-	cr_renderer_is_iterative,
+	cr_renderer_is_interactive,
 	// String
 	cr_renderer_asset_path,
 	cr_renderer_node_list,

integrations/blender/__init__.py

@@ -437,7 +437,7 @@ def view_update(self, context, depsgraph):
 		self.cr_renderer.prefs.tile_y = depsgraph.scene.c_ray.tile_size
 		self.cr_renderer.prefs.bounces = depsgraph.scene.c_ray.bounces
 		self.cr_renderer.prefs.node_list = depsgraph.scene.c_ray.node_list
-		self.cr_renderer.prefs.is_iterative = 1
+		self.cr_renderer.prefs.is_interactive = 1
 
 		# For reasons I can't fathom, depsgraph.updates doesn't let us know if the
 		# viewport camera changed, so we'll just assume that it did and fetch the whole

src/driver/args.c

@@ -37,7 +37,7 @@ static void printUsage(const char *progname) {
 	printf("    [-c <cam_index>] -> Select camera. Defaults to 0\n");
 	printf("    [-v]             -> Enable verbose mode\n");
 	printf("    [-vv]            -> Enable very verbose mode\n");
-	printf("    [--iterative]    -> Start in iterative mode (Experimental)\n");
+	printf("    [--interactive]  -> Start in interactive mode (Experimental)\n");
 	printf("    [--worker]       -> Start up as a network render worker (Experimental)\n");
 	printf("    [--nodes <list>] -> Use worker nodes in comma-separated ip:port list for a faster render (Experimental)\n");
 	printf("    [--shutdown]     -> Use in conjunction with a node list to send a shutdown command to a list of clients\n");
@@ -208,7 +208,7 @@ struct driver_args *args_parse(int argc, char **argv) {
 			setDatabaseInt(args, "test_idx", -3);
 		}
 
-		if (stringEquals(argv[i], "--iterative")) {
+		if (stringEquals(argv[i], "--interactive")) {
 			setDatabaseTag(args, "interactive");
 		}
 

src/driver/main.c

@@ -227,9 +227,9 @@ int main(int argc, char *argv[]) {
 
 	if (args_is_set(opts, "interactive")) {
 		if (args_is_set(opts, "nodes_list")) {
-			logr(warning, "Can't use iterative mode with network rendering yet, sorry.\n");
+			logr(warning, "Can't use interactive mode with network rendering yet, sorry.\n");
 		} else {
-			cr_renderer_set_num_pref(renderer, cr_renderer_is_iterative, 1);
+			cr_renderer_set_num_pref(renderer, cr_renderer_is_interactive, 1);
 		}
 	}
 

src/driver/sdl.c

@@ -390,7 +390,7 @@ enum input_event win_update(struct sdl_window *w, const struct cr_tile *tiles, s
 		}
 	}
 	// Render frames
-	// TODO: if (r->prefs.iterative || r->state.clients) {
+	// TODO: if (r->prefs.interactive|| r->state.clients) {
 	draw_frames(w->overlay, tiles, tile_count);
 	draw_prog_bars(w->overlay, tiles, tile_count);
 	//Update image data

src/lib/api/c-ray.c

@@ -110,8 +110,8 @@ bool cr_renderer_set_num_pref(struct cr_renderer *ext, enum cr_renderer_param p,
 			r->prefs.selected_camera = num;
 			return true;
 		}
-		case cr_renderer_is_iterative: {
-			r->prefs.iterative = true;
+		case cr_renderer_is_interactive: {
+			r->prefs.interactive = true;
 			return true;
 		}
 		case cr_renderer_blender_mode: {
@@ -164,7 +164,7 @@ void cr_renderer_stop(struct cr_renderer *ext) {
 	// TODO: use pthread_cond instead of silly busy-waiting loops like this
 	do {
 		v_timer_sleep_ms(10);
-	} while (r->prefs.iterative && r->state.s == r_exiting);
+	} while (r->prefs.interactive && r->state.s == r_exiting);
 }
 
 void cr_renderer_toggle_pause(struct cr_renderer *ext) {
@@ -826,7 +826,7 @@ void cr_renderer_render(struct cr_renderer *ext) {
 void cr_renderer_start_interactive(struct cr_renderer *ext) {
 	if (!ext) return;
 	struct renderer *r = (struct renderer *)ext;
-	r->prefs.iterative = true;
+	r->prefs.interactive = true;
 	if (!r->prefs.threads) {
 		return;
 	}
@@ -836,7 +836,7 @@ void cr_renderer_start_interactive(struct cr_renderer *ext) {
 void cr_renderer_restart_interactive(struct cr_renderer *ext) {
 	if (!ext) return;
 	struct renderer *r = (struct renderer *)ext;
-	if (!r->prefs.iterative) return;
+	if (!r->prefs.interactive) return;
 	if (!r->state.workers.count) return;
 	if (!r->state.result_buf) return;
 	if (!r->state.current_set) return;

src/lib/renderer/renderer.c

@@ -101,7 +101,7 @@ void update_cb_info(struct renderer *r, struct tile_set *set, struct cr_renderer
 	i->avg_per_ray_us = avg_per_ray_us;
 	i->samples_per_sec = sps;
 	i->eta_ms = eta_ms_till_done;
-	i->completion = r->prefs.iterative ?
+	i->completion = r->prefs.interactive ?
 		((double)r->state.finishedPasses / (double)r->prefs.sampleCount) :
 		((double)set->finished / (double)set->tiles.count);
 
@@ -234,7 +234,7 @@ void renderer_render(struct renderer *r) {
 		start.fn(&cb_info, start.user_data);
 	}
 
-	logr(info, "Pathtracing%s...\n", r->prefs.iterative ? " iteratively" : "");
+	logr(info, "Pathtracing%s...\n", r->prefs.interactive ? " iteratively" : "");
 
 	r->state.s = r_rendering;
 
@@ -247,7 +247,7 @@ void renderer_render(struct renderer *r) {
 	// Select the appropriate renderer type for local use
 	void *(*local_render_thread)(void *) = render_thread;
 	// Iterative mode is incompatible with network rendering at the moment
-	if (r->prefs.iterative && !r->state.clients.count) local_render_thread = render_thread_interactive;
+	if (r->prefs.interactive && !r->state.clients.count) local_render_thread = render_thread_interactive;
 
 	// Create & boot workers (Nonblocking)
 	// Local render threads + one thread for every client

src/lib/renderer/renderer.h

@@ -78,7 +78,7 @@ struct prefs {
 	unsigned override_height;
 	size_t selected_camera;
 	char *node_list;
-	bool iterative;
+	bool interactive;
 	bool blender_mode;
 };