From 773824bbea5aeedfaa953f2d88359e91ed93186c Mon Sep 17 00:00:00 2001 From: Benoit Bolsee Date: Mon, 10 Nov 2008 22:17:40 +0000 Subject: [PATCH] VideoTexture: support VideoTexture in blenderplayer --- .../gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp | 1 + source/gameengine/GamePlayer/ghost/GPG_Application.cpp | 1 + source/gameengine/VideoTexture/ImageRender.cpp | 10 ++++++---- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp b/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp index 2d91bbcd7c1..4410763ec53 100644 --- a/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp +++ b/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp @@ -656,6 +656,7 @@ extern "C" void StartKetsjiShellSimulation(struct ScrArea *area, initGameKeys(); initPythonConstraintBinding(); initMathutils(); + initVideoTexture(); if (sceneconverter) { diff --git a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp index a9196a1a5e3..aa5e5835cdc 100644 --- a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp +++ b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp @@ -686,6 +686,7 @@ bool GPG_Application::startEngine(void) initGameKeys(); initPythonConstraintBinding(); initMathutils(); + initVideoTexture(); // Set the GameLogic.globalDict from marshal'd data, so we can // load new blend files and keep data in GameLogic.globalDict diff --git a/source/gameengine/VideoTexture/ImageRender.cpp b/source/gameengine/VideoTexture/ImageRender.cpp index 2f2d9debd48..a8f7871fa21 100644 --- a/source/gameengine/VideoTexture/ImageRender.cpp +++ b/source/gameengine/VideoTexture/ImageRender.cpp @@ -38,6 +38,11 @@ http://www.gnu.org/copyleft/lesser.txt. #include "BlendType.h" #include "Exception.h" +ExceptionID SceneInvalid, CameraInvalid; +ExpDesc SceneInvalidDesc (SceneInvalid, "Scene object is invalid"); +ExpDesc CameraInvalidDesc (CameraInvalid, "Camera object is invalid"); + +#if 0 // not yet supported // constructor ImageRender::ImageRender (KX_Scene * scene, KX_Camera * camera) : m_scene(scene), @@ -124,10 +129,6 @@ BlendType sceneType ("KX_Scene"); BlendType cameraType ("KX_Camera"); -ExceptionID SceneInvalid, CameraInvalid; -ExpDesc SceneInvalidDesc (SceneInvalid, "Scene object is invalid"); -ExpDesc CameraInvalidDesc (CameraInvalid, "Camera object is invalid"); - // object initialization static int ImageRender_init (PyObject * pySelf, PyObject * args, PyObject * kwds) { @@ -263,3 +264,4 @@ PyTypeObject ImageRenderType = }; +#endif // #if 0