Fixed camera flip bug.

Shadow lamp flags in plugin were not handled correctly.
Vertexcolors in plugin code were not exported.
Fixed a few bugs related to GIpower parameter.

3 files changed, 46 insertions, 50 deletions

diff --git a/source/blender/yafray/intern/export_File.cpp b/source/blender/yafray/intern/export_File.cpp
index 99fa0e25a8b..92a253edd15 100755
--- a/source/blender/yafray/intern/export_File.cpp
+++ b/source/blender/yafray/intern/export_File.cpp
@@ -432,7 +432,6 @@ void yafrayFileRender_t::writeMaterialsAndModulators()
 			Tex* tex = mtex->tex;
 			if (tex==NULL) continue;
 
-			//map<string, pair<Material*, MTex*> >::const_iterator mtexL = used_textures.find(string(tex->id.name+2));
 			// now included the full name
 			map<string, pair<Material*, MTex*> >::const_iterator mtexL = used_textures.find(string(tex->id.name));
 			if (mtexL!=used_textures.end()) {
@@ -560,7 +559,10 @@ void yafrayFileRender_t::writeMaterialsAndModulators()
 		ostr << "\t\t<specular_amount value=\"" << matr->spec << "\" />\n";
 		ostr << "\t\t<hard value=\"" << matr->har << "\" />\n";
 		ostr << "\t\t<alpha value=\"" << matr->alpha << "\" />\n";
-		ostr << "\t\t<emit value=\"" << (matr->emit * R.r.GIpower) << "\" />\n";
+		// if no GI used, the GIpower parameter is not always initialized, so in that case ignore it
+		float bg_mult;
+		if (R.r.GImethod==0) bg_mult=1; else bg_mult=R.r.GIpower;
+		ostr << "\t\t<emit value=\"" << (matr->emit * bg_mult) << "\" />\n";
 
 		// reflection/refraction
 		if ( (matr->mode & MA_RAYMIRROR) || (matr->mode & MA_RAYTRANSP) )
@@ -606,7 +608,6 @@ void yafrayFileRender_t::writeMaterialsAndModulators()
 			Tex* tex = mtex->tex;
 			if (tex==NULL) continue;
 
-			//map<string, pair<Material*, MTex*> >::const_iterator mtexL = used_textures.find(string(tex->id.name+2));
 			map<string, pair<Material*, MTex*> >::const_iterator mtexL = used_textures.find(string(tex->id.name));
 			if (mtexL!=used_textures.end()) {
 
@@ -753,7 +754,6 @@ void yafrayFileRender_t::writeObject(Object* obj, const vector<VlakRen*> &VLR_li
 	if (VLR_list[0]->mat->mode & MA_RAYTRANSP) 
 		ostr << "caus_IOR=\"" << VLR_list[0]->mat->ang << "\" ";
 	if (strlen(matname)==0) matname = "blender_default"; 
-	//else matname+=2;	//skip MA id
 	ostr << " shader_name=\"" << matname << "\" >\n";
 	ostr << "\t<attributes>\n";
 	if (VLR_list[0]->mat->mode & MA_RAYTRANSP) 
@@ -883,7 +883,6 @@ void yafrayFileRender_t::writeObject(Object* obj, const vector<VlakRen*> &VLR_li
 		bool EXPORT_VCOL = ((fmat->mode & (MA_VERTEXCOL|MA_VERTEXCOLP))!=0);
 		char* fmatname = fmat->id.name;
 		if (strlen(fmatname)==0) fmatname = "blender_default"; 
-		//else fmatname+=2;	//skip MA id
 		TFace* uvc = vlr->tface;	// possible uvcoords (v upside down)
 		int idx1, idx2, idx3;
 
@@ -1046,7 +1045,8 @@ void yafrayFileRender_t::writeAreaLamp(LampRen* lamp, int num, float iview[4][4]
 	
 	ostr.str("");
 	string md = "off";
-	if (R.r.GIphotons) {md = "on";power*=R.r.GIpower;}
+	// if no GI used, the GIphotons flag can still be set, so only use when 'full' selected
+	if ((R.r.GImethod==2) && (R.r.GIphotons)) { md="on";  power*=R.r.GIpower; }
 	ostr << "<light type=\"arealight\" name=\"LAMP" << num+1 << "\" dummy=\""<< md << "\" power=\"" << power << "\" ";
 	if (!R.r.GIphotons) {
 		int psm=0, sm = lamp->ray_totsamp;
@@ -1077,7 +1077,7 @@ void yafrayFileRender_t::writeAreaLamp(LampRen* lamp, int num, float iview[4][4]
 
 void yafrayFileRender_t::writeLamps()
 {
-	// inver viewmatrix needed for back2world transform
+	// inverse viewmatrix needed for back2world transform
 	float iview[4][4];
 	// R.viewinv != inv.R.viewmat because of possible ortho mode (see convertBlenderScene.c)
 	// have to invert it here
@@ -1135,12 +1135,11 @@ void yafrayFileRender_t::writeLamps()
 		ostr << " >\n";
 
 		// transform lamp co & vec back to world
-		float lpco[3], lpvec[4];
+		float lpco[3], lpvec[3];
 		MTC_cp3Float(lamp->co, lpco);
 		MTC_Mat4MulVecfl(iview, lpco);
 		MTC_cp3Float(lamp->vec, lpvec);
-		lpvec[3] = 0;	// vec, not point
-		MTC_Mat4MulVec4fl(iview, lpvec);
+		MTC_Mat4Mul3Vecfl(iview, lpvec);
 
 		// position, (==-blendir for sun/hemi)
 		if ((lamp->type==LA_SUN) || (lamp->type==LA_HEMI))
@@ -1201,7 +1200,7 @@ void yafrayFileRender_t::writeCamera()
 	ostr << "\t<from x=\"" << maincam_obj->obmat[3][0] << "\""
 							<< " y=\"" << maincam_obj->obmat[3][1] << "\""
 							<< " z=\"" << maincam_obj->obmat[3][2] << "\" />\n";
-	float fdist = -R.viewmat[3][2];
+	float fdist = fabs(R.viewmat[3][2]);
 	if (R.r.mode & R_ORTHO) fdist *= 0.01f;
 	ostr << "\t<to x=\"" << maincam_obj->obmat[3][0] - fdist * R.viewmat[0][2]
 					<< "\" y=\"" << maincam_obj->obmat[3][1] - fdist * R.viewmat[1][2]
diff --git a/source/blender/yafray/intern/export_Plugin.cpp b/source/blender/yafray/intern/export_Plugin.cpp
index 03647e87812..1e035073a24 100644
--- a/source/blender/yafray/intern/export_Plugin.cpp
+++ b/source/blender/yafray/intern/export_Plugin.cpp
@@ -560,7 +560,10 @@ void yafrayPluginRender_t::writeMaterialsAndModulators()
 		params["specular_amount"]=yafray::parameter_t(matr->spec);
 		params["hard"]=yafray::parameter_t(matr->har);
 		params["alpha"]=yafray::parameter_t(matr->alpha);
-		params["emit"]=yafray::parameter_t(matr->emit * R.r.GIpower);
+		// if no GI used, the GIpower parameter is not always initialized, so in that case ignore it
+		float bg_mult;
+		if (R.r.GImethod==0) bg_mult=1; else bg_mult=R.r.GIpower;
+		params["emit"]=yafray::parameter_t(matr->emit * bg_mult);
 
 		// reflection/refraction
 		if ( (matr->mode & MA_RAYMIRROR) || (matr->mode & MA_RAYTRANSP) )
@@ -773,28 +776,28 @@ void yafrayPluginRender_t::genVcol(vector<yafray::CFLOAT> &vcol,VlakRen *vlr,
 		vr = ((vlr->vcol[p1] >> 24) & 255)/255.0;
 		vg = ((vlr->vcol[p1] >> 16) & 255)/255.0;
 		vb = ((vlr->vcol[p1] >> 8) & 255)/255.0;
-		vcol.push_back(vr);vcol.push_back(vg);vcol.push_back(vb);
+		vcol.push_back(vr);  vcol.push_back(vg);  vcol.push_back(vb);
 		vr = ((vlr->vcol[p2] >> 24) & 255)/255.0;
 		vg = ((vlr->vcol[p2] >> 16) & 255)/255.0;
 		vb = ((vlr->vcol[p2] >> 8) & 255)/255.0;
-		vcol.push_back(vr);vcol.push_back(vg);vcol.push_back(vb);
+		vcol.push_back(vr);  vcol.push_back(vg);  vcol.push_back(vb);
 		vr = ((vlr->vcol[p3] >> 24) & 255)/255.0;
 		vg = ((vlr->vcol[p3] >> 16) & 255)/255.0;
 		vb = ((vlr->vcol[p3] >> 8) & 255)/255.0;
-		vcol.push_back(vr);vcol.push_back(vg);vcol.push_back(vb);
+		vcol.push_back(vr);  vcol.push_back(vg);  vcol.push_back(vb);
 	}
 	else
 	{
-		vcol.push_back(0);vcol.push_back(0);vcol.push_back(0);
-		vcol.push_back(0);vcol.push_back(0);vcol.push_back(0);
-		vcol.push_back(0);vcol.push_back(0);vcol.push_back(0);
+		vcol.push_back(0);  vcol.push_back(0);  vcol.push_back(0);
+		vcol.push_back(0);  vcol.push_back(0);  vcol.push_back(0);
+		vcol.push_back(0);  vcol.push_back(0);  vcol.push_back(0);
 	}
 }
 
 void yafrayPluginRender_t::genFace(vector<int> &faces,vector<string> &shaders,vector<int> &faceshader,
 														vector<yafray::GFLOAT> &uvcoords,vector<yafray::CFLOAT> &vcol,
 														map<VertRen*, int> &vert_idx,VlakRen *vlr,
-														bool has_orco,bool has_uv,bool has_vcol)
+														bool has_orco,bool has_uv, bool has_vcol)
 {
 	Material* fmat = vlr->mat;
 	bool EXPORT_VCOL = ((fmat->mode & (MA_VERTEXCOL|MA_VERTEXCOLP))!=0);
@@ -813,7 +816,6 @@ void yafrayPluginRender_t::genFace(vector<int> &faces,vector<string> &shaders,ve
 		shaders.push_back(fmatname);
 		faceshader.push_back(shaders.size()-1);
 	}
-	//else fmatname+=2;	//skip MA id
 	TFace* uvc = vlr->tface;	// possible uvcoords (v upside down)
 	int idx1, idx2, idx3;
 
@@ -829,13 +831,13 @@ void yafrayPluginRender_t::genFace(vector<int> &faces,vector<string> &shaders,ve
 	if(has_uv) genUVcoords(uvcoords,vlr,uvc);
 
 	// since Blender seems to need vcols when uvs are used, for yafray only export when the material actually uses vcols
-	if(has_vcol) genVcol(vcol,vlr,0,1,2,EXPORT_VCOL);
+	if (has_vcol) genVcol(vcol,vlr,0,1,2,EXPORT_VCOL);
 }
 
 void yafrayPluginRender_t::genCompleFace(vector<int> &faces,/*vector<string> &shaders,*/vector<int> &faceshader,
 														vector<yafray::GFLOAT> &uvcoords,vector<yafray::CFLOAT> &vcol,
 														map<VertRen*, int> &vert_idx,VlakRen *vlr,
-														bool has_orco,bool has_uv,bool has_vcol)
+														bool has_orco,bool has_uv, bool has_vcol)
 {
 	Material* fmat = vlr->mat;
 	bool EXPORT_VCOL = ((fmat->mode & (MA_VERTEXCOL|MA_VERTEXCOLP))!=0);
@@ -853,7 +855,7 @@ void yafrayPluginRender_t::genCompleFace(vector<int> &faces,/*vector<string> &sh
 	faces.push_back(idx1);faces.push_back(idx2);faces.push_back(idx3);
 
 	if(has_uv) genCompleUVcoords(uvcoords,/*vlr,*/uvc);
-	if(has_vcol) genVcol(vcol,vlr,2,3,0,EXPORT_VCOL);
+	if (has_vcol) genVcol(vcol,vlr,2,3,0,EXPORT_VCOL);
 }
 
 void yafrayPluginRender_t::genVertices(vector<yafray::point3d_t> &verts, int &vidx,
@@ -906,10 +908,10 @@ void yafrayPluginRender_t::genVertices(vector<yafray::point3d_t> &verts, int &vi
 void yafrayPluginRender_t::writeObject(Object* obj, const vector<VlakRen*> &VLR_list, const float obmat[4][4])
 {
 	float mtr[4*4];
-	mtr[0*4+0]=obmat[0][0];mtr[0*4+1]=obmat[1][0];mtr[0*4+2]=obmat[2][0];mtr[0*4+3]=obmat[3][0];
-	mtr[1*4+0]=obmat[0][1];mtr[1*4+1]=obmat[1][1];mtr[1*4+2]=obmat[2][1];mtr[1*4+3]=obmat[3][1];
-	mtr[2*4+0]=obmat[0][2];mtr[2*4+1]=obmat[1][2];mtr[2*4+2]=obmat[2][2];mtr[2*4+3]=obmat[3][2];
-	mtr[3*4+0]=obmat[0][3];mtr[3*4+1]=obmat[1][3];mtr[3*4+2]=obmat[2][3];mtr[3*4+3]=obmat[3][3];
+	mtr[0*4+0]=obmat[0][0];  mtr[0*4+1]=obmat[1][0];  mtr[0*4+2]=obmat[2][0];  mtr[0*4+3]=obmat[3][0];
+	mtr[1*4+0]=obmat[0][1];  mtr[1*4+1]=obmat[1][1];  mtr[1*4+2]=obmat[2][1];  mtr[1*4+3]=obmat[3][1];
+	mtr[2*4+0]=obmat[0][2];  mtr[2*4+1]=obmat[1][2];  mtr[2*4+2]=obmat[2][2];  mtr[2*4+3]=obmat[3][2];
+	mtr[3*4+0]=obmat[0][3];  mtr[3*4+1]=obmat[1][3];  mtr[3*4+2]=obmat[2][3];  mtr[3*4+3]=obmat[3][3];
 	yafrayGate->transformPush(mtr);
 	string name=string(obj->id.name+2);
 	bool castShadows=VLR_list[0]->mat->mode & MA_TRACEBLE;
@@ -920,7 +922,7 @@ void yafrayPluginRender_t::writeObject(Object* obj, const vector<VlakRen*> &VLR_
 	{
 		caus_IOR=VLR_list[0]->mat->ang;
 		float tr=1.0-VLR_list[0]->mat->alpha;
-		caus_tcolor.set(VLR_list[0]->mat->r * tr,VLR_list[0]->mat->g * tr,VLR_list[0]->mat->b * tr);
+		caus_tcolor.set(VLR_list[0]->mat->r*tr, VLR_list[0]->mat->g*tr, VLR_list[0]->mat->b*tr);
 		caus=true;
 	}
 	bool has_orco=(VLR_list[0]->v1->orco!=NULL);
@@ -942,12 +944,8 @@ void yafrayPluginRender_t::writeObject(Object* obj, const vector<VlakRen*> &VLR_
 	}
 	// Guess if we need to set vertex colors Could be faster? sure
 	bool has_vcol=false;
-	for(int i=0;i<obj->totcol;++i)
-	{
-		Material *fmat=obj->mat[i];
-		if(fmat==NULL) continue;
-		if((fmat->mode & (MA_VERTEXCOL|MA_VERTEXCOLP))!=0) {has_vcol=true;break;};
-	}
+	if ((obj->type==OB_MESH) && (obj->data!=NULL))
+		has_vcol = (((Mesh*)obj->data)->mcol!=NULL);
 	vector<yafray::point3d_t> verts;
 	vector<yafray::CFLOAT> vcol;
 	// now all vertices
@@ -970,9 +968,9 @@ void yafrayPluginRender_t::writeObject(Object* obj, const vector<VlakRen*> &VLR_
 				fci2!=VLR_list.end();++fci2)
 	{
 		VlakRen* vlr = *fci2;
-		genFace(faces,shaders,faceshader,uvcoords,vcol,vert_idx,vlr,has_orco,has_uv,has_vcol);
+		genFace(faces, shaders, faceshader, uvcoords, vcol, vert_idx, vlr, has_orco, has_uv, has_vcol);
 		if (vlr->v4) 
-			genCompleFace(faces,/*shaders,*/faceshader,uvcoords,vcol,vert_idx,vlr,has_orco,has_uv,has_vcol);
+			genCompleFace(faces, /*shaders,*/ faceshader, uvcoords, vcol, vert_idx, vlr, has_orco, has_uv, has_vcol);
 	}
 
 	yafrayGate->addObject_trimesh(name,verts,faces,uvcoords,vcol,
@@ -1024,10 +1022,10 @@ void yafrayPluginRender_t::writeAllObjects()
 			MTC_Mat4MulMat4(cmat, imat, nmat);	// transform with respect to original = inverse_original * new
 
 			float mtr[4*4];
-			mtr[0*4+0]=cmat[0][0];mtr[0*4+1]=cmat[1][0];mtr[0*4+2]=cmat[2][0];mtr[0*4+3]=cmat[3][0];
-			mtr[1*4+0]=cmat[0][1];mtr[1*4+1]=cmat[1][1];mtr[1*4+2]=cmat[2][1];mtr[1*4+3]=cmat[3][1];
-			mtr[2*4+0]=cmat[0][2];mtr[2*4+1]=cmat[1][2];mtr[2*4+2]=cmat[2][2];mtr[2*4+3]=cmat[3][2];
-			mtr[3*4+0]=cmat[0][3];mtr[3*4+1]=cmat[1][3];mtr[3*4+2]=cmat[2][3];mtr[3*4+3]=cmat[3][3];
+			mtr[0*4+0]=cmat[0][0];  mtr[0*4+1]=cmat[1][0];  mtr[0*4+2]=cmat[2][0];  mtr[0*4+3]=cmat[3][0];
+			mtr[1*4+0]=cmat[0][1];  mtr[1*4+1]=cmat[1][1];  mtr[1*4+2]=cmat[2][1];  mtr[1*4+3]=cmat[3][1];
+			mtr[2*4+0]=cmat[0][2];  mtr[2*4+1]=cmat[1][2];  mtr[2*4+2]=cmat[2][2];  mtr[2*4+3]=cmat[3][2];
+			mtr[3*4+0]=cmat[0][3];  mtr[3*4+1]=cmat[1][3];  mtr[3*4+2]=cmat[2][3];  mtr[3*4+3]=cmat[3][3];
 			yafrayGate->transformPush(mtr);
 
 			// new name from original
@@ -1052,7 +1050,8 @@ void yafrayPluginRender_t::writeAreaLamp(LampRen* lamp, int num, float iview[4][
 	float power=lamp->energy;
 	
 	string md = "off";
-	if (R.r.GIphotons) {md = "on";power*=R.r.GIpower;}
+	// if no GI used, the GIphotons flag can still be set, so only use when 'full' selected
+	if ((R.r.GImethod==2) && (R.r.GIphotons)) { md="on";  power*=R.r.GIpower; }
 	params["type"]=yafray::parameter_t("arealight");
 	char temp[16];
 	sprintf(temp,"LAMP%d",num+1);
@@ -1137,9 +1136,8 @@ void yafrayPluginRender_t::writeLamps()
 		string lpmode="off";
 		// shadows only when Blender has shadow button enabled, only spots use LA_SHAD flag
 		if (R.r.mode & R_SHADOW)
-			params["cast_shadows"]=yafray::parameter_t("on");
-		else
-			params["cast_shadows"]=yafray::parameter_t("off");
+			if (((lamp->type==LA_SPOT) && (lamp->mode & LA_SHAD)) || (lamp->mode & LA_SHAD_RAY)) lpmode="on";
+		params["cast_shadows"]=yafray::parameter_t(lpmode);
 		// spot specific stuff
 		if (lamp->type==LA_SPOT) 
 		{
@@ -1152,12 +1150,11 @@ void yafrayPluginRender_t::writeLamps()
 		}
 
 		// transform lamp co & vec back to world
-		float lpco[3], lpvec[4];
+		float lpco[3], lpvec[3];
 		MTC_cp3Float(lamp->co, lpco);
 		MTC_Mat4MulVecfl(iview, lpco);
 		MTC_cp3Float(lamp->vec, lpvec);
-		lpvec[3] = 0;	// vec, not point
-		MTC_Mat4MulVec4fl(iview, lpvec);
+		MTC_Mat4Mul3Vecfl(iview, lpvec);
 
 		// position, (==-blendir for sun/hemi)
 		if ((lamp->type==LA_SUN) || (lamp->type==LA_HEMI))
@@ -1206,7 +1203,7 @@ void yafrayPluginRender_t::writeCamera()
 
 	params["from"]=yafray::parameter_t(
 			yafray::point3d_t(maincam_obj->obmat[3][0], maincam_obj->obmat[3][1], maincam_obj->obmat[3][2]));
-	float fdist = -R.viewmat[3][2];
+	float fdist = fabs(R.viewmat[3][2]);
 	if (R.r.mode & R_ORTHO) fdist *= 0.01f;
 	params["to"]=yafray::parameter_t(
 			yafray::point3d_t(maincam_obj->obmat[3][0] - fdist * R.viewmat[0][2],
diff --git a/source/blender/yafray/intern/export_Plugin.h b/source/blender/yafray/intern/export_Plugin.h
index 079b484b7ad..c7adab723a6 100644
--- a/source/blender/yafray/intern/export_Plugin.h
+++ b/source/blender/yafray/intern/export_Plugin.h
@@ -52,11 +52,11 @@ class yafrayPluginRender_t : public yafrayRender_t
 		void genFace(std::vector<int> &faces,std::vector<std::string> &shaders,std::vector<int> &faceshader,
 				std::vector<yafray::GFLOAT> &uvcoords,std::vector<yafray::CFLOAT> &vcol,
 				std::map<VertRen*, int> &vert_idx,VlakRen *vlr,
-				bool has_orco,bool has_uv,bool has_vcol);
+				bool has_orco,bool has_uv, bool has_vcol);
 		void genCompleFace(std::vector<int> &faces,/*std::vector<std::string> &shaders,*/std::vector<int> &faceshader,
 				std::vector<yafray::GFLOAT> &uvcoords,std::vector<yafray::CFLOAT> &vcol,
 				std::map<VertRen*, int> &vert_idx,VlakRen *vlr,
-				bool has_orco,bool has_uv,bool has_vcol);
+				bool has_orco,bool has_uv, bool has_vcol);
 		void genVertices(std::vector<yafray::point3d_t> &verts, int &vidx,
 										 std::map<VertRen*, int> &vert_idx, VlakRen* vlr, bool has_orco, Object* obj);
 };