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:
authorDalai Felinto <dfelinto@gmail.com>2018-04-16 15:07:42 +0300
committerDalai Felinto <dfelinto@gmail.com>2018-04-17 18:51:28 +0300
commit159806140fd33e6ddab951c0f6f180cfbf927d38 (patch)
treeda076be3baa4d987fb5935e220a3d901c926e0e7 /source/creator
parent28b996a9d2090efdd74115a653629ef9d7d871f7 (diff)
Removing Blender Game Engine from Blender 2.8
Folders removed entirely: * //extern/recastnavigation * //intern/decklink * //intern/moto * //source/blender/editors/space_logic * //source/blenderplayer * //source/gameengine This includes DNA data and any reference to the BGE code in Blender itself. We are bumping the subversion. Pending tasks: * Tile/clamp code in image editor draw code. * Viewport drawing code (so much of this will go away because of BI removal that we can wait until then to remove this.
Diffstat (limited to 'source/creator')
-rw-r--r--source/creator/CMakeLists.txt53
-rw-r--r--source/creator/creator.c31
-rw-r--r--source/creator/creator_args.c108
-rw-r--r--source/creator/creator_intern.h2
-rw-r--r--source/creator/creator_signals.c7
5 files changed, 3 insertions, 198 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 1adef28f2c8..c5d1a55dfd6 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -76,12 +76,6 @@ if(WITH_HEADLESS)
add_definitions(-DWITH_HEADLESS)
endif()
-if(WITH_GAMEENGINE)
- blender_include_dirs(../gameengine/BlenderRoutines)
-
- add_definitions(-DWITH_GAMEENGINE)
-endif()
-
if(WITH_SDL)
if(WITH_SDL_DYNLOAD)
add_definitions(-DWITH_SDL_DYNLOAD)
@@ -930,53 +924,6 @@ elseif(APPLE)
)
unset(_py_inc_suffix)
endif()
-
- # install blenderplayer bundle - copy of blender.app above. re-using macros et al
- # note we are using OSX Bundle as base and copying Blender dummy bundle on top of it
- if(WITH_GAMEENGINE AND WITH_PLAYER)
- set(OSX_APP_PLAYER_SOURCEDIR ${CMAKE_SOURCE_DIR}/release/darwin/blenderplayer.app)
- set(PLAYER_SOURCEINFO ${OSX_APP_PLAYER_SOURCEDIR}/Contents/Info.plist)
- set(PLAYER_TARGETDIR_VER blenderplayer.app/Contents/Resources/${BLENDER_VERSION})
-
-
- # important to make a clean install each time else old scripts get loaded.
- install(
- CODE
- "file(REMOVE_RECURSE ${PLAYER_TARGETDIR_VER})"
- )
-
- # Give the bundle actual creation/modification date
- execute_process(COMMAND SetFile -d ${SETFILE_DATE} -m ${SETFILE_DATE}
- ${EXECUTABLE_OUTPUT_PATH}/blenderplayer.app)
-
- install(
- FILES ${OSX_APP_PLAYER_SOURCEDIR}/Contents/PkgInfo
- DESTINATION blenderplayer.app/Contents
- )
-
- install_dir(
- ${OSX_APP_PLAYER_SOURCEDIR}/Contents/Resources
- blenderplayer.app/Contents/
- )
-
- if(WITH_OPENMP AND CMAKE_C_COMPILER_ID MATCHES "Clang" AND NOT ${CMAKE_C_COMPILER_VERSION} VERSION_LESS '3.4')
- install(
- FILES ${LIBDIR}/openmp/lib/libiomp5.dylib
- DESTINATION blenderplayer.app/Contents/Resources/lib/
- )
- endif()
-
-
- # python
- if(WITH_PYTHON AND NOT WITH_PYTHON_FRAMEWORK)
- # Copy the python libs into the install directory
- install_dir(
- ${PYTHON_LIBPATH}
- ${PLAYER_TARGETDIR_VER}/python/lib
- )
- endif()
-
- endif()
endif()
diff --git a/source/creator/creator.c b/source/creator/creator.c
index 2aa60c3e2a7..d3fecad2e03 100644
--- a/source/creator/creator.c
+++ b/source/creator/creator.c
@@ -85,13 +85,6 @@
# include "FRS_freestyle.h"
#endif
-/* for passing information between creator and gameengine */
-#ifdef WITH_GAMEENGINE
-# include "BL_System.h"
-#else /* dummy */
-# define SYS_SystemHandle int
-#endif
-
#include <signal.h>
#ifdef __FreeBSD__
@@ -226,7 +219,6 @@ int main(
)
{
bContext *C;
- SYS_SystemHandle syshandle;
#ifndef WITH_PYTHON_MODULE
bArgs *ba;
@@ -381,12 +373,6 @@ int main(
BLI_callback_global_init();
-#ifdef WITH_GAMEENGINE
- syshandle = SYS_GetSystem();
-#else
- syshandle = 0;
-#endif
-
/* first test for background */
#ifndef WITH_PYTHON_MODULE
ba = BLI_argsInit(argc, (const char **)argv); /* skip binary path */
@@ -394,7 +380,7 @@ int main(
/* ensure we free on early exit */
app_init_data.ba = ba;
- main_args_setup(C, ba, &syshandle);
+ main_args_setup(C, ba);
BLI_argsParse(ba, 1, NULL, NULL);
@@ -402,7 +388,6 @@ int main(
#else
G.factory_startup = true; /* using preferences or user startup makes no sense for py-as-module */
- (void)syshandle;
#endif
#ifdef WITH_FFMPEG
@@ -517,20 +502,6 @@ int main(
WM_exit(C);
}
else {
- if (G.fileflags & G_FILE_AUTOPLAY) {
- if (G.f & G_SCRIPT_AUTOEXEC) {
- if (WM_init_game(C)) {
- return 0;
- }
- }
- else {
- if (!(G.f & G_SCRIPT_AUTOEXEC_FAIL_QUIET)) {
- G.f |= G_SCRIPT_AUTOEXEC_FAIL;
- BLI_snprintf(G.autoexec_fail, sizeof(G.autoexec_fail), "Game AutoStart");
- }
- }
- }
-
if (!G.file_loaded) {
WM_init_splash(C);
}
diff --git a/source/creator/creator_args.c b/source/creator/creator_args.c
index dac22322361..96aeba56eee 100644
--- a/source/creator/creator_args.c
+++ b/source/creator/creator_args.c
@@ -76,13 +76,6 @@
#include "GPU_draw.h"
-/* for passing information between creator and gameengine */
-#ifdef WITH_GAMEENGINE
-# include "BL_System.h"
-#else /* dummy */
-# define SYS_SystemHandle int
-#endif
-
#ifdef WITH_LIBMV
# include "libmv-capi.h"
#endif
@@ -511,11 +504,6 @@ static int arg_handle_print_help(int UNUSED(argc), const char **UNUSED(argv), vo
BLI_argsPrintArgDoc(ba, "--start-console");
BLI_argsPrintArgDoc(ba, "--no-native-pixels");
-
- printf("\n");
- printf("Game Engine Specific Options:\n");
- BLI_argsPrintArgDoc(ba, "-g");
-
printf("\n");
printf("Python Options:\n");
BLI_argsPrintArgDoc(ba, "--enable-autoexec");
@@ -581,7 +569,6 @@ static int arg_handle_print_help(int UNUSED(argc), const char **UNUSED(argv), vo
BLI_argsPrintArgDoc(ba, "--env-system-scripts");
BLI_argsPrintArgDoc(ba, "--env-system-python");
printf("\n");
- BLI_argsPrintArgDoc(ba, "-nojoystick");
BLI_argsPrintArgDoc(ba, "-noaudio");
BLI_argsPrintArgDoc(ba, "-setaudio");
@@ -1125,27 +1112,6 @@ static int arg_handle_register_extension(int UNUSED(argc), const char **UNUSED(a
return 0;
}
-static const char arg_handle_joystick_disable_doc[] =
-"\n\tDisable joystick support."
-;
-static int arg_handle_joystick_disable(int UNUSED(argc), const char **UNUSED(argv), void *data)
-{
-#ifndef WITH_GAMEENGINE
- (void)data;
-#else
- SYS_SystemHandle *syshandle = data;
-
- /**
- * don't initialize joysticks if user doesn't want to use joysticks
- * failed joystick initialization delays over 5 seconds, before game engine start
- */
- SYS_WriteCommandLineInt(*syshandle, "nojoystick", 1);
- if (G.debug & G_DEBUG) printf("disabling nojoystick\n");
-#endif
-
- return 0;
-}
-
static const char arg_handle_audio_disable_doc[] =
"\n\tForce sound system to None."
;
@@ -1379,76 +1345,6 @@ static int arg_handle_extension_set(int argc, const char **argv, void *data)
}
}
-static const char arg_handle_ge_parameters_set_doc[] =
-"Game Engine specific options\n"
-"\n"
-"\t'fixedtime'\n"
-"\t\tRun on 50 hertz without dropping frames.\n"
-"\t'vertexarrays'\n"
-"\t\tUse Vertex Arrays for rendering (usually faster).\n"
-"\t'nomipmap'\n"
-"\t\tNo Texture Mipmapping.\n"
-"\t'linearmipmap'\n"
-"\t\tLinear Texture Mipmapping instead of Nearest (default)."
-;
-static int arg_handle_ge_parameters_set(int argc, const char **argv, void *data)
-{
- int a = 0;
-#ifdef WITH_GAMEENGINE
- SYS_SystemHandle syshandle = *(SYS_SystemHandle *)data;
-#else
- (void)data;
-#endif
-
- /**
- * gameengine parameters are automatically put into system
- * -g [paramname = value]
- * -g [boolparamname]
- * example:
- * -g novertexarrays
- * -g maxvertexarraysize = 512
- */
-
- if (argc >= 1) {
- const char *paramname = argv[a];
- /* check for single value versus assignment */
- if (a + 1 < argc && (*(argv[a + 1]) == '=')) {
- a++;
- if (a + 1 < argc) {
- a++;
- /* assignment */
-#ifdef WITH_GAMEENGINE
- SYS_WriteCommandLineString(syshandle, paramname, argv[a]);
-#endif
- }
- else {
- printf("Error: argument assignment (%s) without value.\n", paramname);
- return 0;
- }
- /* name arg eaten */
-
- }
- else {
-#ifdef WITH_GAMEENGINE
- SYS_WriteCommandLineInt(syshandle, argv[a], 1);
-#endif
- /* doMipMap */
- if (STREQ(argv[a], "nomipmap")) {
- GPU_set_mipmap(0); //doMipMap = 0;
- }
- /* linearMipMap */
- if (STREQ(argv[a], "linearmipmap")) {
- GPU_set_mipmap(1);
- GPU_set_linear_mipmap(1); //linearMipMap = 1;
- }
-
-
- } /* if (*(argv[a + 1]) == '=') */
- }
-
- return a;
-}
-
static const char arg_handle_render_frame_doc[] =
"<frame>\n"
"\tRender frame <frame> and save it.\n"
@@ -1890,7 +1786,7 @@ static int arg_handle_load_file(int UNUSED(argc), const char **argv, void *data)
}
-void main_args_setup(bContext *C, bArgs *ba, SYS_SystemHandle *syshandle)
+void main_args_setup(bContext *C, bArgs *ba)
{
#define CB(a) a##_doc, a
@@ -2004,12 +1900,10 @@ void main_args_setup(bContext *C, bArgs *ba, SYS_SystemHandle *syshandle)
BLI_argsAdd(ba, 2, NULL, "--no-native-pixels", CB(arg_handle_native_pixels_set), ba);
/* third pass: disabling things and forcing settings */
- BLI_argsAddCase(ba, 3, "-nojoystick", 1, NULL, 0, CB(arg_handle_joystick_disable), syshandle);
BLI_argsAddCase(ba, 3, "-noaudio", 1, NULL, 0, CB(arg_handle_audio_disable), NULL);
BLI_argsAddCase(ba, 3, "-setaudio", 1, NULL, 0, CB(arg_handle_audio_set), NULL);
/* fourth pass: processing arguments */
- BLI_argsAdd(ba, 4, "-g", NULL, CB(arg_handle_ge_parameters_set), syshandle);
BLI_argsAdd(ba, 4, "-f", "--render-frame", CB(arg_handle_render_frame), C);
BLI_argsAdd(ba, 4, "-a", "--render-anim", CB(arg_handle_render_animation), C);
BLI_argsAdd(ba, 4, "-S", "--scene", CB(arg_handle_scene_set), C);
diff --git a/source/creator/creator_intern.h b/source/creator/creator_intern.h
index a972a926677..311c8b74006 100644
--- a/source/creator/creator_intern.h
+++ b/source/creator/creator_intern.h
@@ -33,7 +33,7 @@ struct bContext;
#ifndef WITH_PYTHON_MODULE
/* creator_args.c */
-void main_args_setup(struct bContext *C, struct bArgs *ba, SYS_SystemHandle *syshandle);
+void main_args_setup(struct bContext *C, struct bArgs *ba);
void main_args_setup_post(struct bContext *C, struct bArgs *ba);
diff --git a/source/creator/creator_signals.c b/source/creator/creator_signals.c
index feb108da289..55f9777f55a 100644
--- a/source/creator/creator_signals.c
+++ b/source/creator/creator_signals.c
@@ -65,13 +65,6 @@
#include "BKE_report.h"
-/* for passing information between creator and gameengine */
-#ifdef WITH_GAMEENGINE
-# include "BL_System.h"
-#else /* dummy */
-# define SYS_SystemHandle int
-#endif
-
#include <signal.h>
#include "creator_intern.h" /* own include */