Differential D1857 Diff 6262 E:\LinM\blender\cycles\src\app\cycles_xml.cpp

Changeset View

Standalone View

E:\LinM\blender\cycles\src\app\cycles_xml.cpp

Context not available.
	* RGBCurvesNode, VectorCurvesNode, RGBRampNode and ConvertNode (RGB -> BW).	* RGBCurvesNode, VectorCurvesNode, RGBRampNode and ConvertNode (RGB -> BW).
	*/	*/

	if(string_iequals(node.name(), "image_texture")) {	if(string_iequals(node.name(), "rgb_curves")) {
		RGBCurvesNode *rgbcurves = new RGBCurvesNode();

		int curve_table_size = 0;
		xml_read_int(&curve_table_size, node, "size");
		if (curve_table_size != RAMP_TABLE_SIZE)
		fprintf(stderr, "Error table size \"%d\".\n", curve_table_size);

		vector<int> r_curve;
		vector<int> g_curve;
		vector<int> b_curve;
		xml_read_int_array(r_curve, node, "rcurve");
		xml_read_int_array(g_curve, node, "gcurve");
		xml_read_int_array(b_curve, node, "bcurve");

		for(int i = 0; i < curve_table_size; i++) {
		float t_r = (float)i/(float)(curve_table_size-1) * r_curve[i];
		float t_g = (float)i/(float)(curve_table_size-1) * g_curve[i];
		float t_b = (float)i/(float)(curve_table_size-1) * b_curve[i];

		rgbcurves->curves[i][0] = t_r;
		rgbcurves->curves[i][1] = t_g;
		rgbcurves->curves[i][2] = t_b;
		}

		snode = rgbcurves;
		}
		else if(string_iequals(node.name(), "image_texture")) {
	ImageTextureNode *img = new ImageTextureNode();	ImageTextureNode *img = new ImageTextureNode();

	xml_read_string(&img->filename, node, "src");	xml_read_string(&img->filename, node, "src");
Context not available.

	static void xml_read_shader(const XMLReadState& state, pugi::xml_node node)	static void xml_read_shader(const XMLReadState& state, pugi::xml_node node)
	{	{
	Shader *shader = new Shader();	/* read shader */
		string shadername;
		xml_read_string(&shadername, node, "shader");

	xml_read_string(&shader->name, node, "name");	int i = 0;
	xml_read_bool(&shader->use_mis, node, "use_mis");	int shader_id = -1;
	xml_read_bool(&shader->use_transparent_shadow, node, "use_transparent_shadow");

	/* Volume */	foreach(Shader *shader, state.scene->shaders) {
	xml_read_bool(&shader->heterogeneous_volume, node, "heterogeneous_volume");	if (shader->name == shadername) {
	xml_read_int(&shader->volume_interpolation_method, node, "volume_interpolation_method");	shader_id = i;
		break;
		}

	if(xml_equal_string(node, "volume_sampling_method", "distance"))	i++;
	shader->volume_sampling_method = VOLUME_SAMPLING_DISTANCE;	}
	else if(xml_equal_string(node, "volume_sampling_method", "equiangular"))
	shader->volume_sampling_method = VOLUME_SAMPLING_EQUIANGULAR;
	else if(xml_equal_string(node, "volume_sampling_method", "multiple_importance"))
	shader->volume_sampling_method = VOLUME_SAMPLING_MULTIPLE_IMPORTANCE;

	xml_read_shader_graph(state, shader, node);	Shader *shader = NULL;
	state.scene->shaders.push_back(shader);	if (shader_id != -1) {
		shader = state.scene->shaders[shader_id];
		xml_read_shader_graph(state, shader, node);
		}
		else {
		shader = new Shader();
		xml_read_string(&shader->name, node, "name");
		xml_read_bool(&shader->use_mis, node, "use_mis");
		xml_read_bool(&shader->use_transparent_shadow, node, "use_transparent_shadow");

		/* Volume */
		xml_read_bool(&shader->heterogeneous_volume, node, "heterogeneous_volume");
		xml_read_int(&shader->volume_interpolation_method, node, "volume_interpolation_method");

		if (xml_equal_string(node, "volume_sampling_method", "distance"))
		shader->volume_sampling_method = VOLUME_SAMPLING_DISTANCE;
		else if (xml_equal_string(node, "volume_sampling_method", "equiangular"))
		shader->volume_sampling_method = VOLUME_SAMPLING_EQUIANGULAR;
		else if (xml_equal_string(node, "volume_sampling_method", "multiple_importance"))
		shader->volume_sampling_method = VOLUME_SAMPLING_MULTIPLE_IMPORTANCE;

		state.scene->shaders.push_back(shader);
		}
	}	}

	/* Background */	/* Background */
Context not available.
	pugi::xml_parse_result parse_result;	pugi::xml_parse_result parse_result;

	string path = path_join(state.base, src);	string path = path_join(state.base, src);
		std::cout << path << std::endl;
		juicyfruitUnsubmitted Not Done Inline Actions I am assuming this is a debug print? Also we do have a proper logging infrastructure in cycles, so please use that juicyfruit: I am assuming this is a debug print? Also we do have a proper logging infrastructure in cycles…
	parse_result = doc.load_file(path.c_str());	parse_result = doc.load_file(path.c_str());

	if(parse_result) {	if(parse_result) {
Context not available.