[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35816] trunk/blender/source/blender/ collada: Add blender light profile.

[Nathan Letwory]

Revision: 35816
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35816
Author:   jesterking
Date:     2011-03-27 09:46:20 +0000 (Sun, 27 Mar 2011)
Log Message:
-----------
Add blender light profile.

Modified Paths:
--------------
    trunk/blender/source/blender/collada/ExtraTags.cpp
    trunk/blender/source/blender/collada/LightExporter.cpp
    trunk/blender/source/blender/collada/LightExporter.h

Modified: trunk/blender/source/blender/collada/ExtraTags.cpp
===================================================================
--- trunk/blender/source/blender/collada/ExtraTags.cpp	2011-03-27 08:31:10 UTC (rev 35815)
+++ trunk/blender/source/blender/collada/ExtraTags.cpp	2011-03-27 09:46:20 UTC (rev 35816)
@@ -44,7 +44,7 @@
 
 bool ExtraTags::addTag(const std::string tag, const std::string data)
 {
-	//std::cout << "ready to add " << tag << ": " << data << "." << std::endl;
+	std::cout << "ready to add " << tag << ": " << data << "." << std::endl;
 	
 	return true;
 }

Modified: trunk/blender/source/blender/collada/LightExporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/LightExporter.cpp	2011-03-27 08:31:10 UTC (rev 35815)
+++ trunk/blender/source/blender/collada/LightExporter.cpp	2011-03-27 09:46:20 UTC (rev 35816)
@@ -27,14 +27,11 @@
  *  \ingroup collada
  */
 
-
 #include <string>
 
 #include "COLLADASWColor.h"
 #include "COLLADASWLight.h"
 
-#include "DNA_lamp_types.h"
-
 #include "BLI_math.h"
 
 #include "LightExporter.h"
@@ -102,6 +99,7 @@
 		COLLADASW::DirectionalLight cla(mSW, la_id, la_name, e);
 		cla.setColor(col);
 		cla.setConstantAttenuation(constatt);
+		exportBlenderProfile(cla, la);
 		addLight(cla);
 	}
 	// hemi
@@ -109,6 +107,7 @@
 		COLLADASW::AmbientLight cla(mSW, la_id, la_name, e);
 		cla.setColor(col);
 		cla.setConstantAttenuation(constatt);
+		exportBlenderProfile(cla, la);
 		addLight(cla);
 	}
 	// spot
@@ -120,6 +119,7 @@
 		cla.setConstantAttenuation(constatt);
 		cla.setLinearAttenuation(linatt);
 		cla.setQuadraticAttenuation(quadatt);
+		exportBlenderProfile(cla, la);
 		addLight(cla);
 	}
 	// lamp
@@ -129,6 +129,7 @@
 		cla.setConstantAttenuation(constatt);
 		cla.setLinearAttenuation(linatt);
 		cla.setQuadraticAttenuation(quadatt);
+		exportBlenderProfile(cla, la);
 		addLight(cla);
 	}
 	// area lamp is not supported
@@ -139,6 +140,42 @@
 		cla.setConstantAttenuation(constatt);
 		cla.setLinearAttenuation(linatt);
 		cla.setQuadraticAttenuation(quadatt);
+		exportBlenderProfile(cla, la);
 		addLight(cla);
 	}
+	
 }
+
+bool LightsExporter::exportBlenderProfile(COLLADASW::Light &cla, Lamp *la)
+{
+	cla.addExtraTechniqueParameter("blender", "type", la->type);
+	cla.addExtraTechniqueParameter("blender", "flag", la->flag);
+	cla.addExtraTechniqueParameter("blender", "mode", la->mode);
+	cla.addExtraTechniqueParameter("blender", "gamma", la->k);
+	cla.addExtraTechniqueParameter("blender", "shadow_r", la->shdwr);
+	cla.addExtraTechniqueParameter("blender", "shadow_g", la->shdwg);
+	cla.addExtraTechniqueParameter("blender", "shadow_b", la->shdwb);
+	cla.addExtraTechniqueParameter("blender", "energy", la->energy);
+	cla.addExtraTechniqueParameter("blender", "dist", la->dist);
+	cla.addExtraTechniqueParameter("blender", "spotsize", la->spotsize);
+	cla.addExtraTechniqueParameter("blender", "spotblend", la->spotblend);
+	cla.addExtraTechniqueParameter("blender", "halo_intensity", la->haint);
+	cla.addExtraTechniqueParameter("blender", "att1", la->att1);
+	cla.addExtraTechniqueParameter("blender", "att2", la->att2);
+	// \todo figure out how we can have falloff curve supported here
+	cla.addExtraTechniqueParameter("blender", "falloff_type", la->falloff_type);
+	cla.addExtraTechniqueParameter("blender", "clipsta", la->clipsta);
+	cla.addExtraTechniqueParameter("blender", "clipend", la->clipend);
+	cla.addExtraTechniqueParameter("blender", "shadspotsize", la->shadspotsize);
+	cla.addExtraTechniqueParameter("blender", "bias", la->bias);
+	cla.addExtraTechniqueParameter("blender", "soft", la->soft);
+	cla.addExtraTechniqueParameter("blender", "compressthresh", la->compressthresh);
+	cla.addExtraTechniqueParameter("blender", "bufsize", la->bufsize);
+	cla.addExtraTechniqueParameter("blender", "samp", la->samp);
+	cla.addExtraTechniqueParameter("blender", "buffers", la->buffers);
+	cla.addExtraTechniqueParameter("blender", "filtertype", la->filtertype);
+	cla.addExtraTechniqueParameter("blender", "bufflag", la->bufflag);
+	cla.addExtraTechniqueParameter("blender", "buftype", la->buftype);
+	
+	return true;
+}

Modified: trunk/blender/source/blender/collada/LightExporter.h
===================================================================
--- trunk/blender/source/blender/collada/LightExporter.h	2011-03-27 08:31:10 UTC (rev 35815)
+++ trunk/blender/source/blender/collada/LightExporter.h	2011-03-27 09:46:20 UTC (rev 35816)
@@ -33,6 +33,7 @@
 #include "COLLADASWStreamWriter.h"
 #include "COLLADASWLibraryLights.h"
 
+#include "DNA_lamp_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 
@@ -42,6 +43,8 @@
 	LightsExporter(COLLADASW::StreamWriter *sw);
 	void exportLights(Scene *sce);
 	void operator()(Object *ob);
+private:
+	bool exportBlenderProfile(COLLADASW::Light &cla, Lamp *la);
 };
 
 #endif