- New script:
Wim Van Hoydonck contributed the famous Knife script (put under Modifiers group) developed by Stefano Selleri and himself (thank to both!) - Added helper function Blender.sys.makename, updated docs and script ac3d_export to use it (shall update other exporters too): this function is just a simple helper to format a filename as needed (change extension, strip dirname, it defaults to use G.sce as path). - Added a test method: Blender.Scene.getScriptlinks(eventName): just testing, if this path proves useful other functions will be added and made general, for objects, etc.
This commit is contained in:
@@ -37,6 +37,7 @@
|
||||
#include <BSE_headerbuttons.h> /* for copy_scene */
|
||||
#include <BIF_drawscene.h> /* for set_scene */
|
||||
#include <BIF_space.h> /* for copy_view3d_lock() */
|
||||
#include <DNA_scriptlink_types.h>
|
||||
#include <MEM_guardedalloc.h> /* for MEM_callocN */
|
||||
#include <mydevice.h> /* for #define REDRAW */
|
||||
|
||||
@@ -97,6 +98,7 @@ static PyObject *Scene_getChildren(BPy_Scene *self);
|
||||
static PyObject *Scene_getCurrentCamera(BPy_Scene *self);
|
||||
static PyObject *Scene_setCurrentCamera(BPy_Scene *self, PyObject *args);
|
||||
static PyObject *Scene_getRenderingContext(BPy_Scene *self);
|
||||
static PyObject *Scene_getScriptlinks(BPy_Scene *self, PyObject *args);
|
||||
|
||||
//deprecated methods
|
||||
static PyObject *Scene_currentFrame(BPy_Scene *self, PyObject *args);
|
||||
@@ -140,6 +142,9 @@ static PyMethodDef BPy_Scene_methods[] = {
|
||||
"() - Return list of all objects linked to scene self"},
|
||||
{"getCurrentCamera", (PyCFunction)Scene_getCurrentCamera, METH_NOARGS,
|
||||
"() - Return current active Camera"},
|
||||
{"getScriptlinks", (PyCFunction)Scene_getScriptlinks, METH_VARARGS,
|
||||
"(eventname) - Get a list of this scene's scriptlinks (Text names) of the given type\n"
|
||||
"(eventname) - string: FrameChanged, OnLoad or Redraw."},
|
||||
{"setCurrentCamera", (PyCFunction)Scene_setCurrentCamera, METH_VARARGS,
|
||||
"() - Set the currently active Camera"},
|
||||
//DEPRECATED
|
||||
@@ -693,7 +698,7 @@ static PyObject *Scene_setCurrentCamera (BPy_Scene *self, PyObject *args)
|
||||
{
|
||||
Object *object;
|
||||
BPy_Object *cam_obj;
|
||||
Scene *scene = self->scene;
|
||||
Scene *scene = self->scene;
|
||||
|
||||
if (!scene)
|
||||
return EXPP_ReturnPyObjError (PyExc_RuntimeError,
|
||||
@@ -725,6 +730,55 @@ static PyObject *Scene_getRenderingContext (BPy_Scene *self)
|
||||
|
||||
return RenderData_CreatePyObject(self->scene);
|
||||
}
|
||||
|
||||
/* Scene.getScriptlinks */
|
||||
static PyObject *Scene_getScriptlinks (BPy_Scene *self, PyObject *args)
|
||||
{
|
||||
Scene *scene = self->scene;
|
||||
char *eventname = NULL;
|
||||
int event = 0;
|
||||
ScriptLink *slink = &(scene)->scriptlink;
|
||||
|
||||
if (!scene)
|
||||
return EXPP_ReturnPyObjError (PyExc_RuntimeError,
|
||||
"Blender Scene was deleted!");
|
||||
|
||||
if (!PyArg_ParseTuple(args, "s", &eventname))
|
||||
return EXPP_ReturnPyObjError (PyExc_TypeError,
|
||||
"expected event name (string) as argument");
|
||||
|
||||
if (!strcmp(eventname, "FrameChanged"))
|
||||
event = SCRIPT_FRAMECHANGED;
|
||||
else if (!strcmp(eventname, "OnLoad"))
|
||||
event = SCRIPT_ONLOAD;
|
||||
else if (!strcmp(eventname, "Redraw"))
|
||||
event = SCRIPT_REDRAW;
|
||||
else
|
||||
return EXPP_ReturnPyObjError (PyExc_AttributeError,
|
||||
"unknown event");
|
||||
|
||||
/* actually !scriptlink shouldn't happen ... */
|
||||
if (!slink || !slink->totscript) {
|
||||
Py_INCREF(Py_None);
|
||||
return Py_None;
|
||||
}
|
||||
else {
|
||||
PyObject *list = PyList_New(0);
|
||||
int i;
|
||||
|
||||
if (!list)
|
||||
return EXPP_ReturnPyObjError (PyExc_MemoryError,
|
||||
"couldn't create PyList!");
|
||||
|
||||
for (i = 0; i < slink->totscript; i++) {
|
||||
if ((slink->flag[i] == event) && slink->scripts[i])
|
||||
PyList_Append(list, PyString_FromString(slink->scripts[i]->name+2));
|
||||
}
|
||||
|
||||
return list;
|
||||
}
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
// DEPRECATED
|
||||
/*****************************************************************************/
|
||||
|
||||
@@ -42,6 +42,7 @@
|
||||
static PyObject *M_sys_basename (PyObject *self, PyObject *args);
|
||||
static PyObject *M_sys_dirname (PyObject *self, PyObject *args);
|
||||
static PyObject *M_sys_splitext (PyObject *self, PyObject *args);
|
||||
static PyObject *M_sys_makename (PyObject *self, PyObject *args, PyObject *kw);
|
||||
static PyObject *M_sys_exists (PyObject *self, PyObject *args);
|
||||
static PyObject *M_sys_time (PyObject *self);
|
||||
|
||||
@@ -69,6 +70,17 @@ static char M_sys_splitext_doc[] =
|
||||
/this/that/file.ext -> ('/this/that/file','.ext').\n\
|
||||
Return the pair (root, extension).";
|
||||
|
||||
static char M_sys_makename_doc[] =
|
||||
"(path = Blender.Get('filename'), ext = \"\", strip = 0) -\n\
|
||||
Strip dir and extension from path, leaving only a name, then append 'ext'\n\
|
||||
to it (if given) and return the resulting string.\n\n\
|
||||
(path) - string: a pathname -- Blender.Get('filename') if 'path' isn't given;\n\
|
||||
(ext = \"\") - string: the extension to append.\n\
|
||||
(strip = 0) - int: strip dirname from 'path' if given and non-zero.\n\
|
||||
Ex: makename('/path/to/file/myfile.foo','-01.abc') returns 'myfile-01.abc'\n\
|
||||
Ex: makename(ext='.txt') returns 'untitled.txt' if Blender.Get('filename')\n\
|
||||
returns a path to the file 'untitled.blend'";
|
||||
|
||||
static char M_sys_time_doc[] =
|
||||
"() - Return a float representing time elapsed in seconds.\n\
|
||||
Each successive call is garanteed to return values greater than or\n\
|
||||
@@ -84,6 +96,8 @@ struct PyMethodDef M_sys_methods[] = {
|
||||
{"basename", M_sys_basename, METH_VARARGS, M_sys_basename_doc},
|
||||
{"dirname", M_sys_dirname, METH_VARARGS, M_sys_dirname_doc},
|
||||
{"splitext", M_sys_splitext, METH_VARARGS, M_sys_splitext_doc},
|
||||
{"makename", (PyCFunction)M_sys_makename, METH_VARARGS|METH_KEYWORDS,
|
||||
M_sys_makename_doc},
|
||||
{"exists", M_sys_exists, METH_VARARGS, M_sys_exists_doc},
|
||||
{"time", (PyCFunction)M_sys_time, METH_NOARGS, M_sys_time_doc},
|
||||
{NULL, NULL, 0, NULL}
|
||||
@@ -145,7 +159,7 @@ static PyObject *M_sys_basename (PyObject *self, PyObject *args)
|
||||
return EXPP_ReturnPyObjError(PyExc_RuntimeError, "path too long");
|
||||
|
||||
strncpy(basename, p+1, n); /* + 1 to skip the sep */
|
||||
basename[n] = 0;
|
||||
basename[n] = '\0';
|
||||
return Py_BuildValue("s", basename);
|
||||
}
|
||||
|
||||
@@ -177,11 +191,11 @@ static PyObject *M_sys_dirname (PyObject *self, PyObject *args)
|
||||
return EXPP_ReturnPyObjError (PyExc_RuntimeError, "path too long");
|
||||
|
||||
strncpy(dirname, name, n);
|
||||
dirname[n] = 0;
|
||||
dirname[n] = '\0';
|
||||
return Py_BuildValue("s", dirname);
|
||||
}
|
||||
|
||||
return Py_BuildValue("s", "."); /* XXX need to fix this? (is crossplatform?)*/
|
||||
return Py_BuildValue("s", ".");
|
||||
}
|
||||
|
||||
static PyObject *M_sys_splitext (PyObject *self, PyObject *args)
|
||||
@@ -220,13 +234,71 @@ static PyObject *M_sys_splitext (PyObject *self, PyObject *args)
|
||||
EXPP_ReturnPyObjError(PyExc_RuntimeError, "path too long");
|
||||
|
||||
strncpy(ext, dot, n);
|
||||
ext[n] = 0;
|
||||
ext[n] = '\0';
|
||||
strncpy(path, name, dot - name);
|
||||
path[dot - name] = 0;
|
||||
path[dot - name] = '\0';
|
||||
|
||||
return Py_BuildValue("ss", path, ext);
|
||||
}
|
||||
|
||||
static PyObject *M_sys_makename(PyObject *self, PyObject *args, PyObject *kw)
|
||||
{
|
||||
char *path = G.sce, *ext = NULL;
|
||||
int strip = 0;
|
||||
static char *kwlist[] = {"path", "ext", "strip", NULL};
|
||||
char *dot = NULL, *p = NULL, basename[FILE_MAXFILE];
|
||||
char sep;
|
||||
int n, len, lenext = 0;
|
||||
PyObject *c;
|
||||
|
||||
if (!PyArg_ParseTupleAndKeywords(args, kw, "|ssi", kwlist,
|
||||
&path, &ext, &strip))
|
||||
return EXPP_ReturnPyObjError (PyExc_TypeError,
|
||||
"expected one or two strings and an int (or nothing) as arguments");
|
||||
|
||||
len = strlen(path);
|
||||
if (ext) lenext = strlen(ext);
|
||||
|
||||
if ((len + lenext) > FILE_MAXFILE)
|
||||
return EXPP_ReturnPyObjError(PyExc_RuntimeError, "path too long");
|
||||
|
||||
c = PyObject_GetAttrString (g_sysmodule, "dirsep");
|
||||
sep = PyString_AsString(c)[0];
|
||||
Py_DECREF(c);
|
||||
|
||||
p = strrchr(path, sep);
|
||||
|
||||
if (p && strip) {
|
||||
n = path + len - p - 1; /* - 1 because we don't want the sep */
|
||||
|
||||
strncpy(basename, p+1, n); /* + 1 to skip the sep */
|
||||
basename[n] = 0;
|
||||
}
|
||||
else {
|
||||
strncpy(basename, path, len);
|
||||
n = len;
|
||||
basename[n] = '\0';
|
||||
}
|
||||
|
||||
dot = strrchr(basename, '.');
|
||||
|
||||
/* now the extension: always remove the one in basename */
|
||||
if (dot || ext) {
|
||||
if (!ext)
|
||||
basename[dot - basename] = '\0';
|
||||
else { /* if user gave an ext, append it */
|
||||
|
||||
if (dot) n = dot - basename;
|
||||
else n = strlen(basename);
|
||||
|
||||
strncpy(basename + n, ext, lenext);
|
||||
basename[n+lenext] = '\0';
|
||||
}
|
||||
}
|
||||
|
||||
return PyString_FromString(basename);
|
||||
}
|
||||
|
||||
static PyObject *M_sys_time (PyObject *self)
|
||||
{
|
||||
double t = PIL_check_seconds_timer();
|
||||
|
||||
@@ -68,6 +68,35 @@ def splitext (path):
|
||||
@return: (root, ext)
|
||||
"""
|
||||
|
||||
def makename (path = "Blender.Get('filename')", ext = "", strip = 0):
|
||||
"""
|
||||
Remove extension from 'path', append extension 'ext' (if given)
|
||||
to the result and return it. If 'strip' is non-zero, also remove
|
||||
dirname from path.
|
||||
|
||||
Example::
|
||||
import Blender
|
||||
from Blender.sys import *
|
||||
print makename('/path/to/myfile.txt','.abc', 1) # returns 'myfile.abc'
|
||||
|
||||
print makename('/path/to/myfile.obj', '-01.obj') # '/path/to/myfile-01.obj'
|
||||
|
||||
print makename('/path/to/myfile.txt', strip = 1) # 'myfile'
|
||||
|
||||
# note that:
|
||||
print makename(ext = '.txt')
|
||||
# is equivalent to:
|
||||
print sys.splitext(Blender.Get('filename'))[0]) + '.txt'
|
||||
|
||||
@type path: string
|
||||
@param path: a path name or Blender.Get('filename'), if not given.
|
||||
@type ext: string
|
||||
@param ext: an extension to append. For flexibility, a dot ('.') is
|
||||
not automatically included.
|
||||
@rtype: string
|
||||
@return: the resulting string
|
||||
"""
|
||||
|
||||
def exists(path):
|
||||
"""
|
||||
Tell if the given pathname (file or dir) exists.
|
||||
|
||||
Reference in New Issue
Block a user