Commit d0888a25 authored by hybrid's avatar hybrid

Fix line endings.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1409 dfc29bdd-3216-0410-991c-e03cc46cb475
parent a0709c15
...@@ -353,7 +353,7 @@ void CIrrDeviceSDL::closeDevice() ...@@ -353,7 +353,7 @@ void CIrrDeviceSDL::closeDevice()
//! \return Returns a pointer to a list with all video modes supported //! \return Pointer to a list with all video modes supported
video::IVideoModeList* CIrrDeviceSDL::getVideoModeList() video::IVideoModeList* CIrrDeviceSDL::getVideoModeList()
{ {
if (!VideoModeList.getVideoModeCount()) if (!VideoModeList.getVideoModeCount())
...@@ -361,7 +361,7 @@ video::IVideoModeList* CIrrDeviceSDL::getVideoModeList() ...@@ -361,7 +361,7 @@ video::IVideoModeList* CIrrDeviceSDL::getVideoModeList()
// enumerate video modes. // enumerate video modes.
const SDL_VideoInfo *vi = SDL_GetVideoInfo(); const SDL_VideoInfo *vi = SDL_GetVideoInfo();
SDL_Rect **modes = SDL_ListModes(vi->vfmt, SDL_Flags); SDL_Rect **modes = SDL_ListModes(vi->vfmt, SDL_Flags);
if (modes != (SDL_Rect **)0) if (modes != 0)
{ {
if (modes == (SDL_Rect **)-1) if (modes == (SDL_Rect **)-1)
os::Printer::log("All modes available.\n"); os::Printer::log("All modes available.\n");
...@@ -377,7 +377,6 @@ video::IVideoModeList* CIrrDeviceSDL::getVideoModeList() ...@@ -377,7 +377,6 @@ video::IVideoModeList* CIrrDeviceSDL::getVideoModeList()
} }
//! Sets if the window should be resizeable in windowed mode. //! Sets if the window should be resizeable in windowed mode.
void CIrrDeviceSDL::setResizeAble(bool resize) void CIrrDeviceSDL::setResizeAble(bool resize)
{ {
......
...@@ -313,7 +313,7 @@ namespace video ...@@ -313,7 +313,7 @@ namespace video
scene::E_BUFFER_TYPE Contains; scene::E_BUFFER_TYPE Contains;
const scene::IMeshBuffer *MeshBuffer; const scene::IMeshBuffer *MeshBuffer;
u32 ChangedID_Vertex; u32 ChangedID_Vertex;
u32 ChangedID_Index; u32 ChangedID_Index;
u32 LastUsed; u32 LastUsed;
scene::E_HARDWARE_MAPPING Mapped; scene::E_HARDWARE_MAPPING Mapped;
......
...@@ -713,29 +713,26 @@ bool COpenGLDriver::updateHardwareBuffer(SHWBufferLink *HWBuffer) ...@@ -713,29 +713,26 @@ bool COpenGLDriver::updateHardwareBuffer(SHWBufferLink *HWBuffer)
{ {
if (!HWBuffer) if (!HWBuffer)
return false; return false;
if (HWBuffer->ChangedID_Vertex != HWBuffer->MeshBuffer->getChangedID_Vertex() if (HWBuffer->ChangedID_Vertex != HWBuffer->MeshBuffer->getChangedID_Vertex()
|| !((SHWBufferLink_opengl*)HWBuffer)->vbo_verticesID) || !((SHWBufferLink_opengl*)HWBuffer)->vbo_verticesID)
{ {
HWBuffer->ChangedID_Vertex = HWBuffer->MeshBuffer->getChangedID_Vertex(); HWBuffer->ChangedID_Vertex = HWBuffer->MeshBuffer->getChangedID_Vertex();
if (!updateVertexHardwareBuffer((SHWBufferLink_opengl*)HWBuffer)) if (!updateVertexHardwareBuffer((SHWBufferLink_opengl*)HWBuffer))
return false; return false;
} }
if (HWBuffer->ChangedID_Index != HWBuffer->MeshBuffer->getChangedID_Index()
|| !((SHWBufferLink_opengl*)HWBuffer)->vbo_indicesID)
if (HWBuffer->ChangedID_Index != HWBuffer->MeshBuffer->getChangedID_Index() {
|| !((SHWBufferLink_opengl*)HWBuffer)->vbo_indicesID)
{ HWBuffer->ChangedID_Index = HWBuffer->MeshBuffer->getChangedID_Index();
HWBuffer->ChangedID_Index = HWBuffer->MeshBuffer->getChangedID_Index(); if (!updateIndexHardwareBuffer((SHWBufferLink_opengl*)HWBuffer))
return false;
if (!updateIndexHardwareBuffer((SHWBufferLink_opengl*)HWBuffer)) }
return false;
}
return true; return true;
} }
...@@ -754,7 +751,7 @@ COpenGLDriver::SHWBufferLink *COpenGLDriver::createHardwareBuffer(const scene::I ...@@ -754,7 +751,7 @@ COpenGLDriver::SHWBufferLink *COpenGLDriver::createHardwareBuffer(const scene::I
//add to map //add to map
HWBufferMap.insert(HWBuffer->MeshBuffer, HWBuffer); HWBufferMap.insert(HWBuffer->MeshBuffer, HWBuffer);
HWBuffer->ChangedID_Vertex=HWBuffer->MeshBuffer->getChangedID_Vertex(); HWBuffer->ChangedID_Vertex=HWBuffer->MeshBuffer->getChangedID_Vertex();
HWBuffer->ChangedID_Index=HWBuffer->MeshBuffer->getChangedID_Index(); HWBuffer->ChangedID_Index=HWBuffer->MeshBuffer->getChangedID_Index();
HWBuffer->Mapped=mb->getHardwareMappingHint(); HWBuffer->Mapped=mb->getHardwareMappingHint();
HWBuffer->LastUsed=0; HWBuffer->LastUsed=0;
......
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