[Bf-blender-cvs] [8cb80a443e7] temp-lightprobe-rename: Rename other uses of probe -> lightprobe

Campbell Barton noreply at git.blender.org
Mon Jun 12 13:07:39 CEST 2017


Commit: 8cb80a443e79d15945830ec66fbb7ade0a67a948
Author: Campbell Barton
Date:   Mon Jun 12 21:10:14 2017 +1000
Branches: temp-lightprobe-rename
https://developer.blender.org/rB8cb80a443e79d15945830ec66fbb7ade0a67a948

Rename other uses of probe -> lightprobe

===================================================================

M	source/blender/blenloader/intern/readfile.c
M	source/blender/draw/engines/clay/clay_engine.c
M	source/blender/draw/engines/eevee/eevee_data.c
M	source/blender/draw/engines/eevee/eevee_effects.c
M	source/blender/draw/engines/eevee/eevee_lightprobes.c
M	source/blender/draw/engines/eevee/eevee_materials.c
M	source/blender/draw/engines/eevee/eevee_private.h

===================================================================

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 796a9c2a044..884bb363333 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -7648,7 +7648,7 @@ static void fix_relpaths_library(const char *basepath, Main *main)
 
 /* ************ READ PROBE ***************** */
 
-static void lib_link_probe(FileData *fd, Main *main)
+static void lib_link_lightprobe(FileData *fd, Main *main)
 {
 	for (LightProbe *prb = main->speaker.first; prb; prb = prb->id.next) {
 		if (prb->id.tag & LIB_TAG_NEED_LINK) {
@@ -7660,7 +7660,7 @@ static void lib_link_probe(FileData *fd, Main *main)
 	}
 }
 
-static void direct_link_probe(FileData *fd, LightProbe *prb)
+static void direct_link_lightprobe(FileData *fd, LightProbe *prb)
 {
 	prb->adt = newdataadr(fd, prb->adt);
 	direct_link_animdata(fd, prb->adt);
@@ -8515,7 +8515,7 @@ static BHead *read_libblock(FileData *fd, Main *main, BHead *bhead, const short
 			direct_link_sound(fd, (bSound *)id);
 			break;
 		case ID_LP:
-			direct_link_probe(fd, (LightProbe *)id);
+			direct_link_lightprobe(fd, (LightProbe *)id);
 			break;
 		case ID_GR:
 			direct_link_group(fd, (Group *)id);
@@ -8722,7 +8722,7 @@ static void lib_link_all(FileData *fd, Main *main)
 	lib_link_text(fd, main);
 	lib_link_camera(fd, main);
 	lib_link_speaker(fd, main);
-	lib_link_probe(fd, main);
+	lib_link_lightprobe(fd, main);
 	lib_link_sound(fd, main);
 	lib_link_group(fd, main);
 	lib_link_armature(fd, main);
@@ -9908,7 +9908,7 @@ static void expand_sound(FileData *fd, Main *mainvar, bSound *snd)
 	expand_doit(fd, mainvar, snd->ipo); // XXX deprecated - old animation system
 }
 
-static void expand_probe(FileData *fd, Main *mainvar, LightProbe *prb)
+static void expand_lightprobe(FileData *fd, Main *mainvar, LightProbe *prb)
 {
 	if (prb->adt)
 		expand_animdata(fd, mainvar, prb->adt);
@@ -10075,7 +10075,7 @@ void BLO_expand_main(void *fdhandle, Main *mainvar)
 						expand_sound(fd, mainvar, (bSound *)id);
 						break;
 					case ID_LP:
-						expand_probe(fd, mainvar, (LightProbe *)id);
+						expand_lightprobe(fd, mainvar, (LightProbe *)id);
 						break;
 					case ID_AR:
 						expand_armature(fd, mainvar, (bArmature *)id);
diff --git a/source/blender/draw/engines/clay/clay_engine.c b/source/blender/draw/engines/clay/clay_engine.c
index e2e3fa3efbc..8ca228ebce5 100644
--- a/source/blender/draw/engines/clay/clay_engine.c
+++ b/source/blender/draw/engines/clay/clay_engine.c
@@ -277,7 +277,7 @@ static int matcap_to_index(int matcap)
 }
 
 /* Van der Corput sequence */
-/* TODO this is duplicated code from eevee_probes.c */
+/* TODO this is duplicated code from eevee_lightprobes.c */
  /* From http://holger.dammertz.org/stuff/notes_HammersleyOnHemisphere.html */
 static float radical_inverse(int i) {
 	unsigned int bits = (unsigned int)i;
diff --git a/source/blender/draw/engines/eevee/eevee_data.c b/source/blender/draw/engines/eevee/eevee_data.c
index e768a27e228..52dc35b4977 100644
--- a/source/blender/draw/engines/eevee/eevee_data.c
+++ b/source/blender/draw/engines/eevee/eevee_data.c
@@ -70,9 +70,9 @@ static void eevee_lamp_data_free(void *storage)
 	BLI_freelistN(&led->shadow_caster_list);
 }
 
-static void eevee_probe_data_free(void *storage)
+static void eevee_lightprobe_data_free(void *storage)
 {
-	EEVEE_ProbeEngineData *ped = (EEVEE_ProbeEngineData *)storage;
+	EEVEE_LightProbeEngineData *ped = (EEVEE_LightProbeEngineData *)storage;
 
 	BLI_freelistN(&ped->captured_object_list);
 }
@@ -99,12 +99,12 @@ EEVEE_ObjectEngineData *EEVEE_object_data_get(Object *ob)
 	return *oedata;
 }
 
-EEVEE_ProbeEngineData *EEVEE_lightprobe_data_get(Object *ob)
+EEVEE_LightProbeEngineData *EEVEE_lightprobe_data_get(Object *ob)
 {
-	EEVEE_ProbeEngineData **pedata = (EEVEE_ProbeEngineData **)DRW_object_engine_data_get(ob, &draw_engine_eevee_type, &eevee_probe_data_free);
+	EEVEE_LightProbeEngineData **pedata = (EEVEE_LightProbeEngineData **)DRW_object_engine_data_get(ob, &draw_engine_eevee_type, &eevee_lightprobe_data_free);
 
 	if (*pedata == NULL) {
-		*pedata = MEM_callocN(sizeof(**pedata), "EEVEE_ProbeEngineData");
+		*pedata = MEM_callocN(sizeof(**pedata), "EEVEE_LightProbeEngineData");
 		(*pedata)->need_update = true;
 	}
 
diff --git a/source/blender/draw/engines/eevee/eevee_effects.c b/source/blender/draw/engines/eevee/eevee_effects.c
index 205e1588b43..e6f2bfbd5ba 100644
--- a/source/blender/draw/engines/eevee/eevee_effects.c
+++ b/source/blender/draw/engines/eevee/eevee_effects.c
@@ -41,9 +41,9 @@
 #include "eevee_private.h"
 #include "GPU_texture.h"
 
-typedef struct EEVEE_ProbeData {
+typedef struct EEVEE_LightProbeData {
 	short probe_id, shadow_id;
-} EEVEE_ProbeData;
+} EEVEE_LightProbeData;
 
 /* TODO Option */
 #define ENABLE_EFFECT_MOTION_BLUR 1
diff --git a/source/blender/draw/engines/eevee/eevee_lightprobes.c b/source/blender/draw/engines/eevee/eevee_lightprobes.c
index e6ff4a2dbde..1acdd50635e 100644
--- a/source/blender/draw/engines/eevee/eevee_lightprobes.c
+++ b/source/blender/draw/engines/eevee/eevee_lightprobes.c
@@ -133,7 +133,7 @@ void EEVEE_lightprobes_init(EEVEE_SceneLayerData *sldata)
 
 	if (!sldata->probes) {
 		sldata->probes = MEM_callocN(sizeof(EEVEE_LightProbesInfo), "EEVEE_LightProbesInfo");
-		sldata->probe_ubo = DRW_uniformbuffer_create(sizeof(EEVEE_Probe) * MAX_PROBE, NULL);
+		sldata->probe_ubo = DRW_uniformbuffer_create(sizeof(EEVEE_LightProbe) * MAX_PROBE, NULL);
 	}
 
 	/* Setup Render Target Cubemap */
@@ -178,7 +178,7 @@ void EEVEE_lightprobes_cache_init(EEVEE_SceneLayerData *sldata, EEVEE_PassList *
 			wo->update_flag = 0;
 
 			if (wo->use_nodes && wo->nodetree) {
-				struct GPUMaterial *gpumat = EEVEE_material_world_probe_get(scene, wo);
+				struct GPUMaterial *gpumat = EEVEE_material_world_lightprobe_get(scene, wo);
 
 				grp = DRW_shgroup_material_instance_create(gpumat, psl->probe_background, geom);
 
@@ -255,7 +255,7 @@ void EEVEE_lightprobes_cache_add(EEVEE_SceneLayerData *sldata, Object *ob)
 		pinfo->num_cube = MAX_PROBE;
 	}
 	else {
-		EEVEE_ProbeEngineData *ped = EEVEE_lightprobe_data_get(ob);
+		EEVEE_LightProbeEngineData *ped = EEVEE_lightprobe_data_get(ob);
 
 		if ((ob->deg_update_flag & DEG_RUNTIME_DATA_UPDATE) != 0) {
 			ped->need_update = true;
@@ -277,7 +277,7 @@ static void EEVEE_lightprobes_updates(EEVEE_SceneLayerData *sldata)
 
 	for (int i = 1; (ob = pinfo->probes_ref[i]) && (i < MAX_PROBE); i++) {
 		LightProbe *probe = (LightProbe *)ob->data;
-		EEVEE_Probe *eprobe = &pinfo->probe_data[i];
+		EEVEE_LightProbe *eprobe = &pinfo->probe_data[i];
 
 		/* Attenuation */
 		eprobe->attenuation_type = probe->attenuation_type;
@@ -332,7 +332,7 @@ void EEVEE_lightprobes_cache_finish(EEVEE_SceneLayerData *sldata)
 		pinfo->cache_num_cube = pinfo->num_cube;
 
 		for (int i = 1; (ob = pinfo->probes_ref[i]) && (i < MAX_PROBE); i++) {
-			EEVEE_ProbeEngineData *ped = EEVEE_lightprobe_data_get(ob);
+			EEVEE_LightProbeEngineData *ped = EEVEE_lightprobe_data_get(ob);
 			ped->need_update = true;
 			ped->ready_to_shade = false;
 		}
@@ -347,7 +347,7 @@ void EEVEE_lightprobes_cache_finish(EEVEE_SceneLayerData *sldata)
 	DRW_uniformbuffer_update(sldata->probe_ubo, &sldata->probes->probe_data);
 }
 
-static void filter_probe(EEVEE_Probe *eprobe, EEVEE_SceneLayerData *sldata, EEVEE_PassList *psl, int probe_idx)
+static void filter_probe(EEVEE_LightProbe *eprobe, EEVEE_SceneLayerData *sldata, EEVEE_PassList *psl, int probe_idx)
 {
 	EEVEE_LightProbesInfo *pinfo = sldata->probes;
 
@@ -430,7 +430,7 @@ static void filter_probe(EEVEE_Probe *eprobe, EEVEE_SceneLayerData *sldata, EEVE
 static void render_one_probe(EEVEE_SceneLayerData *sldata, EEVEE_PassList *psl, int probe_idx)
 {
 	EEVEE_LightProbesInfo *pinfo = sldata->probes;
-	EEVEE_Probe *eprobe = &pinfo->probe_data[probe_idx];
+	EEVEE_LightProbe *eprobe = &pinfo->probe_data[probe_idx];
 	Object *ob = pinfo->probes_ref[probe_idx];
 	LightProbe *prb = (LightProbe *)ob->data;
 
@@ -502,10 +502,10 @@ static void render_one_probe(EEVEE_SceneLayerData *sldata, EEVEE_PassList *psl,
 	filter_probe(eprobe, sldata, psl, probe_idx);
 }
 
-static void render_world_probe(EEVEE_SceneLayerData *sldata, EEVEE_PassList *psl)
+static void render_world_lightprobe(EEVEE_SceneLayerData *sldata, EEVEE_PassList *psl)
 {
 	EEVEE_LightProbesInfo *pinfo = sldata->probes;
-	EEVEE_Probe *eprobe = &pinfo->probe_data[0];
+	EEVEE_LightProbe *eprobe = &pinfo->probe_data[0];
 
 	/* 1 - Render to cubemap target using geometry shader. */
 	/* For world probe, we don't need to clear since we render the background directly. */
@@ -526,7 +526,7 @@ void EEVEE_lightprobes_refresh(EEVEE_SceneLayerData *sldata, EEVEE_PassList *psl
 
 	/* Render world in priority */
 	if (e_data.update_world) {
-		render_world_probe(sldata, psl);
+		render_world_lightprobe(sldata, psl);
 		e_data.update_world = false;
 
 		if (!e_data.world_ready_to_shade) {
@@ -549,7 +549,7 @@ void EEVEE_lightprobes_refresh(EEVEE_SceneLayerData *sldata, EEVEE_PassList *psl
 		}
 
 		for (int i = 1; (ob = pinfo->probes_ref[i]) && (i < MAX_PROBE); i++) {
-			EEVEE_ProbeEngineData *ped = EEVEE_lightprobe_data_get(ob);
+			EEVEE_LightProbeEngineData *ped = EEVEE_lightprobe_data_get(ob);
 
 			if (ped->need_update) {
 				render_one_probe(sldata, psl, i);
diff --git a/source/blender/draw/engines/eevee/eevee_materials.c b/source/blender/draw/engines/eevee/eevee_materials.c
index ece2b1c7707..c4c331ab1a4 100644
--- a/source/blender/draw/engines/eevee/eevee_materials.c
+++ b/source/blender/draw/engines/eevee/eevee_materials.c
@@ -221,7 +221,7 @@ void EEVEE_materials_init(void)
 	}
 }
 
-struct GPUMaterial *EEVEE_material_world_probe_get(struct Scene *scene, World *wo)
+struct GPUMaterial *EEVEE_material_world_lightprobe_get(struct Scene *scene, World *wo)
 {
 	return GPU_material_from_nodetree(
 	    scene, wo->nodetree, &wo->gpumaterial, &DRW_engine_viewport_eevee_type,
@@ -239,7 +239,7 @@ struct GPUMaterial *EEVEE_material_world_background_get(struct Scene *scene, Wor
 	    SHADER_DEFINES "#define WORLD_BACKGROUND\n");
 }
 
-struct GPUMaterial *EEVEE_material_mesh_probe_get(struct Scene *scene, Material *ma)
+struct 

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list