[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11389] branches/soc-2007-mosani/source/ blender/render: Added begun adding lights to the blender database
Aaron Moore
two.a.ron at gmail.com
Fri Jul 27 11:37:17 CEST 2007
Revision: 11389
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11389
Author: mosani
Date: 2007-07-27 11:37:16 +0200 (Fri, 27 Jul 2007)
Log Message:
-----------
Added begun adding lights to the blender database
via the render API.
Modified Paths:
--------------
branches/soc-2007-mosani/source/blender/render/extern/include/RE_pipeline.h
branches/soc-2007-mosani/source/blender/render/intern/include/renderdatabase.h
branches/soc-2007-mosani/source/blender/render/intern/include/renderpipeline.h
branches/soc-2007-mosani/source/blender/render/intern/source/pipeline.c
branches/soc-2007-mosani/source/blender/render/intern/source/rendercallbacks.c
branches/soc-2007-mosani/source/blender/render/render_api/include/RenderAPI.h
Modified: branches/soc-2007-mosani/source/blender/render/extern/include/RE_pipeline.h
===================================================================
--- branches/soc-2007-mosani/source/blender/render/extern/include/RE_pipeline.h 2007-07-27 09:30:54 UTC (rev 11388)
+++ branches/soc-2007-mosani/source/blender/render/extern/include/RE_pipeline.h 2007-07-27 09:37:16 UTC (rev 11389)
@@ -180,13 +180,6 @@
void RE_BlenderFrame(struct Render *re, struct Scene *scene, int frame);
void RE_BlenderAnim(struct Render *re, struct Scene *scene, int sfra, int efra);
-/* Wrappers for the render control callbacks (these callbacks are overwritten
- if an external renderer is being used) */
-void RE_Setup( struct Render *re, struct Scene *scene );
-void RE_RenderFrame( struct Render *re );
-void RE_Finish( struct Render *re );
-void RE_Abort( struct Render *re );
-
void RE_ReadRenderResult(struct Scene *scene, struct Scene *scenode);
void RE_WriteRenderResult(RenderResult *rr, char *filename, int compress);
struct RenderResult *RE_MultilayerConvert(void *exrhandle, int rectx, int recty);
Modified: branches/soc-2007-mosani/source/blender/render/intern/include/renderdatabase.h
===================================================================
--- branches/soc-2007-mosani/source/blender/render/intern/include/renderdatabase.h 2007-07-27 09:30:54 UTC (rev 11388)
+++ branches/soc-2007-mosani/source/blender/render/intern/include/renderdatabase.h 2007-07-27 09:37:16 UTC (rev 11389)
@@ -22,7 +22,7 @@
*
* The Original Code is: all of this file.
*
- * Contributor(s): none yet.
+ * Contributor(s): Aaron Moore (mosani)
*
* ***** END GPL LICENSE BLOCK *****
*/
@@ -189,5 +189,19 @@
void RE_Database_FromScene_Vectors(Render *re, struct Scene *sce);
+
+
+/*
+ * Render API Convert Prototypes
+ * - defined in RND_convertblender.c
+ * - used to create a RenderDatabase structure
+ * from a Scene structure
+ */
+
+RenderDatabase *database_from_scene( RNDScene scene );
+void database_free( RenderDatabase *database );
+void database_add_lamp( RenderDatabase *database, RNDObject object );
+
+
#endif /* RENDERDATABASE_H */
Modified: branches/soc-2007-mosani/source/blender/render/intern/include/renderpipeline.h
===================================================================
--- branches/soc-2007-mosani/source/blender/render/intern/include/renderpipeline.h 2007-07-27 09:30:54 UTC (rev 11388)
+++ branches/soc-2007-mosani/source/blender/render/intern/include/renderpipeline.h 2007-07-27 09:37:16 UTC (rev 11389)
@@ -34,9 +34,18 @@
struct RenderResult;
struct RenderLayer;
+struct Scene;
+
struct RenderLayer *render_get_active_layer(struct Render *re, struct RenderResult *rr);
float panorama_pixel_rot(struct Render *re);
+/* Wrappers for the render control callbacks (these callbacks are overwritten
+ if an external renderer is being used) */
+void Setup( struct Render *re, struct Scene *scene );
+void Render_Frame( struct Render *re );
+void Finish( struct Render *re );
+void Abort( struct Render *re );
+
#define PASS_VECTOR_MAX 10000.0f
#endif /* PIPELINE_H */
Modified: branches/soc-2007-mosani/source/blender/render/intern/source/pipeline.c
===================================================================
--- branches/soc-2007-mosani/source/blender/render/intern/source/pipeline.c 2007-07-27 09:30:54 UTC (rev 11388)
+++ branches/soc-2007-mosani/source/blender/render/intern/source/pipeline.c 2007-07-27 09:37:16 UTC (rev 11389)
@@ -1513,7 +1513,7 @@
static void do_render_3d(Render *re)
{
if(G.renderAPI_toggle & 1){ /* if we're using the render api */
- RE_RenderFrame( re );
+ Render_Frame( re );
return;
}
/* re->cfra= cfra; <- unused! */
@@ -2207,7 +2207,7 @@
re->display_clear(re->result);
/**** Initialize Renderer ****/
- RE_Setup( re, scene );
+ Setup( re, scene );
return 1;
}
@@ -2284,7 +2284,10 @@
do_render_all_options(re);
}
- RE_Finish( re );
+ if(G.renderAPI_toggle & 1)
+ {
+ Finish( re );
+ }
/* UGLY WARNING */
G.rendering= 0;
@@ -2414,7 +2417,10 @@
scene->r.cfra= cfrao;
- RE_Finish( re );
+ if(G.renderAPI_toggle & 1)
+ {
+ Finish( re );
+ }
/* UGLY WARNING */
G.rendering= 0;
@@ -2424,7 +2430,7 @@
* ------------------------ Render Control Calls ------------------------- *
* ------------------------------------------------------------------------- */
-void RE_Setup( struct Render *re, struct Scene *scene )
+void Setup( struct Render *re, struct Scene *scene )
{
/* do generic setup tasks */
re->api_scene = RenderAPI_create_scene( scene );
@@ -2445,16 +2451,16 @@
/* tell renderer to do it's setup tasks */
re->setup( re->api_scene );
}
-void RE_RenderFrame( struct Render *re )
+void Render_Frame( struct Render *re )
{
re->render_frame( re->api_scene, re->api_result );
}
-void RE_Finish( struct Render *re )
+void Finish( struct Render *re )
{
RenderAPI_free_scene( re->api_scene );
re->finish();
}
-void RE_Abort( struct Render *re )
+void Abort( struct Render *re )
{
re->abort();
}
Modified: branches/soc-2007-mosani/source/blender/render/intern/source/rendercallbacks.c
===================================================================
--- branches/soc-2007-mosani/source/blender/render/intern/source/rendercallbacks.c 2007-07-27 09:30:54 UTC (rev 11388)
+++ branches/soc-2007-mosani/source/blender/render/intern/source/rendercallbacks.c 2007-07-27 09:37:16 UTC (rev 11389)
@@ -100,8 +100,6 @@
#include "renderdatabase.h"
#include "rendercallbacks.h"
-
-
void blender_internal_setup( RNDScene scene )
{
@@ -109,7 +107,7 @@
void blender_internal_render_frame( RNDScene scene, RNDResult result )
{
-
+ RenderDatabase *db = database_from_scene( scene );
}
void blender_internal_finish()
Modified: branches/soc-2007-mosani/source/blender/render/render_api/include/RenderAPI.h
===================================================================
--- branches/soc-2007-mosani/source/blender/render/render_api/include/RenderAPI.h 2007-07-27 09:30:54 UTC (rev 11388)
+++ branches/soc-2007-mosani/source/blender/render/render_api/include/RenderAPI.h 2007-07-27 09:37:16 UTC (rev 11389)
@@ -23,13 +23,15 @@
*
* ***** END GPL LICENSE BLOCK *****
*/
-
-/**
- * General System Documentation: http://wiki.blender.org/index.php/Render_API
+
+/**
+ * @file RenderAPI.h
*
* This file contains documentation for the USERS of this API. Documentation for
* the developers is reserved for RenderAPI_helpers.h, RND_types.h, and source
- * files.
+ * files.
+ *
+ * General System Documentation: http://wiki.blender.org/index.php/Render_API
*/
#ifndef RENDER_API_H
More information about the Bf-blender-cvs
mailing list