Commit 7b52ef6f authored by hybrid's avatar hybrid

Fix some warnings.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3669 dfc29bdd-3216-0410-991c-e03cc46cb475
parent 66649891
...@@ -42,8 +42,6 @@ static bool addBlend2d(video::E_DRIVER_TYPE type) ...@@ -42,8 +42,6 @@ static bool addBlend2d(video::E_DRIVER_TYPE type)
gui::IGUIEnvironment* env = device->getGUIEnvironment(); gui::IGUIEnvironment* env = device->getGUIEnvironment();
{ {
gui::IGUIElement* root = env->getRootGUIElement();
// create the toolbox window // create the toolbox window
gui::IGUIWindow* wnd = env->addWindow(core::rect<s32>(0,0,800,480), gui::IGUIWindow* wnd = env->addWindow(core::rect<s32>(0,0,800,480),
false, L"Toolset", 0, 100); false, L"Toolset", 0, 100);
......
...@@ -14,7 +14,7 @@ all: all_linux ...@@ -14,7 +14,7 @@ all: all_linux
# target specific settings # target specific settings
all_linux: SYSTEM=Linux all_linux: SYSTEM=Linux
all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../lib/$(SYSTEM) -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../lib/$(SYSTEM) -lIrrlicht -lGL -lXext -lX11 -lrt
all_win32 clean_win32: SYSTEM=Win32-gcc all_win32 clean_win32: SYSTEM=Win32-gcc
all_win32: LDFLAGS = -L../lib/$(SYSTEM) -lIrrlicht -lopengl32 -lm all_win32: LDFLAGS = -L../lib/$(SYSTEM) -lIrrlicht -lopengl32 -lm
......
...@@ -276,4 +276,4 @@ bool test_strtol(void) ...@@ -276,4 +276,4 @@ bool test_strtol(void)
bool fast_atof(void) bool fast_atof(void)
{ {
return test_fast_atof() && test_strtol(); return test_fast_atof() && test_strtol();
} }
\ No newline at end of file
...@@ -18,7 +18,6 @@ static bool saveScene(void) ...@@ -18,7 +18,6 @@ static bool saveScene(void)
if (!device) if (!device)
return false; return false;
IVideoDriver* driver = device->getVideoDriver();
ISceneManager * smgr = device->getSceneManager(); ISceneManager * smgr = device->getSceneManager();
ISkinnedMesh* mesh = (ISkinnedMesh*)smgr->getMesh("../media/ninja.b3d"); ISkinnedMesh* mesh = (ISkinnedMesh*)smgr->getMesh("../media/ninja.b3d");
...@@ -75,12 +74,12 @@ static bool saveScene(void) ...@@ -75,12 +74,12 @@ static bool saveScene(void)
static bool loadScene(void) static bool loadScene(void)
{ {
IrrlichtDevice *device = createDevice(video::EDT_BURNINGSVIDEO, IrrlichtDevice *device = createDevice(video::EDT_BURNINGSVIDEO,
core::dimension2du(160,120), 32); core::dimension2du(160,120), 32);
if (!device) if (!device)
return false; return false;
IVideoDriver* driver = device->getVideoDriver(); IVideoDriver* driver = device->getVideoDriver();
ISceneManager* smgr = device->getSceneManager(); ISceneManager* smgr = device->getSceneManager();
// load scene from example, with correct relative path // load scene from example, with correct relative path
device->getFileSystem()->changeWorkingDirectoryTo("results"); device->getFileSystem()->changeWorkingDirectoryTo("results");
...@@ -88,8 +87,8 @@ static bool loadScene(void) ...@@ -88,8 +87,8 @@ static bool loadScene(void)
smgr->addCameraSceneNode(0, core::vector3df(0,0,-50)); smgr->addCameraSceneNode(0, core::vector3df(0,0,-50));
device->getFileSystem()->changeWorkingDirectoryTo(".."); device->getFileSystem()->changeWorkingDirectoryTo("..");
bool result = false; bool result = false;
device->run(); device->run();
if (driver->beginScene(true, true, video::SColor(0, 80, 80, 80))) if (driver->beginScene(true, true, video::SColor(0, 80, 80, 80)))
{ {
smgr->drawAll(); smgr->drawAll();
...@@ -115,9 +114,9 @@ static bool loadScene(void) ...@@ -115,9 +114,9 @@ static bool loadScene(void)
device->closeDevice(); device->closeDevice();
device->run(); device->run();
device->drop(); device->drop();
return result; return result;
} }
bool ioScene(void) bool ioScene(void)
......
...@@ -32,7 +32,7 @@ static bool polygonOffset(video::E_DRIVER_TYPE type) ...@@ -32,7 +32,7 @@ static bool polygonOffset(video::E_DRIVER_TYPE type)
core::vector3df(0,0,20), core::vector3df(270,0,0)); core::vector3df(0,0,20), core::vector3df(270,0,0));
plane2->setMaterialFlag(video::EMF_BACK_FACE_CULLING, false); plane2->setMaterialFlag(video::EMF_BACK_FACE_CULLING, false);
scene::ICameraSceneNode* cam = smgr->addCameraSceneNode(); smgr->addCameraSceneNode();
// test back plane to back // test back plane to back
plane->getMaterial(0).PolygonOffsetDirection=video::EPO_BACK; plane->getMaterial(0).PolygonOffsetDirection=video::EPO_BACK;
...@@ -64,4 +64,4 @@ bool material() ...@@ -64,4 +64,4 @@ bool material()
bool result = polygonOffset(video::EDT_OPENGL); bool result = polygonOffset(video::EDT_OPENGL);
result &= polygonOffset(video::EDT_DIRECT3D9); result &= polygonOffset(video::EDT_DIRECT3D9);
return result; return result;
} }
\ No newline at end of file
...@@ -139,11 +139,10 @@ bool rttAndZBuffer(video::E_DRIVER_TYPE driverType) ...@@ -139,11 +139,10 @@ bool rttAndZBuffer(video::E_DRIVER_TYPE driverType)
rtMat.TextureLayer[0].TextureWrapU = rtMat.TextureLayer[0].TextureWrapU =
rtMat.TextureLayer[0].TextureWrapV = video::ETC_CLAMP_TO_EDGE; rtMat.TextureLayer[0].TextureWrapV = video::ETC_CLAMP_TO_EDGE;
ILightSceneNode* light = sm->addLightSceneNode(NULL, vector3df(0, 50, 0), sm->addLightSceneNode(NULL, vector3df(0, 50, 0),
SColorf(1, 1, 1), 100); SColorf(1, 1, 1), 100);
SLight& lightData = light->getLightData();
ICameraSceneNode* cam = sm->addCameraSceneNode(NULL, vector3df(0, 10, 0)); sm->addCameraSceneNode(NULL, vector3df(0, 10, 0));
const IGeometryCreator* geom = sm->getGeometryCreator(); const IGeometryCreator* geom = sm->getGeometryCreator();
IMeshManipulator* manip = sm->getMeshManipulator(); IMeshManipulator* manip = sm->getMeshManipulator();
...@@ -323,7 +322,6 @@ bool rttAndAntiAliasing(video::E_DRIVER_TYPE driverType) ...@@ -323,7 +322,6 @@ bool rttAndAntiAliasing(video::E_DRIVER_TYPE driverType)
dimension2du dim_txt = dimension2du(160/2, 120/2); dimension2du dim_txt = dimension2du(160/2, 120/2);
ITexture* rt0 = NULL;
ITexture* rt1 = device->getVideoDriver()->addRenderTargetTexture(dim_txt, "rt1", device->getColorFormat()); ITexture* rt1 = device->getVideoDriver()->addRenderTargetTexture(dim_txt, "rt1", device->getColorFormat());
ITexture* rt2 = device->getVideoDriver()->addRenderTargetTexture(dim_txt, "rt2", device->getColorFormat()); ITexture* rt2 = device->getVideoDriver()->addRenderTargetTexture(dim_txt, "rt2", device->getColorFormat());
ITexture* rt3 = device->getVideoDriver()->addRenderTargetTexture(dim_txt, "rt3", video::ECF_A8R8G8B8);//device->getColorFormat()); ITexture* rt3 = device->getVideoDriver()->addRenderTargetTexture(dim_txt, "rt3", video::ECF_A8R8G8B8);//device->getColorFormat());
...@@ -344,6 +342,7 @@ bool rttAndAntiAliasing(video::E_DRIVER_TYPE driverType) ...@@ -344,6 +342,7 @@ bool rttAndAntiAliasing(video::E_DRIVER_TYPE driverType)
device->getVideoDriver()->draw2DImage(rt3, core::position2di(0,60)); device->getVideoDriver()->draw2DImage(rt3, core::position2di(0,60));
device->getVideoDriver()->draw2DImage(rt4, core::position2di(80,60)); device->getVideoDriver()->draw2DImage(rt4, core::position2di(80,60));
#else #else
ITexture* rt0 = NULL;
Render(device, rt0, pos1, pos2, sphereMesh, pos3, pos4); Render(device, rt0, pos1, pos2, sphereMesh, pos3, pos4);
#endif #endif
st->draw(); st->draw();
......
...@@ -13,7 +13,6 @@ bool skinnedMesh(void) ...@@ -13,7 +13,6 @@ bool skinnedMesh(void)
if (!device) if (!device)
return false; return false;
video::IVideoDriver* driver = device->getVideoDriver();
scene::ISceneManager * smgr = device->getSceneManager(); scene::ISceneManager * smgr = device->getSceneManager();
logTestString("Testing setMesh()\n"); logTestString("Testing setMesh()\n");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment