[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60300] branches/soc-2013-vse/source/ blender/makesdna: Updating DNA for VSE

[Alexander Kuznetsov]

Revision: 60300
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60300
Author:   alexk
Date:     2013-09-22 05:21:08 +0000 (Sun, 22 Sep 2013)
Log Message:
-----------
Updating DNA for VSE

Modified Paths:
--------------
    branches/soc-2013-vse/source/blender/makesdna/DNA_sequence_types.h
    branches/soc-2013-vse/source/blender/makesdna/DNA_space_types.h

Modified: branches/soc-2013-vse/source/blender/makesdna/DNA_sequence_types.h
===================================================================
--- branches/soc-2013-vse/source/blender/makesdna/DNA_sequence_types.h	2013-09-22 05:17:13 UTC (rev 60299)
+++ branches/soc-2013-vse/source/blender/makesdna/DNA_sequence_types.h	2013-09-22 05:21:08 UTC (rev 60300)
@@ -96,6 +96,17 @@
 	                       // to build
 } StripProxy;
 
+typedef struct StTransformationVars {
+	/* applied in this order */
+	float ScaleX;
+	float ScaleY;
+	float rotRad;
+	float TranX;
+	float TranY;
+	unsigned int mode;
+
+} StTransformationVars;
+
 typedef struct Strip {
 	struct Strip *next, *prev;
 	int us, done;
@@ -107,12 +118,16 @@
 	StripProxy *proxy;
 	StripCrop *crop;
 	StripTransform *transform;
+	StTransformationVars transformation;
 	StripColorBalance *color_balance DNA_DEPRECATED;
 
 	/* color management */
 	ColorManagedColorspaceSettings colorspace_settings;
 } Strip;
 
+
+
+
 /**
  * The sequence structure is the basic struct used by any strip.
  * each of the strips uses a different sequence structure.
@@ -236,6 +251,8 @@
 	int uniform_scale; /* preserve aspect/ratio when scaling */
 } TransformVars;
 
+
+
 typedef struct SolidColorVars {
 	float col[3];
 	float pad;
@@ -249,6 +266,21 @@
 	int lastValidFrame;
 } SpeedControlVars;
 
+typedef struct BrightContrastVars {
+	float bright;
+	float contrast;
+} BrightContrastVars;
+
+typedef struct ColorBalanceVars {
+	StripColorBalance color_balance;
+	float color_multiply;
+} ColorBalanceVars;
+
+typedef struct TransitionVars {
+	float factor;
+} TransitionVars;
+
+
 /* ***************** Sequence modifiers ****************** */
 
 typedef struct SequenceModifierData {
@@ -265,9 +297,7 @@
 
 typedef struct ColorBalanceModifierData {
 	SequenceModifierData modifier;
-
-	StripColorBalance color_balance;
-	float color_multiply;
+	ColorBalanceVars data;
 } ColorBalanceModifierData;
 
 typedef struct CurvesModifierData {
@@ -284,9 +314,7 @@
 
 typedef struct BrightContrastModifierData {
 	SequenceModifierData modifier;
-
-	float bright;
-	float contrast;
+	BrightContrastVars data;
 } BrightContrastModifierData;
 
 typedef struct SequencerMaskModifierData {
@@ -415,7 +443,22 @@
 	SEQ_TYPE_SPEED       = 29,
 	SEQ_TYPE_MULTICAM    = 30,
 	SEQ_TYPE_ADJUSTMENT  = 31,
-	SEQ_TYPE_EFFECT_MAX  = 31
+
+
+	//0x38;
+	SEQ_TYPE_COLORBALANCE		= 0x38+1,
+	SEQ_TYPE_CURVES				= 0x38+2,
+	SEQ_TYPE_HUECORRECT			= 0x38+3,
+	SEQ_TYPE_BRIGHTNESSCONTRAST = 0x38+4,
+	//SEQ_TYPE_MASK				= 0x38+5,
+
+	SEQ_TYPE_TRANSFORMATION		= 63,
+	SEQ_TYPE_HISTOGRAM			= 64,
+	SEQ_TYPE_WAVEFORM			= 65,
+	SEQ_TYPE_VECTORSCOPE		= 66,
+	SEQ_TYPE_EFFECT_MAX			= 66
+
+
 };
 
 #define SEQ_MOVIECLIP_RENDER_UNDISTORTED (1 << 0)

Modified: branches/soc-2013-vse/source/blender/makesdna/DNA_space_types.h
===================================================================
--- branches/soc-2013-vse/source/blender/makesdna/DNA_space_types.h	2013-09-22 05:17:13 UTC (rev 60299)
+++ branches/soc-2013-vse/source/blender/makesdna/DNA_space_types.h	2013-09-22 05:21:08 UTC (rev 60300)
@@ -482,9 +482,13 @@
 	int view; /* see SEQ_VIEW_* below */
 	int overlay_type;
 
+
 	struct bGPdata *gpd;        /* grease-pencil data */
 
 	struct SequencerScopes scopes;  /* different scoped displayed in space */
+
+
+	void *handler_view;
 } SpaceSeq;