here is a quick summary...
Kent
intern/bsp/intern/BSP_CSGMesh_CFIterator.h
removed tri_index (unused variable)
intern/bsp/intern/CSG_BooleanOps.cpp
removed extra ;
intern/string/intern/STR_String.cpp
added <ctype.h>
source/blender/blenkernel/BKE_writeavi.h
moved things around so not doing forward declarations
source/blender/renderconverter/intern/convertBlenderScene.c
changed render.h to render_types.h
source/blender/src/blenderbuttons.c
source/blender/src/editgroup.c
source/blender/src/meshtools.c
added newline
source/gameengine/Ketsji/KX_KetsjiEngine.cpp
commented out include "PIL_time.h" code that requires it is commented out
reading blender/src/writeavicodec.c
(struct keyword to a couple of lines that needed it)
and added:
extern struct Render R;
blender/renderconverter/intern/convertBlenderScene.c
added extern Render R;
added #include "rendercore.h" to get rid of undeclared shade_material_loop
(Not sure if this is right but it fixes it.
Did not fix this problem, is it alright to just pass NULL here or should we chan
ge it to something else:
init_render_materials' : too few
gameengine/Physics/BlOde/OdePhysicsEnvironment.cpp
removed argument to dHashSpaceCreate
commented out dWorldQuickStep since it does not exist
// assume CSG_IteratorPtr is of the correct type.
BSP_CSGMesh_FaceIt * face_it = (BSP_CSGMesh_FaceIt *)it;
// essentially iterating through a triangle fan here.
- const int tri_index = face_it->face_triangle;
if (face_it->pos->m_verts.size()>3) {
// QUAD
#include "../../boolop/extern/BOP_Interface.h"
#include <iostream>
using namespace std;
-#include "BSP_MeshPrimitives.h";
+
+#include "BSP_MeshPrimitives.h"
struct BSP_MeshInfo {
BSP_CSGMesh *output_mesh;
#include <stdio.h>
#include <stdarg.h>
#include <stdlib.h>
+#include <ctype.h>
#include "STR_String.h"
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
/*-------------------------------------------------------------------------------------------------
Construction / destruction
-------------------------------------------------------------------------------------------------*/
/* generic blender movie support, could move to own module */
-typedef struct bMovieHandle {
- void (*start_movie)(RenderData *rd, int rectx, int recty);
- void (*append_movie)(int frame, int *pixels, int rectx, int recty);
- void (*end_movie)(void);
-} bMovieHandle;
-
-bMovieHandle *BKE_get_movie_handle(int imtype);
-
-
-/* ************** */
-
struct RenderData;
void start_avi(struct RenderData *rd, int rectx, int recty);
void end_avi(void);
void append_avi(int frame, int *pixels, int rectx, int recty);
void makeavistring (struct RenderData *rd, char *string);
+typedef struct bMovieHandle {
+ void (*start_movie)(struct RenderData *rd, int rectx, int recty);
+ void (*append_movie)(int frame, int *pixels, int rectx, int recty);
+ void (*end_movie)(void);
+} bMovieHandle;
+bMovieHandle *BKE_get_movie_handle(int imtype);
#ifdef __cplusplus
}
#include "BKE_utildefines.h"
#include "BKE_world.h"
-#include "render.h"
-
+#include "render_types.h"
+#include "rendercore.h"
#include "RE_renderconverter.h"
#include "BIF_space.h"
#include "radio.h"
#include "YafRay_Api.h"
+extern Render R;
extern void error (char *fmt, ...); /* defined in BIF_toolbox.h, but we dont need to include the rest */
/* yafray: Identity transform 'hack' removed, exporter now transforms vertices back to world.
28,156,104, 42, 49, 49,145,240,167,138, 7, 15, 30, 60,120,240,248,117,129,230, 79, 1, 15, 30, 60,120,240,224,193, 11, 0, 30,
60,120,240,224,193,131,199,175, 0,255,127, 0, 59, 53, 64,122, 27,196,134,227, 0, 0, 0, 0, 73, 69, 78, 68,174, 66, 96,130,
};
+
if(mode==1 || mode==3) add_selected_to_group(group);
else if(mode==2) rem_selected_from_group();
}
-}
\ No newline at end of file
+}
+
if(poinval != -1)
return (EditVert *)(poinval);
return NULL;
-}
\ No newline at end of file
+}
+
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#if defined(_WIN32) && !defined(FREE_WINDOWS)
#define INC_OLE2
// function definitions
static void init_bmi(BITMAPINFOHEADER *bmi);
-static void opts_to_acd(AviCodecData *acd);
-static void acd_to_opts(AviCodecData *acd);
+static void opts_to_acd(struct AviCodecData *acd);
+static void acd_to_opts(struct AviCodecData *acd);
static void free_opts_data();
static int open_avi_codec_file(char * name);
+extern struct Render R;
///////////////////////////////////////////////////////////////////////////
//
}
-static void opts_to_acd(AviCodecData *acd)
+static void opts_to_acd(struct AviCodecData *acd)
{
HIC hic;
ICINFO icinfo;
}
-static void acd_to_opts(AviCodecData *acd)
+static void acd_to_opts(struct AviCodecData *acd)
{
memset(&opts, 0, sizeof(opts));
if (acd) {
* The engine ties all game modules together.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#ifdef WIN32
#pragma warning (disable : 4786)
#endif //WIN32
}
-#include "PIL_time.h"
+// #include "PIL_time.h"
void KX_KetsjiEngine::NextFrame()
{
#include "PHY_IMotionState.h"
#include "OdePhysicsController.h"
-// Ode
-//#include <ode/config.h>
#include <ode/ode.h>
#include <../ode/src/joint.h>
#include <ode/odemath.h>
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
ODEPhysicsEnvironment::ODEPhysicsEnvironment()
{
m_OdeWorld = dWorldCreate();
- m_OdeSpace = dHashSpaceCreate(0);
+ m_OdeSpace = dHashSpaceCreate();
m_OdeContactGroup = dJointGroupCreate (0);
dWorldSetCFM (m_OdeWorld,1e-5f);
//physics integrator + resolver update
//dWorldStep (m_OdeWorld,deltaTime);
- dWorldQuickStep (m_OdeWorld,deltaTime);
+ //dWorldQuickStep (m_OdeWorld,deltaTime);
//dWorldID w, dReal stepsize)
//clear collision points