Commit: a1a5bff7d9de58b0c7554a33bf6c6936f6920237
Author: Dalai Felinto
Date: Mon Mar 16 14:37:45 2015 +0100
Branches: multiview
https://developer.blender.org/rBa1a5bff7d9de58b0c7554a33bf6c6936f6920237
Dr. Epilepsy R.I.P.
I talked with Francesco and Gabriel and we agreed that this mode was not needed.
(or rather, it would require a major hack in Blender UI to force redraw of
everything all the time, which is overkill for something that would likely
never get used).
===================================================================
M source/blender/makesdna/DNA_scene_types.h
M source/blender/makesrna/intern/rna_scene.c
M source/blender/makesrna/intern/rna_wm.c
M source/blender/windowmanager/intern/wm_stereo.c
===================================================================
diff --git a/source/blender/makesdna/DNA_scene_types.h
b/source/blender/makesdna/DNA_scene_types.h
index 9feef4a..413ec7d 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -292,11 +292,10 @@ typedef struct Stereo3dFormat {
typedef enum eStereoDisplayMode {
S3D_DISPLAY_ANAGLYPH = 0,
S3D_DISPLAY_BLURAY = 1,
- S3D_DISPLAY_EPILEPSY = 2,
- S3D_DISPLAY_INTERLACE = 3,
- S3D_DISPLAY_PAGEFLIP = 4,
- S3D_DISPLAY_SIDEBYSIDE = 5,
- S3D_DISPLAY_TOPBOTTOM = 6,
+ S3D_DISPLAY_INTERLACE = 2,
+ S3D_DISPLAY_PAGEFLIP = 3,
+ S3D_DISPLAY_SIDEBYSIDE = 4,
+ S3D_DISPLAY_TOPBOTTOM = 5,
} eStereoDisplayMode;
/* Stereo3dFormat.flag */
diff --git a/source/blender/makesrna/intern/rna_scene.c
b/source/blender/makesrna/intern/rna_scene.c
index 60a4163..d5db7c2 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -365,8 +365,6 @@ EnumPropertyItem views_format_multiview_items[] = {
EnumPropertyItem stereo3d_display_items[] = {
{S3D_DISPLAY_ANAGLYPH, "ANAGLYPH", 0, "Anaglyph", "Render two
differently filtered colored images for each eye. Anaglyph glasses are
required"},
- /* {S3D_DISPLAY_BLURAY, "BLURAY", 0, "Blu-ray", ""}, */
- {S3D_DISPLAY_EPILEPSY, "EPILEPSY", 0, "Dr. Epilepsy", "Wiggle
stereoscopy. Quickly alternate between images for left and right eye"},
{S3D_DISPLAY_INTERLACE, "INTERLACE", 0, "Interlace", "Render two images
for each eye into one interlaced image. 3D-ready monitor is requiered"},
{S3D_DISPLAY_PAGEFLIP, "TIMESEQUENTIAL", 0, "Time Sequential", "Renders
alternate eyes (also known as pageflip). It requires Quadbuffer support in the
graphic card"},
{S3D_DISPLAY_SIDEBYSIDE, "SIDEBYSIDE", 0, "Side-by-Side", "Render
images for left and right eye side-by-side"},
diff --git a/source/blender/makesrna/intern/rna_wm.c
b/source/blender/makesrna/intern/rna_wm.c
index 4891e09..4405df5 100644
--- a/source/blender/makesrna/intern/rna_wm.c
+++ b/source/blender/makesrna/intern/rna_wm.c
@@ -1755,8 +1755,6 @@ static void rna_def_window_stereo3d(BlenderRNA *brna)
static EnumPropertyItem stereo3d_display_items[] = {
{S3D_DISPLAY_ANAGLYPH, "ANAGLYPH", 0, "Anaglyph", "Render two
differently filtered colored images for each eye. Anaglyph glasses are
required"},
- /* {S3D_DISPLAY_BLURAY, "BLURAY", 0, "Blu-ray",
""}, */
- {S3D_DISPLAY_EPILEPSY, "EPILEPSY", 0, "Dr. Epilepsy", "Wiggle
stereoscopy. Quickly alternate between images for left and right eye"},
{S3D_DISPLAY_INTERLACE, "INTERLACE", 0, "Interlace", "Render
two images for each eye into one interlaced image. 3D-ready monitor is
requiered"},
{S3D_DISPLAY_PAGEFLIP, "TIMESEQUENTIAL", 0, "Time Sequential",
"Renders alternate eyes (also known as pageflip). It requires Quadbuffer
support in the graphic card"},
{S3D_DISPLAY_SIDEBYSIDE, "SIDEBYSIDE", 0, "Side-by-Side",
"Render images for left and right eye side-by-side"},
diff --git a/source/blender/windowmanager/intern/wm_stereo.c
b/source/blender/windowmanager/intern/wm_stereo.c
index 4056bc0..d551f00 100644
--- a/source/blender/windowmanager/intern/wm_stereo.c
+++ b/source/blender/windowmanager/intern/wm_stereo.c
@@ -96,22 +96,6 @@ static void wm_method_draw_stereo_pageflip(wmWindow *win)
}
}
-static void wm_method_draw_stereo_epilepsy(wmWindow *win)
-{
- wmDrawData *drawdata;
- static bool view = false;
- static double start = 0.0;
-
- if ((PIL_check_seconds_timer() - start) >=
win->stereo3d_format->epilepsy_interval) {
- start = PIL_check_seconds_timer();
- view = !view;
- }
-
- drawdata = BLI_findlink(&win->drawdata, view * 2 + 1);
-
- wm_triple_draw_textures(win, drawdata->triple, 1.0f);
-}
-
static GLuint left_interlace_mask[32];
static GLuint right_interlace_mask[32];
static enum eStereo3dInterlaceType interlace_prev_type = -1;
@@ -355,9 +339,6 @@ void wm_method_draw_stereo(const bContext *UNUSED(C),
wmWindow *win)
case S3D_DISPLAY_ANAGLYPH:
wm_method_draw_stereo_anaglyph(win);
break;
- case S3D_DISPLAY_EPILEPSY:
- wm_method_draw_stereo_epilepsy(win);
- break;
case S3D_DISPLAY_INTERLACE:
wm_method_draw_stereo_interlace(win);
break;
@@ -498,12 +479,6 @@ static bool wm_stereo3d_set_properties(bContext *C,
wmOperator *op)
is_set = true;
}
- prop = RNA_struct_find_property(op->ptr, "epilepsy_interval");
- if (RNA_property_is_set(op->ptr, prop)) {
- s3d->epilepsy_interval = RNA_property_float_get(op->ptr, prop);
- is_set = true;
- }
-
prop = RNA_struct_find_property(op->ptr, "use_interlace_swap");
if (RNA_property_is_set(op->ptr, prop)) {
if (RNA_property_boolean_get(op->ptr, prop))
@@ -604,11 +579,6 @@ void wm_set_stereo3d_draw(bContext *C, wmOperator *op)
uiItemR(col, &stereo3d_format_ptr, "anaglyph_type", 0,
NULL, ICON_NONE);
break;
}
- case S3D_DISPLAY_EPILEPSY:
- {
- uiItemR(col, &stereo3d_format_ptr, "epilepsy_interval",
0, NULL, ICON_NONE);
- break;
- }
case S3D_DISPLAY_INTERLACE:
{
uiItemR(col, &stereo3d_format_ptr, "interlace_type", 0,
NULL, ICON_NONE);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
