forked from mirror/openmw-tes3mp
Whitespace changes only
This commit is contained in:
parent
590f9e83d8
commit
f3c9694bf2
9 changed files with 16 additions and 16 deletions
|
@ -169,10 +169,10 @@ void SDLGLDriver::setVideoMode(int width, int height, int bpp, bool fullscreen)
|
||||||
|
|
||||||
// Have OpenGL generate a texture object handle for us
|
// Have OpenGL generate a texture object handle for us
|
||||||
glGenTextures( 1, &texture );
|
glGenTextures( 1, &texture );
|
||||||
|
|
||||||
// Bind the texture object
|
// Bind the texture object
|
||||||
glBindTexture( GL_TEXTURE_2D, texture );
|
glBindTexture( GL_TEXTURE_2D, texture );
|
||||||
|
|
||||||
// Set the texture's stretching properties
|
// Set the texture's stretching properties
|
||||||
glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR );
|
glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR );
|
||||||
glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
|
glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
|
||||||
|
@ -213,24 +213,24 @@ void SDLGLDriver::updateNoSwap()
|
||||||
// Bottom-left vertex (corner)
|
// Bottom-left vertex (corner)
|
||||||
glTexCoord2i( 0, 1 );
|
glTexCoord2i( 0, 1 );
|
||||||
glVertex3f(0,diff,0);
|
glVertex3f(0,diff,0);
|
||||||
|
|
||||||
// Bottom-right vertex (corner)
|
// Bottom-right vertex (corner)
|
||||||
glTexCoord2i( 1, 1 );
|
glTexCoord2i( 1, 1 );
|
||||||
glVertex3f( realDisp->w, diff, 0.f );
|
glVertex3f( realDisp->w, diff, 0.f );
|
||||||
|
|
||||||
// Top-right vertex (corner)
|
// Top-right vertex (corner)
|
||||||
glTexCoord2i( 1, 0 );
|
glTexCoord2i( 1, 0 );
|
||||||
glVertex3f( realDisp->w, screen->h, 0.f );
|
glVertex3f( realDisp->w, screen->h, 0.f );
|
||||||
|
|
||||||
// Top-left vertex (corner)
|
// Top-left vertex (corner)
|
||||||
glTexCoord2i( 0, 0 );
|
glTexCoord2i( 0, 0 );
|
||||||
glVertex3f( 0, screen->h, 0.f );
|
glVertex3f( 0, screen->h, 0.f );
|
||||||
glEnd();
|
glEnd();
|
||||||
|
|
||||||
glMatrixMode(GL_PROJECTION);
|
glMatrixMode(GL_PROJECTION);
|
||||||
glPopMatrix();
|
glPopMatrix();
|
||||||
glMatrixMode(GL_MODELVIEW);
|
glMatrixMode(GL_MODELVIEW);
|
||||||
glPopMatrix();
|
glPopMatrix();
|
||||||
}
|
}
|
||||||
|
|
||||||
void SDLGLDriver::swap()
|
void SDLGLDriver::swap()
|
||||||
|
|
|
@ -34,7 +34,7 @@ FFMpegSource::FFMpegSource(const std::string &file)
|
||||||
|
|
||||||
if(av_open_input_file(&FmtCtx, file.c_str(), NULL, 0, NULL) != 0)
|
if(av_open_input_file(&FmtCtx, file.c_str(), NULL, 0, NULL) != 0)
|
||||||
fail("Error loading audio file " + file);
|
fail("Error loading audio file " + file);
|
||||||
|
|
||||||
if(av_find_stream_info(FmtCtx) < 0)
|
if(av_find_stream_info(FmtCtx) < 0)
|
||||||
{
|
{
|
||||||
msg = "Error in file stream " + file;
|
msg = "Error in file stream " + file;
|
||||||
|
|
|
@ -72,7 +72,7 @@ size_t SampleReader::read(void *_data, size_t length)
|
||||||
// Determine how much we read
|
// Determine how much we read
|
||||||
return data-(char*)_data;
|
return data-(char*)_data;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Determine the overshoot
|
// Determine the overshoot
|
||||||
pullSize = length - num;
|
pullSize = length - num;
|
||||||
assert(pullSize < frameSize && pullSize >= 0);
|
assert(pullSize < frameSize && pullSize >= 0);
|
||||||
|
|
|
@ -36,6 +36,6 @@ int main()
|
||||||
cout << "Result: " << data << endl;
|
cout << "Result: " << data << endl;
|
||||||
cout << "Eof: " << inp->eof() << endl;
|
cout << "Eof: " << inp->eof() << endl;
|
||||||
cout << "Pos: " << inp->tell() << endl;
|
cout << "Pos: " << inp->tell() << endl;
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -76,7 +76,7 @@ void test2()
|
||||||
|
|
||||||
struct Dummy2 : Stream
|
struct Dummy2 : Stream
|
||||||
{
|
{
|
||||||
Dummy2()
|
Dummy2()
|
||||||
{
|
{
|
||||||
isWritable = true;
|
isWritable = true;
|
||||||
isReadable = false;
|
isReadable = false;
|
||||||
|
|
|
@ -37,6 +37,6 @@ int main()
|
||||||
cout << "Pos: " << inp->tell() << endl;
|
cout << "Pos: " << inp->tell() << endl;
|
||||||
|
|
||||||
cout << "Entire stream from pointer: " << (char*)inp->getPtr() << endl;
|
cout << "Entire stream from pointer: " << (char*)inp->getPtr() << endl;
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -71,7 +71,7 @@ Ogre::StringVectorPtr MangleArchive::find(const Ogre::String& pattern,
|
||||||
return Ogre::StringVectorPtr(res);
|
return Ogre::StringVectorPtr(res);
|
||||||
}
|
}
|
||||||
|
|
||||||
Ogre::FileInfoListPtr MangleArchive::findFileInfo(const Ogre::String& pattern,
|
Ogre::FileInfoListPtr MangleArchive::findFileInfo(const Ogre::String& pattern,
|
||||||
bool recursive,
|
bool recursive,
|
||||||
bool dirs)
|
bool dirs)
|
||||||
{
|
{
|
||||||
|
|
|
@ -50,7 +50,7 @@ class MangleArchive : public Ogre::Archive
|
||||||
// Find functions will only work if vfs->hasFind is set.
|
// Find functions will only work if vfs->hasFind is set.
|
||||||
Ogre::StringVectorPtr find(const Ogre::String& pattern, bool recursive = true,
|
Ogre::StringVectorPtr find(const Ogre::String& pattern, bool recursive = true,
|
||||||
bool dirs = false);
|
bool dirs = false);
|
||||||
Ogre::FileInfoListPtr findFileInfo(const Ogre::String& pattern,
|
Ogre::FileInfoListPtr findFileInfo(const Ogre::String& pattern,
|
||||||
bool recursive = true,
|
bool recursive = true,
|
||||||
bool dirs = false);
|
bool dirs = false);
|
||||||
};
|
};
|
||||||
|
|
|
@ -13,7 +13,7 @@ struct FileInfo
|
||||||
{
|
{
|
||||||
/// Full name, including path
|
/// Full name, including path
|
||||||
std::string name;
|
std::string name;
|
||||||
|
|
||||||
/// Base name, not including path
|
/// Base name, not including path
|
||||||
std::string basename;
|
std::string basename;
|
||||||
|
|
||||||
|
@ -22,7 +22,7 @@ struct FileInfo
|
||||||
|
|
||||||
/// File size
|
/// File size
|
||||||
size_t size;
|
size_t size;
|
||||||
|
|
||||||
/// Last modification date
|
/// Last modification date
|
||||||
time_t time;
|
time_t time;
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue