diff options
Diffstat (limited to 'source/blenderplayer')
-rw-r--r-- | source/blenderplayer/CMakeLists.txt | 4 | ||||
-rw-r--r-- | source/blenderplayer/bad_level_call_stubs/CMakeLists.txt | 5 | ||||
-rw-r--r-- | source/blenderplayer/bad_level_call_stubs/SConscript | 52 | ||||
-rw-r--r-- | source/blenderplayer/bad_level_call_stubs/stubs.c | 91 |
4 files changed, 123 insertions, 29 deletions
diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt index 85bb07d6e83..c775f7d3279 100644 --- a/source/blenderplayer/CMakeLists.txt +++ b/source/blenderplayer/CMakeLists.txt @@ -95,6 +95,7 @@ endif() bf_rna bf_bmesh bf_blenkernel + bf_intern_rigidbody bf_blenloader ge_blen_routines bf_editor_datafiles @@ -102,7 +103,6 @@ endif() ge_logic_ketsji ge_phys_bullet ge_phys_dummy - ge_phys_common ge_logic ge_rasterizer ge_oglrasterizer @@ -149,6 +149,8 @@ endif() bf_intern_raskter bf_intern_opencolorio bf_intern_opennl + extern_rangetree + extern_wcwidth ) if(WITH_MOD_CLOTH_ELTOPO) diff --git a/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt b/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt index afd5f5b0177..e8e7ee6ea0a 100644 --- a/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt +++ b/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt @@ -29,6 +29,7 @@ remove_strict_flags() set(INC . .. + ../../blender/blenlib ../../blender/blenkernel ../../blender/blenloader ../../blender/makesdna @@ -60,4 +61,8 @@ if(WITH_GAMEENGINE) add_definitions(-DWITH_GAMEENGINE) endif() +if(WITH_FREESTYLE) + add_definitions(-DWITH_FREESTYLE) +endif() + blender_add_lib_nolist(blenkernel_blc "${SRC}" "${INC}" "${INC_SYS}") diff --git a/source/blenderplayer/bad_level_call_stubs/SConscript b/source/blenderplayer/bad_level_call_stubs/SConscript index 5efe9aa5761..2dbb0e00eb0 100644 --- a/source/blenderplayer/bad_level_call_stubs/SConscript +++ b/source/blenderplayer/bad_level_call_stubs/SConscript @@ -1,18 +1,48 @@ -#!/usr/bin/python +#!/usr/bin/env python +# +# ***** BEGIN GPL LICENSE BLOCK ***** +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# The Original Code is Copyright (C) 2006, Blender Foundation +# All rights reserved. +# +# The Original Code is: all of this file. +# +# Contributor(s): Nathan Letwory. +# +# ***** END GPL LICENSE BLOCK ***** + Import ('env') -sources = 'stubs.c' +sources = ['stubs.c'] -incs = '#/intern/guardedalloc' -incs += ' #/source/blender/makesdna' -incs += ' #/source/blender/makesrna' -incs += ' #/source/blender/blenloader' +incs = [ + '#/intern/guardedalloc', + '#/source/blender/makesdna', + '#/source/blender/makesrna', + '#/source/blender/blenloader', + '#/source/blender/blenlib', + ] -defs = '' -if env['WITH_BF_INTERNATIONAL']: - defs += 'WITH_FREETYPE2' +defs = [] if env['WITH_BF_GAMEENGINE']: - defs += ' WITH_GAMEENGINE' + defs.append('WITH_GAMEENGINE') + +if env['WITH_BF_FREESTYLE']: + defs.append(' WITH_FREESTYLE') -env.BlenderLib ('blenkernel_blc', sources = Split(sources), includes=Split(incs), defines=Split(defs), libtype=['player'],priority=[220] ) +env.BlenderLib('blenkernel_blc', sources=sources, includes=incs, defines=defs, libtype=['player'], priority=[220]) diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c index 2b29129c0f7..6004eb57000 100644 --- a/source/blenderplayer/bad_level_call_stubs/stubs.c +++ b/source/blenderplayer/bad_level_call_stubs/stubs.c @@ -34,6 +34,7 @@ #ifdef WITH_GAMEENGINE #include <stdlib.h> #include "DNA_listBase.h" +#include "BLI_utildefines.h" #include "RNA_types.h" struct ARegion; @@ -55,6 +56,10 @@ struct FCurve; struct Heap; struct HeapNode; struct ID; +#ifdef WITH_FREESTYLE +struct FreestyleConfig; +struct FreestyleLineSet; +#endif struct ImBuf; struct Image; struct ImageUser; @@ -67,6 +72,7 @@ struct Mask; struct Material; struct MenuType; struct Mesh; +struct MetaBall; struct ModifierData; struct MovieClip; struct MultiresModifierData; @@ -83,6 +89,9 @@ struct RenderLayer; struct RenderResult; struct Scene; struct Scene; +#ifdef WITH_FREESTYLE +struct SceneRenderLayer; +#endif struct ScrArea; struct SculptSession; struct ShadeInput; @@ -105,15 +114,20 @@ struct bConstraintOb; struct bConstraintTarget; struct bContextDataResult; struct bNode; +struct bNodeType; struct bNodeSocket; +struct bNodeSocketType; struct bNodeTree; +struct bNodeTreeType; struct bPoseChannel; struct bPythonConstraint; +struct bTheme; struct uiLayout; struct wmEvent; struct wmKeyConfig; struct wmKeyMap; struct wmOperator; +struct wmOperatorType; struct wmWindow; struct wmWindowManager; @@ -193,16 +207,23 @@ void WM_menutype_free(void) {} void WM_menutype_freelink(struct MenuType *mt) {} int WM_menutype_add(struct MenuType *mt) {return 0;} int WM_operator_props_dialog_popup(struct bContext *C, struct wmOperator *op, int width, int height) {return 0;} -int WM_operator_confirm(struct bContext *C, struct wmOperator *op, struct wmEvent *event) {return 0;} +int WM_operator_confirm(struct bContext *C, struct wmOperator *op, const struct wmEvent *event) {return 0;} struct MenuType *WM_menutype_find(const char *idname, int quiet) {return (struct MenuType *) NULL;} void WM_operator_stack_clear(struct bContext *C) {} +void WM_operator_handlers_clear(struct bContext *C, struct wmOperatorType *ot) {} void WM_autosave_init(struct bContext *C) {} void WM_jobs_kill_all_except(struct wmWindowManager *wm) {} -char *WM_clipboard_text_get(int selection) {return (char*)0;} +char *WM_clipboard_text_get(int selection) {return (char *)0;} void WM_clipboard_text_set(char *buf, int selection) {} +void WM_uilisttype_init(void) {} +struct uiListType *WM_uilisttype_find(const char *idname, int quiet) {return (struct uiListType *)NULL;} +int WM_uilisttype_add(struct uiListType *ult) {return 0;} +void WM_uilisttype_freelink(struct uiListType *ult) {} +void WM_uilisttype_free(void) {} + struct wmKeyMapItem *WM_keymap_item_find_id(struct wmKeyMap *keymap, int id) {return (struct wmKeyMapItem *) NULL;} int WM_enum_search_invoke(struct bContext *C, struct wmOperator *op, struct wmEvent *event) {return 0;} void WM_event_add_notifier(const struct bContext *C, unsigned int type, void *reference) {} @@ -215,7 +236,7 @@ void ED_armature_edit_bone_remove(struct bArmature *arm, struct EditBone *exBone void object_test_constraints(struct Object *owner) {} void ED_object_parent(struct Object *ob, struct Object *par, int type, const char *substr) {} void ED_object_constraint_set_active(struct Object *ob, struct bConstraint *con) {} -void ED_node_composit_default(struct Scene *sce) {} +void ED_node_composit_default(struct bContext *C, struct Scene *scene) {} void *ED_region_draw_cb_activate(struct ARegionType *art, void(*draw)(const struct bContext *, struct ARegion *, void *), void *custumdata, int type) {return 0;} /* XXX this one looks weird */ void *ED_region_draw_cb_customdata(void *handle) {return 0;} /* XXX This one looks wrong also */ void ED_region_draw_cb_exit(struct ARegionType *art, void *handle) {} @@ -292,10 +313,21 @@ void ED_area_newspace(struct bContext *C, struct ScrArea *sa, int type) {} void ED_region_tag_redraw(struct ARegion *ar) {} void WM_event_add_fileselect(struct bContext *C, struct wmOperator *op) {} void WM_cursor_wait(int val) {} -void ED_node_texture_default(struct Tex *tx) {} -void ED_node_changed_update(struct bContext *C, struct bNode *node) {} -void ED_node_generic_update(struct Main *bmain, struct bNodeTree *ntree, struct bNode *node) {} -void ED_node_tree_update(struct SpaceNode *snode, struct Scene *scene) {} +void ED_node_texture_default(struct bContext *C, struct Tex *tx) {} +void ED_node_tag_update_id(struct ID *id) {} +void ED_node_tag_update_nodetree(struct Main *bmain, struct bNodeTree *ntree) {} +void ED_node_tree_update(const struct bContext *C) {} +void ED_node_set_tree_type(struct SpaceNode *snode, struct bNodeTreeType *typeinfo){} +void ED_init_custom_node_type(struct bNodeType *ntype){} +void ED_init_custom_node_socket_type(struct bNodeSocketType *stype){} +void ED_init_standard_node_socket_type(struct bNodeSocketType *stype) {} +void ED_init_node_socket_type_virtual(struct bNodeSocketType *stype) {} +int ED_node_tree_path_length(struct SpaceNode *snode){return 0;} +void ED_node_tree_path_get(struct SpaceNode *snode, char *value){} +void ED_node_tree_path_get_fixedbuf(struct SpaceNode *snode, char *value, int max_length){} +void ED_node_tree_start(struct SpaceNode *snode, struct bNodeTree *ntree, struct ID *id, struct ID *from){} +void ED_node_tree_push(struct SpaceNode *snode, struct bNodeTree *ntree, struct bNode *gnode){} +void ED_node_tree_pop(struct SpaceNode *snode){} void ED_view3d_scene_layers_update(struct Main *bmain, struct Scene *scene) {} int ED_view3d_scene_layer_set(int lay, const int *values) {return 0;} void ED_view3d_quadview_update(struct ScrArea *sa, struct ARegion *ar) {} @@ -307,15 +339,16 @@ void ED_view3d_update_viewmat(struct Scene *scene, struct View3D *v3d, struct AR float ED_view3d_grid_scale(struct Scene *scene, struct View3D *v3d, const char **grid_unit) {return 0.0f;} void view3d_apply_mat4(float mat[4][4], float *ofs, float *quat, float *dist) {} int text_file_modified(struct Text *text) {return 0;} -void ED_node_shader_default(struct Material *ma) {} +void ED_node_shader_default(struct bContext *C, struct ID *id) {} void ED_screen_animation_timer_update(struct bContext *C, int redraws) {} void ED_screen_animation_playing(struct wmWindowManager *wm) {} void ED_base_object_select(struct Base *base, short mode) {} int ED_object_modifier_remove(struct ReportList *reports, struct Scene *scene, struct Object *ob, struct ModifierData *md) {return 0;} int ED_object_modifier_add(struct ReportList *reports, struct Scene *scene, struct Object *ob, char *name, int type) {return 0;} -void ED_object_modifier_clear(struct Scene *scene, struct Object *ob) {} -void ED_object_enter_editmode(struct bContext *C, int flag) {} -void ED_object_exit_editmode(struct bContext *C, int flag) {} +void ED_object_modifier_clear(struct Main *bmain, struct Object *ob) {} +void ED_object_editmode_enter(struct bContext *C, int flag) {} +void ED_object_editmode_exit(struct bContext *C, int flag) {} +bool ED_object_editmode_load(struct Object *obedit) { return false; } int uiLayoutGetActive(struct uiLayout *layout) {return 0;} int uiLayoutGetOperatorContext(struct uiLayout *layout) {return 0;} int uiLayoutGetAlignment(struct uiLayout *layout) {return 0;} @@ -328,6 +361,7 @@ void uiLayoutSetEnabled(struct uiLayout *layout, int enabled) {} void uiLayoutSetAlignment(struct uiLayout *layout, int alignment) {} void uiLayoutSetScaleX(struct uiLayout *layout, float scale) {} void uiLayoutSetScaleY(struct uiLayout *layout, float scale) {} +void uiTemplateIconView(struct uiLayout *layout, struct PointerRNA *ptr, const char *propname) {} void ED_base_object_free_and_unlink(struct Scene *scene, struct Base *base) {} void ED_mesh_calc_normals(struct Mesh *me) {} void ED_mesh_geometry_add(struct Mesh *mesh, struct ReportList *reports, int verts, int edges, int faces) {} @@ -343,8 +377,10 @@ void ED_mesh_vertices_remove(struct Mesh *mesh, struct ReportList *reports, int void ED_mesh_edges_remove(struct Mesh *mesh, struct ReportList *reports, int count) {} void ED_mesh_faces_remove(struct Mesh *mesh, struct ReportList *reports, int count) {} void ED_mesh_material_link(struct Mesh *mesh, struct Material *ma) {} -int ED_mesh_color_add(struct bContext *C, struct Scene *scene, struct Object *ob, struct Mesh *me) {return 0;} -int ED_mesh_uv_texture_add(struct bContext *C, struct Mesh *me) {return 0;} +int ED_mesh_color_add(struct Mesh *me, const char *name, const bool active_set) { return -1; } +int ED_mesh_uv_texture_add(struct Mesh *me, const char *name, const bool active_set) { return -1; } +bool ED_mesh_color_remove_named(struct Mesh *me, const char *name) { return false; } +bool ED_mesh_uv_texture_remove_named(struct Mesh *me, const char *name) { return false; } void ED_object_constraint_dependency_update(struct Scene *scene, struct Object *ob) {} void ED_object_constraint_update(struct Object *ob) {} struct bDeformGroup *ED_vgroup_add_name(struct Object *ob, char *name) {return (struct bDeformGroup *) NULL;} @@ -364,6 +400,8 @@ int ED_space_image_check_show_maskedit(struct Scene *scene, struct SpaceImage *s void ED_nurb_set_spline_type(struct Nurb *nu, int type) {} +void ED_mball_transform(struct MetaBall *mb, float *mat) {} + void make_editLatt(struct Object *obedit) {} void load_editLatt(struct Object *obedit) {} @@ -374,6 +412,7 @@ void make_editNurb(struct Object *obedit) {} void uiItemR(struct uiLayout *layout, struct PointerRNA *ptr, char *propname, int flag, char *name, int icon) {} struct PointerRNA uiItemFullO(struct uiLayout *layout, char *idname, char *name, int icon, struct IDProperty *properties, int context, int flag) {struct PointerRNA a = {{0}}; return a;} +PointerRNA uiItemFullO_ptr(struct uiLayout *layout, struct wmOperatorType *ot, const char *name, int icon, struct IDProperty *properties, int context, int flag) {struct PointerRNA a = {{0}}; return a;} struct uiLayout *uiLayoutRow(struct uiLayout *layout, int align) {return (struct uiLayout *) NULL;} struct uiLayout *uiLayoutColumn(struct uiLayout *layout, int align) {return (struct uiLayout *) NULL;} struct uiLayout *uiLayoutColumnFlow(struct uiLayout *layout, int number, int align) {return (struct uiLayout *) NULL;} @@ -400,6 +439,8 @@ void uiItemFullR(struct uiLayout *layout, struct PointerRNA *ptr, struct Propert void uiLayoutSetContextPointer(struct uiLayout *layout, char *name, struct PointerRNA *ptr) {} char *uiLayoutIntrospect(struct uiLayout *layout) {return (char *)NULL;} void UI_reinit_font(void) {} +int UI_rnaptr_icon_get(struct bContext *C, struct PointerRNA *ptr, int rnaicon, int big) {return 0;} +struct bTheme *UI_GetTheme(void) {return (struct bTheme *) NULL;}; /* rna template */ void uiTemplateAnyID(struct uiLayout *layout, struct bContext *C, struct PointerRNA *ptr, char *propname, char *text) {} @@ -414,7 +455,9 @@ void uiTemplateCurveMapping(struct uiLayout *layout, struct CurveMapping *cumap, void uiTemplateColorRamp(struct uiLayout *layout, struct ColorBand *coba, int expand) {} void uiTemplateLayers(struct uiLayout *layout, struct PointerRNA *ptr, char *propname) {} void uiTemplateImageLayers(struct uiLayout *layout, struct bContext *C, struct Image *ima, struct ImageUser *iuser) {} -ListBase uiTemplateList(struct uiLayout *layout, struct bContext *C, struct PointerRNA *ptr, char *propname, struct PointerRNA *activeptr, char *activepropname, int rows, int listtype) {struct ListBase b = {0,0}; return b;} +void uiTemplateList(struct uiLayout *layout, struct bContext *C, const char *listtype_name, const char *list_id, + PointerRNA *dataptr, const char *propname, PointerRNA *active_dataptr, + const char *active_propname, int rows, int maxrows, int layout_type) {} void uiTemplateRunningJobs(struct uiLayout *layout, struct bContext *C) {} void uiTemplateOperatorSearch(struct uiLayout *layout) {} void uiTemplateHeader3D(struct uiLayout *layout, struct bContext *C) {} @@ -438,12 +481,15 @@ void uiTemplateMarker(struct uiLayout *layout, struct PointerRNA *ptr, const cha void uiTemplateImageSettings(struct uiLayout *layout, struct PointerRNA *imfptr) {} void uiTemplateColorspaceSettings(struct uiLayout *layout, struct PointerRNA *ptr, const char *propname) {} void uiTemplateColormanagedViewSettings(struct uiLayout *layout, struct bContext *C, struct PointerRNA *ptr, const char *propname, int show_global_settings) {} +void uiTemplateComponentMenu(struct uiLayout *layout, struct PointerRNA *ptr, const char *propname, const char *name){} +void uiTemplateNodeSocket(struct uiLayout *layout, struct bContext *C, float *color) {} /* rna render */ struct RenderResult *RE_engine_begin_result(struct RenderEngine *engine, int x, int y, int w, int h) {return (struct RenderResult *) NULL;} struct RenderResult *RE_AcquireResultRead(struct Render *re) {return (struct RenderResult *) NULL;} struct RenderResult *RE_AcquireResultWrite(struct Render *re) {return (struct RenderResult *) NULL;} struct RenderStats *RE_GetStats(struct Render *re) {return (struct RenderStats *) NULL;} +struct RenderData *RE_engine_get_render_data(struct Render *re) {return (struct RenderData *) NULL;} void RE_engine_update_result(struct RenderEngine *engine, struct RenderResult *result) {} void RE_engine_update_progress(struct RenderEngine *engine, float progress) {} void RE_engine_end_result(struct RenderEngine *engine, struct RenderResult *result) {} @@ -478,8 +524,8 @@ void WM_operator_properties_free(struct PointerRNA *ptr) {} void WM_operator_properties_create(struct PointerRNA *ptr, const char *opstring) {} void WM_operator_properties_create_ptr(struct PointerRNA *ptr, struct wmOperatorType *ot) {} void WM_operator_properties_sanitize(struct PointerRNA *ptr, const short no_context) {}; -void WM_operatortype_append_ptr(void (*opfunc)(struct wmOperatorType*, void*), void *userdata) {} -void WM_operatortype_append_macro_ptr(void (*opfunc)(struct wmOperatorType*, void*), void *userdata) {} +void WM_operatortype_append_ptr(void (*opfunc)(struct wmOperatorType*, void *), void *userdata) {} +void WM_operatortype_append_macro_ptr(void (*opfunc)(struct wmOperatorType*, void *), void *userdata) {} void WM_operator_bl_idname(char *to, const char *from) {} void WM_operator_py_idname(char *to, const char *from) {} void WM_operator_ui_popup(struct bContext *C, struct wmOperator *op, int width, int height) {} @@ -516,7 +562,18 @@ void macro_wrapper(struct wmOperatorType *ot, void *userdata) {} int pyrna_id_FromPyObject(struct PyObject *obj, struct ID **id) { return 0; } struct PyObject *pyrna_id_CreatePyObject(struct ID *id) {return NULL; } void BPY_context_update(struct bContext *C) {}; - +const char *BPY_app_translations_py_pgettext(const char *msgctxt, const char *msgid) { return msgid; } + +#ifdef WITH_FREESTYLE +/* Freestyle */ +void FRS_init_freestyle_config(struct FreestyleConfig *config) {} +void FRS_free_freestyle_config(struct FreestyleConfig *config) {} +void FRS_copy_freestyle_config(struct FreestyleConfig *new_config, struct FreestyleConfig *config) {} +struct FreestyleLineSet *FRS_get_active_lineset(struct FreestyleConfig *config) { return NULL; } +short FRS_get_active_lineset_index(struct FreestyleConfig *config) { return 0; } +void FRS_set_active_lineset_index(struct FreestyleConfig *config, short index) {} +void FRS_unlink_target_object(struct FreestyleConfig *config, struct Object *ob) {} +#endif /* intern/dualcon */ struct DualConMesh; struct DualConMesh *dualcon(const struct DualConMesh *input_mesh, |