Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTon Roosendaal <ton@blender.org>2005-05-05 21:19:21 +0400
committerTon Roosendaal <ton@blender.org>2005-05-05 21:19:21 +0400
commitf0a4ce98f904fa9577e80c9bcd2b80da6847e365 (patch)
tree289c594f3d43762a106be9f4b3a3e384dbcacc55 /source/blender/makesdna
parent22f65bce76b70a09467469c9a06c51d9acf76fa6 (diff)
Added the new Timeline Window, copied from Tuhopuu, coded by Matt Ebb.
Main change is that it's an own Space type now, not part of the Audio window... the audio window should restrict to own options. This way functionality is nicely separated. Since it's the first time I added a new space (since long!) I've made an extensive tutorial as well. You can find that here: http://www.blender3d.org/cms/Adding_new_Space_Window.557.0.html Notes for using timewindow; - Add time markers with MKey - CTRL+M gives option to name Marker - Markers cannot be moved yet... - Pageup-Pagedown keys moves current frame to next-prev Marker - Xkey removes Markers - If an object has Ipos or an Action, it draws key lines - CTRL+Pageup-Pagedown moves current frame to next-prev Key - Press S or E to set start/end frame for playback Notes about the implementation in Tuhopuu: - Add new Marker now selects new, deselects others - Selecting Marker didn't work like elsewhere in Blender, on click it should deselect all, except the indicated Marker. Not when holding SHIFT of course - Not exported functions are static now - Removed unused defines (MARKER_NONE NEXT_AVAIL) - Drawing order was confusing, doing too many matrix calls - Removed not needed scrollbar, added new function to draw time values. (Has advantage the MMB scroll works not confusing on a scrollbar) - Added proper support for 'frame mapping' - The string button (name Marker) had a bug (checked str[64] while str was only 64 long) - String button itself didn't allow "OK on enter" - Made frame buttons in header larger, the arrows overlapped - Removed support for negative frame values, that won't work so simple!
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r--source/blender/makesdna/DNA_scene_types.h36
-rw-r--r--source/blender/makesdna/DNA_screen_types.h3
-rw-r--r--source/blender/makesdna/DNA_space_types.h20
-rw-r--r--source/blender/makesdna/DNA_userdef_types.h1
4 files changed, 48 insertions, 12 deletions
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 9af3ffec868..504a1cfe546 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -114,7 +114,11 @@ typedef struct RenderData {
short depth, attrib, rt1, rt2; /* standalone player */
short stereomode; /* standalone player stereo settings */
- short pad[3];
+
+ short dimensionspreset; /* for the dimensions presets menu */
+
+ short pad[2];
+
short size, maximsize; /* size in %, max in Kb */
/* from buttons: */
@@ -243,6 +247,13 @@ typedef struct GameFraming {
#define SCE_GAMEFRAMING_EXTEND 1
#define SCE_GAMEFRAMING_SCALE 2
+typedef struct TimeMarker {
+ struct TimeMarker *next, *prev;
+ int frame;
+ char name[64];
+ unsigned int flag;
+} TimeMarker;
+
typedef struct Scene {
ID id;
struct Object *camera;
@@ -263,8 +274,8 @@ typedef struct Scene {
/* editmode stuff */
short selectmode, pad;
short proportional, prop_mode;
- float editbutsize; /* size of normals */
-
+ float editbutsize; /* size of normals */
+
void *ed;
struct Radio *radio;
void *sumohandle;
@@ -278,6 +289,8 @@ typedef struct Scene {
ScriptLink scriptlink;
+ ListBase markers;
+
/* none of the dependancy graph vars is mean to be saved */
struct DagForest *theDag;
short dagisvalid, dagflags;
@@ -392,14 +405,14 @@ typedef struct Scene {
#define SCE_SELECT_FACE 4
/* sce->prop_mode (proportional falloff) */
-#define PROP_SMOOTH 0
-#define PROP_SPHERE 1
-#define PROP_ROOT 2
-#define PROP_SHARP 3
-#define PROP_LIN 4
-#define PROP_CONST 5
-
-/* return flag next_object function */
+#define PROP_SMOOTH 0
+#define PROP_SPHERE 1
+#define PROP_ROOT 2
+#define PROP_SHARP 3
+#define PROP_LIN 4
+#define PROP_CONST 5
+
+ /* return flag next_object function */
#define F_START 0
#define F_SCENE 1
#define F_SET 2
@@ -410,6 +423,7 @@ typedef struct Scene {
#define AUDIO_SYNC 2
#define AUDIO_SCRUB 4
+
#ifdef __cplusplus
}
#endif
diff --git a/source/blender/makesdna/DNA_screen_types.h b/source/blender/makesdna/DNA_screen_types.h
index dc5a0b20b17..739bf7870ff 100644
--- a/source/blender/makesdna/DNA_screen_types.h
+++ b/source/blender/makesdna/DNA_screen_types.h
@@ -162,7 +162,8 @@ enum {
SPACE_SOUND,
SPACE_ACTION,
SPACE_NLA,
- SPACE_SCRIPT
+ SPACE_SCRIPT,
+ SPACE_TIME
/* SPACE_LOGIC */
};
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h
index ee45cf67074..51ad96f0cb4 100644
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -276,6 +276,20 @@ typedef struct SpaceScript {
} SpaceScript;
+typedef struct SpaceTime {
+ SpaceLink *next, *prev;
+ int spacetype;
+ float blockscale;
+ struct ScrArea *area;
+
+ View2D v2d;
+
+ int flag, pad;
+
+} SpaceTime;
+
+
+
#
#
typedef struct OneSelectableIma {
@@ -519,4 +533,10 @@ typedef struct SpaceImaSel {
#define IMS_INFILE 3
#define IMS_INFILESLI 4
+/* time->flag */
+
+#define TIME_DRAWFRAMES 1
+#define TIME_CFRA_NUM 2
+
+
#endif
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h
index 1ed9b175deb..c29c090005d 100644
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -113,6 +113,7 @@ typedef struct bTheme {
ThemeSpace timasel;
ThemeSpace text;
ThemeSpace toops;
+ ThemeSpace ttime;
} bTheme;