Code refactoring: split lamp functions from object.c into new lamp.c.
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Sat, 5 Nov 2011 13:11:49 +0000 (13:11 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Sat, 5 Nov 2011 13:11:49 +0000 (13:11 +0000)
12 files changed:
source/blender/blenkernel/BKE_lamp.h [new file with mode: 0644]
source/blender/blenkernel/BKE_object.h
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/camera.c
source/blender/blenkernel/intern/lamp.c [new file with mode: 0644]
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/object.c
source/blender/collada/DocumentImporter.cpp
source/blender/editors/object/object_add.c
source/blender/editors/object/object_relations.c
source/blender/editors/render/render_preview.c
source/blender/makesrna/intern/rna_main_api.c

diff --git a/source/blender/blenkernel/BKE_lamp.h b/source/blender/blenkernel/BKE_lamp.h
new file mode 100644 (file)
index 0000000..cc9452a
--- /dev/null
@@ -0,0 +1,51 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): none yet.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#ifndef BKE_LAMP_H
+#define BKE_LAMP_H
+
+/** \file BKE_lamp.h
+ *  \ingroup bke
+ *  \brief General operations, lookup, etc. for blender lamps.
+ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct Lamp;
+
+void *add_lamp(const char *name);
+struct Lamp *copy_lamp(struct Lamp *la);
+struct Lamp *localize_lamp(struct Lamp *la);
+void make_local_lamp(struct Lamp *la);
+void free_lamp(struct Lamp *la);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
index f9cd704..d6139a6 100644 (file)
@@ -75,12 +75,6 @@ void object_copy_proxy_drivers(struct Object *ob, struct Object *target);
 void unlink_object(struct Object *ob);
 int exist_object(struct Object *obtest);
        
-void *add_lamp(const char *name);
-struct Lamp *copy_lamp(struct Lamp *la);
-struct Lamp *localize_lamp(struct Lamp *la);
-void make_local_lamp(struct Lamp *la);
-void free_lamp(struct Lamp *la);
-
 struct Object *add_only_object(int type, const char *name);
 struct Object *add_object(struct Scene *scene, int type);
 
index ba6776e..78b1b52 100644 (file)
@@ -104,6 +104,7 @@ set(SRC
        intern/implicit.c
        intern/ipo.c
        intern/key.c
+       intern/lamp.c
        intern/lattice.c
        intern/library.c
        intern/material.c
@@ -187,6 +188,7 @@ set(SRC
        BKE_image.h
        BKE_ipo.h
        BKE_key.h
+       BKE_lamp.h
        BKE_lattice.h
        BKE_library.h
        BKE_main.h
index 74cc5a7..eeec82c 100644 (file)
@@ -29,6 +29,8 @@
  *  \ingroup bke
  */
 
+#include <stdlib.h>
+
 #include "DNA_camera_types.h"
 #include "DNA_lamp_types.h"
 #include "DNA_object_types.h"
diff --git a/source/blender/blenkernel/intern/lamp.c b/source/blender/blenkernel/intern/lamp.c
new file mode 100644 (file)
index 0000000..974aa66
--- /dev/null
@@ -0,0 +1,233 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): none yet.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file blender/blenkernel/intern/lamp.c
+ *  \ingroup bke
+ */
+
+#include <stdlib.h>
+
+#include "MEM_guardedalloc.h"
+
+#include "DNA_lamp_types.h"
+#include "DNA_material_types.h"
+#include "DNA_object_types.h"
+#include "DNA_texture_types.h"
+
+#include "BLI_listbase.h"
+#include "BLI_math.h"
+#include "BLI_utildefines.h"
+
+#include "BKE_animsys.h"
+#include "BKE_colortools.h"
+#include "BKE_icons.h"
+#include "BKE_global.h"
+#include "BKE_lamp.h"
+#include "BKE_library.h"
+#include "BKE_main.h"
+#include "BKE_node.h"
+
+void *add_lamp(const char *name)
+{
+       Lamp *la;
+       
+       la=  alloc_libblock(&G.main->lamp, ID_LA, name);
+       
+       la->r= la->g= la->b= la->k= 1.0f;
+       la->haint= la->energy= 1.0f;
+       la->dist= 25.0f;
+       la->spotsize= 45.0f;
+       la->spotblend= 0.15f;
+       la->att2= 1.0f;
+       la->mode= LA_SHAD_BUF;
+       la->bufsize= 512;
+       la->clipsta= 0.5f;
+       la->clipend= 40.0f;
+       la->shadspotsize= 45.0f;
+       la->samp= 3;
+       la->bias= 1.0f;
+       la->soft= 3.0f;
+       la->compressthresh= 0.05f;
+       la->ray_samp= la->ray_sampy= la->ray_sampz= 1; 
+       la->area_size=la->area_sizey=la->area_sizez= 1.0f; 
+       la->buffers= 1;
+       la->buftype= LA_SHADBUF_HALFWAY;
+       la->ray_samp_method = LA_SAMP_HALTON;
+       la->adapt_thresh = 0.001f;
+       la->preview=NULL;
+       la->falloff_type = LA_FALLOFF_INVSQUARE;
+       la->curfalloff = curvemapping_add(1, 0.0f, 1.0f, 1.0f, 0.0f);
+       la->sun_effect_type = 0;
+       la->horizon_brightness = 1.0;
+       la->spread = 1.0;
+       la->sun_brightness = 1.0;
+       la->sun_size = 1.0;
+       la->backscattered_light = 1.0f;
+       la->atm_turbidity = 2.0f;
+       la->atm_inscattering_factor = 1.0f;
+       la->atm_extinction_factor = 1.0f;
+       la->atm_distance_factor = 1.0f;
+       la->sun_intensity = 1.0f;
+       la->skyblendtype= MA_RAMP_ADD;
+       la->skyblendfac= 1.0f;
+       la->sky_colorspace= BLI_XYZ_CIE;
+       la->sky_exposure= 1.0f;
+       
+       curvemapping_initialize(la->curfalloff);
+       return la;
+}
+
+Lamp *copy_lamp(Lamp *la)
+{
+       Lamp *lan;
+       int a;
+       
+       lan= copy_libblock(la);
+
+       for(a=0; a<MAX_MTEX; a++) {
+               if(lan->mtex[a]) {
+                       lan->mtex[a]= MEM_mallocN(sizeof(MTex), "copylamptex");
+                       memcpy(lan->mtex[a], la->mtex[a], sizeof(MTex));
+                       id_us_plus((ID *)lan->mtex[a]->tex);
+               }
+       }
+       
+       lan->curfalloff = curvemapping_copy(la->curfalloff);
+
+       if(la->nodetree)
+               lan->nodetree= ntreeCopyTree(la->nodetree);
+       
+       if(la->preview)
+               lan->preview = BKE_previewimg_copy(la->preview);
+       
+       return lan;
+}
+
+Lamp *localize_lamp(Lamp *la)
+{
+       Lamp *lan;
+       int a;
+       
+       lan= copy_libblock(la);
+       BLI_remlink(&G.main->lamp, lan);
+
+       for(a=0; a<MAX_MTEX; a++) {
+               if(lan->mtex[a]) {
+                       lan->mtex[a]= MEM_mallocN(sizeof(MTex), "localize_lamp");
+                       memcpy(lan->mtex[a], la->mtex[a], sizeof(MTex));
+                       /* free lamp decrements */
+                       id_us_plus((ID *)lan->mtex[a]->tex);
+               }
+       }
+       
+       lan->curfalloff = curvemapping_copy(la->curfalloff);
+
+       if(la->nodetree)
+               lan->nodetree= ntreeLocalize(la->nodetree);
+       
+       lan->preview= NULL;
+       
+       return lan;
+}
+
+void make_local_lamp(Lamp *la)
+{
+       Main *bmain= G.main;
+       Object *ob;
+       int is_local= FALSE, is_lib= FALSE;
+
+       /* - only lib users: do nothing
+               * - only local users: set flag
+               * - mixed: make copy
+               */
+       
+       if(la->id.lib==NULL) return;
+       if(la->id.us==1) {
+               id_clear_lib_data(bmain, &la->id);
+               return;
+       }
+       
+       ob= bmain->object.first;
+       while(ob) {
+               if(ob->data==la) {
+                       if(ob->id.lib) is_lib= TRUE;
+                       else is_local= TRUE;
+               }
+               ob= ob->id.next;
+       }
+       
+       if(is_local && is_lib == FALSE) {
+               id_clear_lib_data(bmain, &la->id);
+       }
+       else if(is_local && is_lib) {
+               Lamp *lan= copy_lamp(la);
+               lan->id.us= 0;
+
+               /* Remap paths of new ID using old library as base. */
+               BKE_id_lib_local_paths(bmain, &lan->id);
+
+               ob= bmain->object.first;
+               while(ob) {
+                       if(ob->data==la) {
+                               
+                               if(ob->id.lib==NULL) {
+                                       ob->data= lan;
+                                       lan->id.us++;
+                                       la->id.us--;
+                               }
+                       }
+                       ob= ob->id.next;
+               }
+       }
+}
+
+void free_lamp(Lamp *la)
+{
+       MTex *mtex;
+       int a;
+
+       for(a=0; a<MAX_MTEX; a++) {
+               mtex= la->mtex[a];
+               if(mtex && mtex->tex) mtex->tex->id.us--;
+               if(mtex) MEM_freeN(mtex);
+       }
+       
+       BKE_free_animdata((ID *)la);
+
+       curvemapping_free(la->curfalloff);
+
+       /* is no lib link block, but lamp extension */
+       if(la->nodetree) {
+               ntreeFreeTree(la->nodetree);
+               MEM_freeN(la->nodetree);
+       }
+       
+       BKE_previewimg_free(&la->preview);
+       BKE_icon_delete(&la->id);
+       la->id.icon_id = 0;
+}
+
index 36e2428..0b01c3d 100644 (file)
@@ -79,6 +79,7 @@
 #include "BKE_animsys.h"
 #include "BKE_camera.h"
 #include "BKE_context.h"
+#include "BKE_lamp.h"
 #include "BKE_library.h"
 #include "BKE_main.h"
 #include "BKE_global.h"
index 1ba06c0..a78b010 100644 (file)
@@ -42,7 +42,6 @@
 #include "DNA_constraint_types.h"
 #include "DNA_group_types.h"
 #include "DNA_key_types.h"
-#include "DNA_lamp_types.h"
 #include "DNA_lattice_types.h"
 #include "DNA_material_types.h"
 #include "DNA_meta_types.h"
@@ -81,6 +80,7 @@
 #include "BKE_group.h"
 #include "BKE_icons.h"
 #include "BKE_key.h"
+#include "BKE_lamp.h"
 #include "BKE_lattice.h"
 #include "BKE_library.h"
 #include "BKE_mesh.h"
@@ -716,186 +716,6 @@ int exist_object(Object *obtest)
        return 0;
 }
 
-void *add_lamp(const char *name)
-{
-       Lamp *la;
-       
-       la=  alloc_libblock(&G.main->lamp, ID_LA, name);
-       
-       la->r= la->g= la->b= la->k= 1.0f;
-       la->haint= la->energy= 1.0f;
-       la->dist= 25.0f;
-       la->spotsize= 45.0f;
-       la->spotblend= 0.15f;
-       la->att2= 1.0f;
-       la->mode= LA_SHAD_BUF;
-       la->bufsize= 512;
-       la->clipsta= 0.5f;
-       la->clipend= 40.0f;
-       la->shadspotsize= 45.0f;
-       la->samp= 3;
-       la->bias= 1.0f;
-       la->soft= 3.0f;
-       la->compressthresh= 0.05f;
-       la->ray_samp= la->ray_sampy= la->ray_sampz= 1; 
-       la->area_size=la->area_sizey=la->area_sizez= 1.0f; 
-       la->buffers= 1;
-       la->buftype= LA_SHADBUF_HALFWAY;
-       la->ray_samp_method = LA_SAMP_HALTON;
-       la->adapt_thresh = 0.001f;
-       la->preview=NULL;
-       la->falloff_type = LA_FALLOFF_INVSQUARE;
-       la->curfalloff = curvemapping_add(1, 0.0f, 1.0f, 1.0f, 0.0f);
-       la->sun_effect_type = 0;
-       la->horizon_brightness = 1.0;
-       la->spread = 1.0;
-       la->sun_brightness = 1.0;
-       la->sun_size = 1.0;
-       la->backscattered_light = 1.0f;
-       la->atm_turbidity = 2.0f;
-       la->atm_inscattering_factor = 1.0f;
-       la->atm_extinction_factor = 1.0f;
-       la->atm_distance_factor = 1.0f;
-       la->sun_intensity = 1.0f;
-       la->skyblendtype= MA_RAMP_ADD;
-       la->skyblendfac= 1.0f;
-       la->sky_colorspace= BLI_XYZ_CIE;
-       la->sky_exposure= 1.0f;
-       
-       curvemapping_initialize(la->curfalloff);
-       return la;
-}
-
-Lamp *copy_lamp(Lamp *la)
-{
-       Lamp *lan;
-       int a;
-       
-       lan= copy_libblock(la);
-
-       for(a=0; a<MAX_MTEX; a++) {
-               if(lan->mtex[a]) {
-                       lan->mtex[a]= MEM_mallocN(sizeof(MTex), "copylamptex");
-                       memcpy(lan->mtex[a], la->mtex[a], sizeof(MTex));
-                       id_us_plus((ID *)lan->mtex[a]->tex);
-               }
-       }
-       
-       lan->curfalloff = curvemapping_copy(la->curfalloff);
-
-       if(la->nodetree)
-               lan->nodetree= ntreeCopyTree(la->nodetree);
-       
-       if(la->preview)
-               lan->preview = BKE_previewimg_copy(la->preview);
-       
-       return lan;
-}
-
-Lamp *localize_lamp(Lamp *la)
-{
-       Lamp *lan;
-       int a;
-       
-       lan= copy_libblock(la);
-       BLI_remlink(&G.main->lamp, lan);
-
-       for(a=0; a<MAX_MTEX; a++) {
-               if(lan->mtex[a]) {
-                       lan->mtex[a]= MEM_mallocN(sizeof(MTex), "localize_lamp");
-                       memcpy(lan->mtex[a], la->mtex[a], sizeof(MTex));
-                       /* free lamp decrements */
-                       id_us_plus((ID *)lan->mtex[a]->tex);
-               }
-       }
-       
-       lan->curfalloff = curvemapping_copy(la->curfalloff);
-
-       if(la->nodetree)
-               lan->nodetree= ntreeLocalize(la->nodetree);
-       
-       lan->preview= NULL;
-       
-       return lan;
-}
-
-void make_local_lamp(Lamp *la)
-{
-       Main *bmain= G.main;
-       Object *ob;
-       int is_local= FALSE, is_lib= FALSE;
-
-       /* - only lib users: do nothing
-               * - only local users: set flag
-               * - mixed: make copy
-               */
-       
-       if(la->id.lib==NULL) return;
-       if(la->id.us==1) {
-               id_clear_lib_data(bmain, &la->id);
-               return;
-       }
-       
-       ob= bmain->object.first;
-       while(ob) {
-               if(ob->data==la) {
-                       if(ob->id.lib) is_lib= TRUE;
-                       else is_local= TRUE;
-               }
-               ob= ob->id.next;
-       }
-       
-       if(is_local && is_lib == FALSE) {
-               id_clear_lib_data(bmain, &la->id);
-       }
-       else if(is_local && is_lib) {
-               Lamp *lan= copy_lamp(la);
-               lan->id.us= 0;
-
-               /* Remap paths of new ID using old library as base. */
-               BKE_id_lib_local_paths(bmain, &lan->id);
-
-               ob= bmain->object.first;
-               while(ob) {
-                       if(ob->data==la) {
-                               
-                               if(ob->id.lib==NULL) {
-                                       ob->data= lan;
-                                       lan->id.us++;
-                                       la->id.us--;
-                               }
-                       }
-                       ob= ob->id.next;
-               }
-       }
-}
-
-void free_lamp(Lamp *la)
-{
-       MTex *mtex;
-       int a;
-
-       for(a=0; a<MAX_MTEX; a++) {
-               mtex= la->mtex[a];
-               if(mtex && mtex->tex) mtex->tex->id.us--;
-               if(mtex) MEM_freeN(mtex);
-       }
-       
-       BKE_free_animdata((ID *)la);
-
-       curvemapping_free(la->curfalloff);
-
-       /* is no lib link block, but lamp extension */
-       if(la->nodetree) {
-               ntreeFreeTree(la->nodetree);
-               MEM_freeN(la->nodetree);
-       }
-       
-       BKE_previewimg_free(&la->preview);
-       BKE_icon_delete(&la->id);
-       la->id.icon_id = 0;
-}
-
 /* *************************************************** */
 
 static void *add_obdata_from_type(int type)
index ec22dfa..267aa92 100644 (file)
@@ -56,6 +56,7 @@
 
 #include "BKE_camera.h"
 #include "BKE_main.h"
+#include "BKE_lamp.h"
 #include "BKE_library.h"
 #include "BKE_texture.h"
 #include "BKE_fcurve.h"
index 1cafa9c..a929144 100644 (file)
@@ -63,6 +63,7 @@
 #include "BKE_displist.h"
 #include "BKE_effect.h"
 #include "BKE_group.h"
+#include "BKE_lamp.h"
 #include "BKE_lattice.h"
 #include "BKE_library.h"
 #include "BKE_key.h"
index 0a0eadd..e9575c8 100644 (file)
@@ -64,6 +64,7 @@
 #include "BKE_displist.h"
 #include "BKE_global.h"
 #include "BKE_fcurve.h"
+#include "BKE_lamp.h"
 #include "BKE_lattice.h"
 #include "BKE_library.h"
 #include "BKE_main.h"
index 9da1609..feff1e0 100644 (file)
@@ -70,6 +70,7 @@
 #include "BKE_idprop.h"
 #include "BKE_image.h"
 #include "BKE_icons.h"
+#include "BKE_lamp.h"
 #include "BKE_library.h"
 #include "BKE_main.h"
 #include "BKE_material.h"
index 83ce4d2..dfa368d 100644 (file)
@@ -47,6 +47,7 @@
 #include "BKE_curve.h"
 #include "BKE_mesh.h"
 #include "BKE_armature.h"
+#include "BKE_lamp.h"
 #include "BKE_library.h"
 #include "BKE_object.h"
 #include "BKE_material.h"