Menu
▾
▴
shallows-commits — CVS commits for shallows
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(48) |
Sep
(181) |
Oct
(147) |
Nov
(12) |
Dec
(17) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(2) |
Feb
(4) |
Mar
(3) |
Apr
|
May
|
Jun
|
Jul
(9) |
Aug
(80) |
Sep
(7) |
Oct
|
Nov
|
Dec
(4) |
| 2007 |
Jan
(5) |
Feb
(4) |
Mar
(4) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Johan S. <jo...@us...> - 2006-08-23 09:58:37
|
Update of /cvsroot/shallows/shallows/boost/boost/preprocessor/iteration/detail/iter In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv14273/boost/boost/preprocessor/iteration/detail/iter Removed Files: forward1.hpp forward4.hpp reverse2.hpp reverse5.hpp forward3.hpp forward2.hpp reverse3.hpp reverse1.hpp reverse4.hpp forward5.hpp Log Message: Removed boost dependencies. --- reverse2.hpp DELETED --- --- forward4.hpp DELETED --- --- forward2.hpp DELETED --- --- forward3.hpp DELETED --- --- forward1.hpp DELETED --- --- reverse4.hpp DELETED --- --- forward5.hpp DELETED --- --- reverse5.hpp DELETED --- --- reverse1.hpp DELETED --- --- reverse3.hpp DELETED --- |
|
From: Johan S. <jo...@us...> - 2006-08-23 09:58:37
|
Update of /cvsroot/shallows/shallows/boost/boost/preprocessor/iteration/detail In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv14273/boost/boost/preprocessor/iteration/detail Removed Files: finish.hpp start.hpp rlocal.hpp local.hpp self.hpp Log Message: Removed boost dependencies. --- finish.hpp DELETED --- --- rlocal.hpp DELETED --- --- self.hpp DELETED --- --- local.hpp DELETED --- --- start.hpp DELETED --- |
Update of /cvsroot/shallows/shallows/boost/libs/regex/build In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv14273/boost/libs/regex/build Removed Files: gcc-shared.mak vc7-stlport.mak generic_gen.sh sunpro.mak vc6.mak vc_gen.sh generic.mak vc8.mak common.sh sun_gen.sh vc7.mak vc71-stlport.mak gcc_gen.sh bcb6.mak gcc.mak vc71.mak Jamfile vc6-stlport.mak bc_gen.sh Jamfile.v2 Log Message: Removed boost dependencies. --- vc7-stlport.mak DELETED --- --- sun_gen.sh DELETED --- --- gcc_gen.sh DELETED --- --- Jamfile DELETED --- --- generic_gen.sh DELETED --- --- gcc.mak DELETED --- --- bc_gen.sh DELETED --- --- vc71.mak DELETED --- --- generic.mak DELETED --- --- bcb6.mak DELETED --- --- vc6-stlport.mak DELETED --- --- Jamfile.v2 DELETED --- --- common.sh DELETED --- --- gcc-shared.mak DELETED --- --- vc_gen.sh DELETED --- --- vc8.mak DELETED --- --- vc7.mak DELETED --- --- vc6.mak DELETED --- --- sunpro.mak DELETED --- --- vc71-stlport.mak DELETED --- |
Update of /cvsroot/shallows/shallows/boost/boost In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv14273/boost/boost Removed Files: bind.hpp non_type.hpp config.hpp noncopyable.hpp implicit_cast.hpp type.hpp current_function.hpp checked_delete.hpp get_pointer.hpp ref.hpp version.hpp cregex.hpp throw_exception.hpp utility.hpp limits.hpp shared_ptr.hpp next_prior.hpp scoped_ptr.hpp scoped_array.hpp iterator.hpp regex_fwd.hpp function_equal.hpp regex.hpp assert.hpp mem_fn.hpp function.hpp cstdint.hpp static_assert.hpp Log Message: Removed boost dependencies. --- utility.hpp DELETED --- --- implicit_cast.hpp DELETED --- --- shared_ptr.hpp DELETED --- --- cstdint.hpp DELETED --- --- scoped_ptr.hpp DELETED --- --- type.hpp DELETED --- --- regex.hpp DELETED --- --- throw_exception.hpp DELETED --- --- cregex.hpp DELETED --- --- function.hpp DELETED --- --- static_assert.hpp DELETED --- --- non_type.hpp DELETED --- --- current_function.hpp DELETED --- --- mem_fn.hpp DELETED --- --- regex_fwd.hpp DELETED --- --- function_equal.hpp DELETED --- --- next_prior.hpp DELETED --- --- noncopyable.hpp DELETED --- --- limits.hpp DELETED --- --- checked_delete.hpp DELETED --- --- bind.hpp DELETED --- --- version.hpp DELETED --- --- assert.hpp DELETED --- --- scoped_array.hpp DELETED --- --- iterator.hpp DELETED --- --- config.hpp DELETED --- --- ref.hpp DELETED --- --- get_pointer.hpp DELETED --- |
|
From: Johan S. <jo...@us...> - 2006-07-25 13:50:32
|
Update of /cvsroot/shallows/shallows In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv26683 Added Files: CMakeLists.txt config.h.cmake Log Message: Can now compile with CMake on Linux --- NEW FILE: CMakeLists.txt --- project(shallows) # Add any additional system library paths here set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} /work/lib) find_package(OpenGL REQUIRED) # Platform specifics if(UNIX) add_definitions(-DUNIX -DGL_GLEXT_PROTOTYPES -DGL_GLX_GLXEXT_PROTOTYPES) set(DllExport 1) endif(UNIX) # Here we check for required headers include(CheckIncludeFileCXX) include(CheckIncludeFiles) check_include_file_cxx(boost/shared_ptr.hpp HAVE_BOOST_SHARED_PTR_HPP) if(NOT HAVE_BOOST_SHARED_PTR_HPP) message(FATAL_ERROR "shared_ptr not found. Install boost.") endif(NOT HAVE_BOOST_SHARED_PTR_HPP) check_include_file_cxx(Magick++.h HAVE_MAGICK_H) check_include_files(png.h HAVE_PNG_H) check_include_files(Cg/cg.h HAVE_CG_CG_H) check_include_files(Cg/cgGL.h HAVE_CG_CGGL_H) configure_file(config.h.cmake include/shallows/config.h) # Define our sources file(GLOB SHALLOWS_SRC "src/*cpp") include_directories(include) #add_library(shallows ${SHALLOWS_SRC}) add_library(shallows SHARED ${SHALLOWS_SRC}) --- NEW FILE: config.h.cmake --- #cmakedefine HAVE_MAGICK_H 1 #cmakedefine HAVE_PNG_H 1 #cmakedefine HAVE_CG_CG_H 1 #cmakedefine HAVE_CG_CGGL_H 1 #cmakedefine DllExport |
|
From: Johan S. <jo...@us...> - 2006-07-25 13:49:47
|
Update of /cvsroot/shallows/shallows/src In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv26296/src Modified Files: shallows.cpp Log Message: Do not use _snprintf. It is Windows only and DEPRECATED. Index: shallows.cpp =================================================================== RCS file: /cvsroot/shallows/shallows/src/shallows.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** shallows.cpp 11 Jul 2006 07:59:16 -0000 1.15 --- shallows.cpp 25 Jul 2006 13:49:42 -0000 1.16 *************** *** 32,35 **** --- 32,36 ---- #include "shallows/shallowsexcept.hpp" + #include <sstream> #include <iostream> #include <GL/glu.h> *************** *** 64,73 **** else { ! char buff[100]; ! _snprintf(buff, sizeof(buff)/sizeof(buff[0]), "(%u)", err); ! s += buff; } throw std::runtime_error( s ); ! } } --- 65,74 ---- else { ! std::ostringstream buf; ! buf << "(" << err << ")"; ! s += buf.str(); } throw std::runtime_error( s ); ! } } |
|
From: Trond H. <tr...@us...> - 2006-07-11 07:59:21
|
Update of /cvsroot/shallows/shallows/src In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv3742/src Modified Files: CgProgramImpl.cpp GLProgram.cpp OnScreenBuffer.cpp Program.cpp shallows.cpp textureCreation.cpp Log Message: Removed regex and a few bug fixes Index: textureCreation.cpp =================================================================== RCS file: /cvsroot/shallows/shallows/src/textureCreation.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** textureCreation.cpp 20 Mar 2006 16:14:07 -0000 1.13 --- textureCreation.cpp 11 Jul 2006 07:59:16 -0000 1.14 *************** *** 286,289 **** --- 286,330 ---- } + boost::shared_ptr<Texture2D> createUnsignedShortTexture2D(unsigned int width, + unsigned int height, + unsigned int components, + const unsigned short *pixels) + { + GLenum internalformat; + GLenum format; + if (components == 1) + { + internalformat=GL_LUMINANCE16; + format = GL_LUMINANCE; + } + else if (components == 3) + { + internalformat=GL_RGB16; + format=GL_RGB; + } + else if (components == 4) + { + internalformat=GL_RGBA16; + format=GL_RGBA; + } + else + throw std::invalid_argument + ( "createUnsignedShortTexture2D called with invalid number of components" ); + + boost::shared_ptr<Texture2D> tex; + tex.reset(new shallows::Texture2D (internalformat, + width, height, + format, + GL_UNSIGNED_SHORT, + pixels)); + tex->bind(); + glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP); + glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP); + glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); + glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); + + return tex; + } + boost::shared_ptr<TextureCubeMap> createUnsignedByteTextureCubeMap( unsigned int width, *************** *** 379,382 **** --- 420,477 ---- } + boost::shared_ptr<Texture3D> createUnsignedShortTexture3D(unsigned int width, + unsigned int height, + unsigned int depth, + unsigned int components, + const float *pixels) + { + if((width%2) != 0) throw std::invalid_argument + ("createFloatTexture3D called with width not multiple of two"); + + if((height%2) != 0) throw std::invalid_argument + ("createFloatTexture3D called with height not multiple of two"); + + if((depth%2) != 0) throw std::invalid_argument + ("createFloatTexture3D called with depth not multiple of two"); + + GLenum internalformat; + GLenum format; + if (components == 1) + { + internalformat=GL_LUMINANCE16; + format = GL_LUMINANCE; + } + else if (components == 3) + { + internalformat=GL_RGB16; + format=GL_RGB; + } + else if (components == 4) + { + internalformat=GL_RGBA16; + format=GL_RGBA; + } + else + { + throw std::invalid_argument + ("createFloatTexture3D called with invalid number of components" ); + } + + boost::shared_ptr<Texture3D> tex; + tex.reset(new shallows::Texture3D(internalformat, + width, + height, + depth, + format, + GL_UNSIGNED_SHORT, + pixels)); + tex->bind(); + glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_S, GL_CLAMP); + glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_T, GL_CLAMP); + glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_R, GL_CLAMP); + glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); + glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); + return tex; + } } // namespace shallows::utils Index: OnScreenBuffer.cpp =================================================================== RCS file: /cvsroot/shallows/shallows/src/OnScreenBuffer.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** OnScreenBuffer.cpp 25 Nov 2005 11:18:16 -0000 1.9 --- OnScreenBuffer.cpp 11 Jul 2006 07:59:16 -0000 1.10 *************** *** 35,38 **** --- 35,39 ---- #include "shallows/RenderTarget.hpp" #include "shallows/OnScreenRenderTarget.hpp" + #include <iostream> using namespace shallows::internal; Index: GLProgram.cpp =================================================================== RCS file: /cvsroot/shallows/shallows/src/GLProgram.cpp,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** GLProgram.cpp 3 Feb 2006 09:13:51 -0000 1.31 --- GLProgram.cpp 11 Jul 2006 07:59:16 -0000 1.32 *************** *** 60,64 **** void GLProgram::read( const std::string programText, const std::string defines ) { ! if ( vertexShader_.get() != 0 ) { glDetachShader( programHandle_, vertexShader_->getShaderID() ); vertexShader_.reset( NULL ); --- 60,64 ---- void GLProgram::read( const std::string programText, const std::string defines ) { ! if ( vertexShader_.get() != 0 ) { glDetachShader( programHandle_, vertexShader_->getShaderID() ); vertexShader_.reset( NULL ); *************** *** 74,79 **** log_.clear(); ! buildUniformsMap( defines + programText ); ! string vertexShaderSource = Program::getVertexShaderSource( programText, defines ); string fragmentShaderSource = Program::getFragmentShaderSource( programText, defines ); --- 74,78 ---- log_.clear(); ! //buildUniformsMap( defines + programText ); string vertexShaderSource = Program::getVertexShaderSource( programText, defines ); string fragmentShaderSource = Program::getFragmentShaderSource( programText, defines ); *************** *** 468,472 **** } ! NameTypeMap::const_iterator it = uniformsNameToType_.find( name ); assert( it != uniformsNameToType_.end() && "Internal Shallows error. The uniform map does not correspond with OpenGL." ); --- 467,471 ---- } ! /* NameTypeMap::const_iterator it = uniformsNameToType_.find( name ); assert( it != uniformsNameToType_.end() && "Internal Shallows error. The uniform map does not correspond with OpenGL." ); *************** *** 482,485 **** --- 481,485 ---- throw std::invalid_argument( s ); } + */ return location; } *************** *** 501,504 **** --- 501,505 ---- nm = nm.substr( 0, i ); + /* NameTypeMap::const_iterator it = uniformsNameToType_.find( nm ); if ( it == uniformsNameToType_.end() ) { *************** *** 517,521 **** throw std::invalid_argument( s ); } ! return location; } --- 518,522 ---- throw std::invalid_argument( s ); } ! */ return location; } *************** *** 543,547 **** string src = boost::regex_replace( shaderSource, boost::regex( "(//[^\\n]*|/\\*.*?\\*/)" ), "" ); - string::const_iterator start, end; start = src.begin(); --- 544,547 ---- Index: Program.cpp =================================================================== RCS file: /cvsroot/shallows/shallows/src/Program.cpp,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** Program.cpp 3 Feb 2006 09:15:07 -0000 1.27 --- Program.cpp 11 Jul 2006 07:59:16 -0000 1.28 *************** *** 97,124 **** std::string Program::getVertexShaderSource( const std::string programText, const std::string defines ) { - boost::match_results<std::string::const_iterator> result; /* In a programText we allow both the [Vertex shader] and the [Fragment shader] * to come first. */ ! if ( boost::regex_search( programText, result, boost::regex( "\\[Vertex shader\\](.*)\\[Fragment shader\\]" ) ) ) ! return defines + static_cast<std::string>(result[1]); ! else if ( boost::regex_search( programText, result, boost::regex( "\\[Vertex shader\\](.*)" ) ) ) ! return defines + static_cast<std::string>(result[1]); ! else ! return defines; } std::string Program::getFragmentShaderSource( const std::string programText, const std::string defines ) { - boost::match_results<std::string::const_iterator> result; /* In a programText we allow both the [Vertex shader] and the [Fragment shader] * to come first. */ ! if ( boost::regex_search( programText, result, boost::regex( "\\[Fragment shader\\](.*)\\[Vertex shader\\]" ) ) ) ! return defines + static_cast<std::string>(result[1]); ! else if ( boost::regex_search( programText, result, boost::regex( "\\[Fragment shader\\](.*)" ) ) ) ! return defines + static_cast<std::string>(result[1]); ! else ! return defines; } --- 97,122 ---- std::string Program::getVertexShaderSource( const std::string programText, const std::string defines ) { /* In a programText we allow both the [Vertex shader] and the [Fragment shader] * to come first. */ ! int posVS = static_cast<int>(programText.find("[Vertex shader]")); ! int posFS = static_cast<int>(programText.find("[Fragment shader]")); ! ! std::string result = programText.substr(posVS+15, (posFS<posVS ? programText.length() : posFS) - posVS-15); ! ! return defines + result; } std::string Program::getFragmentShaderSource( const std::string programText, const std::string defines ) { /* In a programText we allow both the [Vertex shader] and the [Fragment shader] * to come first. */ ! int posVS = static_cast<int>(programText.find("[Vertex shader]")); ! int posFS = static_cast<int>(programText.find("[Fragment shader]")); ! ! std::string result = programText.substr(posFS+17, (posVS<posFS ? programText.length() : posVS) - posFS-17); ! ! return defines + result; } *************** *** 170,174 **** OffScreenBuffer *off_buf = dynamic_cast<OffScreenBuffer *>(frameBuffer_.get()); - for (int i=0; i<(int)(renderTarget_.size()); i++) { --- 168,171 ---- Index: CgProgramImpl.cpp =================================================================== RCS file: /cvsroot/shallows/shallows/src/CgProgramImpl.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** CgProgramImpl.cpp 12 Sep 2005 14:33:09 -0000 1.6 --- CgProgramImpl.cpp 11 Jul 2006 07:59:16 -0000 1.7 *************** *** 115,119 **** assert( it != parent_.uniforms.end() && "Internal Shallows error. The uniform map does not correspond with the Cg runtime." ); ! std::string type = it->second; if ( !type.find( "sampler" ) != std::string::npos ) { --- 115,119 ---- assert( it != parent_.uniforms.end() && "Internal Shallows error. The uniform map does not correspond with the Cg runtime." ); ! /* TRH: THIS DOES NOT WORK, FIX IT!! std::string type = it->second; if ( !type.find( "sampler" ) != std::string::npos ) { *************** *** 123,127 **** throw std::invalid_argument( s ); } ! CHECK_GL_DEBUG; CHECK_CG_DEBUG; --- 123,127 ---- throw std::invalid_argument( s ); } ! */ CHECK_GL_DEBUG; CHECK_CG_DEBUG; Index: shallows.cpp =================================================================== RCS file: /cvsroot/shallows/shallows/src/shallows.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** shallows.cpp 14 Sep 2005 16:08:31 -0000 1.14 --- shallows.cpp 11 Jul 2006 07:59:16 -0000 1.15 *************** *** 40,44 **** setFixedFunction() { using namespace internal; ! glUseProgramObjectARB(0); } --- 40,44 ---- setFixedFunction() { using namespace internal; ! glUseProgram(0); } *************** *** 62,65 **** --- 62,71 ---- if (err_c) s += err_c; + else + { + char buff[100]; + _snprintf(buff, sizeof(buff)/sizeof(buff[0]), "(%u)", err); + s += buff; + } throw std::runtime_error( s ); } |
|
From: Trond H. <tr...@us...> - 2006-07-11 07:59:20
|
Update of /cvsroot/shallows/shallows/examples/simpleWave In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv3742/examples/simpleWave Modified Files: simpleWave.cpp Log Message: Removed regex and a few bug fixes Index: simpleWave.cpp =================================================================== RCS file: /cvsroot/shallows/shallows/examples/simpleWave/simpleWave.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** simpleWave.cpp 28 Nov 2005 13:57:01 -0000 1.17 --- simpleWave.cpp 11 Jul 2006 07:59:16 -0000 1.18 *************** *** 253,259 **** * som uniforms. */ waveshader.reset( new GLProgram ); - waveshader->readFile( "waveequation.glshader" ); waveshader->setFrameBuffer( fb ); waveshader->setParam2f( "dXY", 1.0/BUF_DIM, 1.0/BUF_DIM ); rendershader.reset( new GLProgram); --- 253,259 ---- * som uniforms. */ waveshader.reset( new GLProgram ); waveshader->setFrameBuffer( fb ); waveshader->setParam2f( "dXY", 1.0/BUF_DIM, 1.0/BUF_DIM ); + waveshader->readFile( "waveequation.glshader" ); rendershader.reset( new GLProgram); *************** *** 403,407 **** filename = argv[1]; else ! filename = "../../test/images/lena-color-512x512.tiff"; initOpenGL( filename ); } catch ( const shallows::compile_error &e) --- 403,407 ---- filename = argv[1]; else ! filename = "../../test/images/lena-color-512x512-16bit.png"; initOpenGL( filename ); } catch ( const shallows::compile_error &e) |
|
From: Trond H. <tr...@us...> - 2006-07-11 07:59:20
|
Update of /cvsroot/shallows/shallows/include/shallows/utils In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv3742/include/shallows/utils Modified Files: textureCreation.hpp Log Message: Removed regex and a few bug fixes Index: textureCreation.hpp =================================================================== RCS file: /cvsroot/shallows/shallows/include/shallows/utils/textureCreation.hpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** textureCreation.hpp 20 Mar 2006 16:14:06 -0000 1.8 --- textureCreation.hpp 11 Jul 2006 07:59:16 -0000 1.9 *************** *** 77,80 **** --- 77,88 ---- const unsigned char *pixels); + /** Create an unsigned char Texture2D of the given size from a pointer. */ + DllExport + boost::shared_ptr<Texture2D> + createUnsignedShortTexture2D(unsigned int width, + unsigned int height, + unsigned int components, + const unsigned short *pixels); + /** Create an unsigned char Texture2D rectangle of the given size from a pointer. */ DllExport *************** *** 108,111 **** --- 116,128 ---- const float *pixels); + /** Create a float Texture3D of a given size from a pointer. */ + DllExport + boost::shared_ptr<Texture3D> + createUnsignedShortTexture3D(unsigned int width, + unsigned int height, + unsigned int depth, + unsigned int components, + const unsigned short *pixels); + } // namespace shallows::utils } // namespace shallows |
|
From: Trond H. <tr...@us...> - 2006-07-11 07:59:19
|
Update of /cvsroot/shallows/shallows/test In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv3742/test Modified Files: FrameBufferTest.cpp FrameBufferTest.hpp main.cpp Log Message: Removed regex and a few bug fixes Index: FrameBufferTest.hpp =================================================================== RCS file: /cvsroot/shallows/shallows/test/FrameBufferTest.hpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** FrameBufferTest.hpp 15 Sep 2005 09:16:17 -0000 1.8 --- FrameBufferTest.hpp 11 Jul 2006 07:59:16 -0000 1.9 *************** *** 31,34 **** --- 31,35 ---- #include <cppunit/extensions/HelperMacros.h> + #include "shallows/shallows.hpp" namespace test Index: main.cpp =================================================================== RCS file: /cvsroot/shallows/shallows/test/main.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** main.cpp 26 Sep 2005 11:36:29 -0000 1.2 --- main.cpp 11 Jul 2006 07:59:16 -0000 1.3 *************** *** 35,42 **** --- 35,45 ---- //#include <cppunit/ui/qt/TestRunner.h> //#include <qapplication.h> + #include "shallows/shallows.hpp" int main( int argc, char* argv[] ) { + shallows::init_shallows(); + // Create the event manager and test controller CPPUNIT_NS::TestResult controller; Index: FrameBufferTest.cpp =================================================================== RCS file: /cvsroot/shallows/shallows/test/FrameBufferTest.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** FrameBufferTest.cpp 25 Nov 2005 11:18:16 -0000 1.20 --- FrameBufferTest.cpp 11 Jul 2006 07:59:16 -0000 1.21 *************** *** 46,51 **** --- 46,54 ---- #include <stdexcept> + #include "shallows/shallows.hpp" + using namespace std; using namespace shallows::internal; + using namespace shallows; using boost::shared_ptr; namespace test *************** *** 66,69 **** --- 69,73 ---- FrameBufferTest::setUp() { initGlut(); + shallows::init_shallows(); } |
|
From: Trond H. <tr...@us...> - 2006-07-11 07:59:19
|
Update of /cvsroot/shallows/shallows/examples/simpleHeat In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv3742/examples/simpleHeat Modified Files: simpleHeat.cpp Log Message: Removed regex and a few bug fixes Index: simpleHeat.cpp =================================================================== RCS file: /cvsroot/shallows/shallows/examples/simpleHeat/simpleHeat.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** simpleHeat.cpp 28 Nov 2005 13:57:01 -0000 1.11 --- simpleHeat.cpp 11 Jul 2006 07:59:16 -0000 1.12 *************** *** 104,109 **** float pixels[]={0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, ! 1.0, 0.0, 0.0, 0.0, ! 1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, --- 104,109 ---- float pixels[]={0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, ! 1.0, 0.0, 0.0, 0.0, ! 1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, *************** *** 124,127 **** --- 124,128 ---- boost::shared_ptr<Texture2D> init_tex= shallows::utils::createFloatTexture2D(4, 4, 4, pixels); + shared_ptr<OffScreenBuffer> fb(new OffScreenBuffer(BUFF_DIM, BUFF_DIM)); |
|
From: Trond H. <tr...@us...> - 2006-07-11 07:59:19
|
Update of /cvsroot/shallows/shallows/include/shallows/internal In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv3742/include/shallows/internal Modified Files: imageCreationInternal.hpp Log Message: Removed regex and a few bug fixes Index: imageCreationInternal.hpp =================================================================== RCS file: /cvsroot/shallows/shallows/include/shallows/internal/imageCreationInternal.hpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** imageCreationInternal.hpp 27 Sep 2005 08:56:38 -0000 1.6 --- imageCreationInternal.hpp 11 Jul 2006 07:59:16 -0000 1.7 *************** *** 37,41 **** #ifdef HAVE_PNG ! #include <png.h> #include <cstdlib> #include <vector> --- 37,41 ---- #ifdef HAVE_PNG ! #include "png.h" #include <cstdlib> #include <vector> *************** *** 227,231 **** } ! #endif // HAVE_CG } // namespace internal --- 227,231 ---- } ! #endif // HAVE_PNG } // namespace internal |
|
From: Trond H. <tr...@us...> - 2006-07-11 07:57:57
|
Update of /cvsroot/shallows/shallows/src In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv3021/src Modified Files: Texture1D.cpp Log Message: Fixed glTexEnv bug Index: Texture1D.cpp =================================================================== RCS file: /cvsroot/shallows/shallows/src/Texture1D.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Texture1D.cpp 14 Oct 2005 13:36:25 -0000 1.2 --- Texture1D.cpp 11 Jul 2006 07:57:49 -0000 1.3 *************** *** 60,63 **** --- 60,66 ---- throw; } + glTexParameteri( GL_TEXTURE_1D, GL_TEXTURE_WRAP_S, GL_CLAMP); + glTexParameteri( GL_TEXTURE_1D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); + glTexParameteri( GL_TEXTURE_1D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); } |
|
From: dyken <dy...@us...> - 2006-03-20 16:14:19
|
Update of /cvsroot/shallows/shallows/include/shallows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2700/include/shallows Modified Files: shallows.hpp Added Files: TextureCubeMap.hpp Log Message: Added support for cube maps (TextureCubeMap). --- NEW FILE: TextureCubeMap.hpp --- /********************************************************************** * * File: TextureCubeMap.hpp * * Created: 23. June 2005 * * Version: $Id: TextureCubeMap.hpp,v 1.1 2006/03/20 16:14:07 dyken Exp $ * * Authors: Trond R. Hagen <tr...@si...>, * Jon Mikkelsen Hjelmervik <ja...@si...>, * Johan S. Seland <jo...@if...> * * This file is part of the Shallows library. * Copyright (C) 2005 by SINTEF. All rights reserved. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * ("GPL") version 2 as published by the Free Software Foundation. * See the file LICENSE.GPL at the root directory of this source * distribution for additional information about the GNU GPL. * * For using Shallows with software that can not be combined with the * GNU GPL, please contact SINTEF for aquiring a commercial license * and support. * * SINTEF, Pb 124 Blindern, N-0314 Oslo, Norway * http://www.sintef.no *********************************************************************/ #ifndef _SHALLOWS_TEXTURE_CUBE_MAP_HPP_ #define _SHALLOWS_TEXTURE_CUBE_MAP_HPP_ #include "shallows/config.h" #include "shallows/Texture.hpp" namespace shallows { /** \brief Texture2D contains a two dimensional texture. * * The texture can either be created by Texture2D * or externally. */ class DllExport TextureCubeMap : public shallows::Texture { public: /** Creates a texture. * \param internalFormat The GLenum to use as internal format. * \param width The width of the texture. * \param height The height of the texture. * \param format The format of the pixel data provided in the * pixels parameter (typically GL_RGBA). * \param type The data type of the pixel data provided in the * pixels parameter (typically GL_FLOAT). * \param pixels Pointer to the pixel data (Null pointer specifies * texture with unknown data. * \param rectanguar Specifies whether the texture should be of type * Texture2D (texture coordiates in the range [0..1]x[0..1]) * of of type texture rectangle (texture coordiates in the range * [0..width]x[0..height]). */ TextureCubeMap( int internalFormat, unsigned int width, unsigned int height, int format, int type, const void *facePosX, const void *faceNegX, const void *facePosY, const void *faceNegY, const void *facePosZ, const void *faceNegZ ); virtual ~TextureCubeMap(); /** Returns the width of the texture */ unsigned int getWidth() const; /** Returns the height of the texture */ unsigned int getHeight() const; virtual void bind() const; int getInternalFormat() const; void validateSamplerType(const std::string &s) const; private: unsigned int height_; unsigned int width_; int internalFormat_; }; // class TextureCubeMap } // namespace Shallows #endif // _SHALLOWS_TEXTURE_CUBE_MAP_HPP_ Index: shallows.hpp =================================================================== RCS file: /cvsroot/shallows/shallows/include/shallows/shallows.hpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** shallows.hpp 20 Oct 2005 15:04:32 -0000 1.18 --- shallows.hpp 20 Mar 2006 16:14:07 -0000 1.19 *************** *** 81,84 **** --- 81,85 ---- #include "shallows/Texture2D.hpp" #include "shallows/Texture3D.hpp" + #include "shallows/TextureCubeMap.hpp" /** \example simpleWave.cpp */ |
|
From: dyken <dy...@us...> - 2006-03-20 16:14:19
|
Update of /cvsroot/shallows/shallows/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2700/src Modified Files: textureCreation.cpp Added Files: TextureCubeMap.cpp Log Message: Added support for cube maps (TextureCubeMap). --- NEW FILE: TextureCubeMap.cpp --- /********************************************************************** * * File: TextureCubeMap.cpp * * Created: 23. June 2005 * * Version: $Id: TextureCubeMap.cpp,v 1.1 2006/03/20 16:14:07 dyken Exp $ * * Authors: Trond R. Hagen <tr...@si...>, * Jon Mikkelsen Hjelmervik <ja...@si...>, * Johan S. Seland <jo...@if...> * * This file is part of the Shallows library. * Copyright (C) 2005 by SINTEF. All rights reserved. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * ("GPL") version 2 as published by the Free Software Foundation. * See the file LICENSE.GPL at the root directory of this source * distribution for additional information about the GNU GPL. * * For using Shallows with software that can not be combined with the * GNU GPL, please contact SINTEF for aquiring a commercial license * and support. * * SINTEF, Pb 124 Blindern, N-0314 Oslo, Norway * http://www.sintef.no *********************************************************************/ #include "shallows/TextureCubeMap.hpp" #include "shallows/shallows.hpp" #include "shallows/internal/GLIncludes.hpp" #include "shallows/shallowsexcept.hpp" #include <iostream> namespace shallows { TextureCubeMap::TextureCubeMap(int internalFormat, unsigned int width, unsigned int height, int format, int type, const void *facePosX, const void *faceNegX, const void *facePosY, const void *faceNegY, const void *facePosZ, const void *faceNegZ ) : Texture() { internalFormat_ = internalFormat; width_ = width; height_ = height; glBindTexture( GL_TEXTURE_CUBE_MAP, textureID_ ); glTexImage2D( GL_TEXTURE_CUBE_MAP_POSITIVE_X, 0, internalFormat, width, height, 0, format, (GLenum)type, facePosX ); glTexImage2D( GL_TEXTURE_CUBE_MAP_NEGATIVE_X, 0, internalFormat, width, height, 0, format, (GLenum)type, faceNegX ); glTexImage2D( GL_TEXTURE_CUBE_MAP_POSITIVE_Y, 0, internalFormat, width, height, 0, format, (GLenum)type, facePosY ); glTexImage2D( GL_TEXTURE_CUBE_MAP_NEGATIVE_Y, 0, internalFormat, width, height, 0, format, (GLenum)type, faceNegY ); glTexImage2D( GL_TEXTURE_CUBE_MAP_POSITIVE_Z, 0, internalFormat, width, height, 0, format, (GLenum)type, facePosZ ); glTexImage2D( GL_TEXTURE_CUBE_MAP_NEGATIVE_Z, 0, internalFormat, width, height, 0, format, (GLenum)type, faceNegZ ); try { CHECK_GL; } catch ( ... ) { if (textureID_!=0) glDeleteTextures(1, &textureID_); textureID_=0; throw; } glTexParameteri( GL_TEXTURE_CUBE_MAP, GL_TEXTURE_WRAP_S, GL_REPEAT); glTexParameteri( GL_TEXTURE_CUBE_MAP, GL_TEXTURE_WRAP_T, GL_REPEAT); glTexParameteri( GL_TEXTURE_CUBE_MAP, GL_TEXTURE_WRAP_R, GL_REPEAT); glTexParameteri( GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MIN_FILTER, GL_NEAREST); glTexParameteri( GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MAG_FILTER, GL_NEAREST); } TextureCubeMap::~TextureCubeMap() { } unsigned int TextureCubeMap::getHeight() const { return height_; } unsigned int TextureCubeMap::getWidth() const { return width_; } int TextureCubeMap::getInternalFormat() const { return internalFormat_; } void TextureCubeMap::bind() const { glBindTexture( GL_TEXTURE_CUBE_MAP, textureID_ ); } void TextureCubeMap::validateSamplerType(const std::string &s) const { if( s!="samplerCube" ) { std::string str = "TextureCubeMap attempted to bound to sampler type " + s; throw std::invalid_argument( str ); } } } // end namespace Shallows Index: textureCreation.cpp =================================================================== RCS file: /cvsroot/shallows/shallows/src/textureCreation.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** textureCreation.cpp 26 Oct 2005 12:35:30 -0000 1.12 --- textureCreation.cpp 20 Mar 2006 16:14:07 -0000 1.13 *************** *** 33,36 **** --- 33,37 ---- #include "shallows/Texture2D.hpp" #include "shallows/Texture1D.hpp" + #include "shallows/TextureCubeMap.hpp" #include "shallows/internal/GLIncludes.hpp" #include "shallows/shallowsexcept.hpp" *************** *** 285,288 **** --- 286,337 ---- } + boost::shared_ptr<TextureCubeMap> + createUnsignedByteTextureCubeMap( unsigned int width, + unsigned int height, + unsigned int components, + const unsigned char *pixels_pos_x, + const unsigned char *pixels_neg_x, + const unsigned char *pixels_pos_y, + const unsigned char *pixels_neg_y, + const unsigned char *pixels_pos_z, + const unsigned char *pixels_neg_z ) + { + GLenum internalformat; + GLenum format; + switch(components) { + case 3: + internalformat = GL_RGB8; + format = GL_RGB; + break; + case 4: + internalformat = GL_RGBA8; + format = GL_RGBA; + break; + default: + throw std::invalid_argument( "createUnsignedByteTextureCubeMap: unsupported number of components." ); + } + boost::shared_ptr<TextureCubeMap> tex; + tex.reset(new shallows::TextureCubeMap( internalformat, + width, height, + format, + GL_UNSIGNED_BYTE, + pixels_pos_x, + pixels_neg_x, + pixels_pos_y, + pixels_neg_y, + pixels_pos_z, + pixels_neg_z ) ); + + tex->bind(); + + glTexParameteri( GL_TEXTURE_CUBE_MAP, GL_TEXTURE_WRAP_S, GL_CLAMP); + glTexParameteri( GL_TEXTURE_CUBE_MAP, GL_TEXTURE_WRAP_T, GL_CLAMP); + glTexParameteri( GL_TEXTURE_CUBE_MAP, GL_TEXTURE_WRAP_R, GL_CLAMP); + glTexParameteri( GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MIN_FILTER, GL_NEAREST); + glTexParameteri( GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MAG_FILTER, GL_NEAREST); + + return tex; + } + boost::shared_ptr<Texture3D> createFloatTexture3D(unsigned int width, unsigned int height, |
|
From: dyken <dy...@us...> - 2006-03-20 16:14:19
|
Update of /cvsroot/shallows/shallows/include/shallows/utils In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2700/include/shallows/utils Modified Files: textureCreation.hpp Log Message: Added support for cube maps (TextureCubeMap). Index: textureCreation.hpp =================================================================== RCS file: /cvsroot/shallows/shallows/include/shallows/utils/textureCreation.hpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** textureCreation.hpp 26 Oct 2005 12:35:29 -0000 1.7 --- textureCreation.hpp 20 Mar 2006 16:14:06 -0000 1.8 *************** *** 42,45 **** --- 42,46 ---- class Texture1D; class Texture3D; + class TextureCubeMap; namespace utils{ *************** *** 52,55 **** --- 53,57 ---- const float *pixels); + /** Create a float Texture1D of the gives size from a pointer. */ DllExport *************** *** 83,86 **** --- 85,102 ---- const unsigned char *pixels); + /** Create an unsigned char TextureCubeMap of given size from raw data. */ + DllExport + boost::shared_ptr<TextureCubeMap> + createUnsignedByteTextureCubeMap( unsigned int width, + unsigned int height, + unsigned int components, + const unsigned char *pixels_pos_x, + const unsigned char *pixels_neg_x, + const unsigned char *pixels_pos_y, + const unsigned char *pixels_neg_y, + const unsigned char *pixels_pos_z, + const unsigned char *pixels_neg_z ); + + /** Create a float Texture3D of a given size from a pointer. */ DllExport |
|
From: Johan S. <jo...@us...> - 2006-02-03 09:15:16
|
Update of /cvsroot/shallows/shallows/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19018 Modified Files: Program.cpp Log Message: Better array handling in the uniformsmap. Index: Program.cpp =================================================================== RCS file: /cvsroot/shallows/shallows/src/Program.cpp,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** Program.cpp 8 Dec 2005 09:41:47 -0000 1.26 --- Program.cpp 3 Feb 2006 09:15:07 -0000 1.27 *************** *** 38,41 **** --- 38,42 ---- #include <string> #include <iostream> + #include <sstream> using namespace shallows::internal; *************** *** 294,296 **** --- 295,311 ---- } + std::string + Program::printUniformsMap() const + { + std::ostringstream out; + + NameTypeMap::const_iterator i = uniformsNameToType_.begin(); + while ( i != uniformsNameToType_.end() ) { + out << i->first << " --> " << i->second << std::endl; + i++; + } + + return out.str(); + + } } // namespace shallows |
|
From: Johan S. <jo...@us...> - 2006-02-03 09:15:08
|
Update of /cvsroot/shallows/shallows/include/shallows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18823 Modified Files: Program.hpp Log Message: Better array handling in the uniformsmap. Index: Program.hpp =================================================================== RCS file: /cvsroot/shallows/shallows/include/shallows/Program.hpp,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** Program.hpp 8 Dec 2005 09:41:47 -0000 1.22 --- Program.hpp 3 Feb 2006 09:15:00 -0000 1.23 *************** *** 401,404 **** --- 401,405 ---- NameTypeMap uniformsNameToType_; + std::string printUniformsMap() const; /** States whether texturecoords should user specified, or follow * viewport, when renderQuad is used */ |
|
From: Johan S. <jo...@us...> - 2006-02-03 09:15:03
|
Update of /cvsroot/shallows/shallows/include/shallows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18790 Modified Files: GLProgram.hpp Log Message: Better array handling in the uniformsmap. Index: GLProgram.hpp =================================================================== RCS file: /cvsroot/shallows/shallows/include/shallows/GLProgram.hpp,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** GLProgram.hpp 23 Sep 2005 13:35:08 -0000 1.21 --- GLProgram.hpp 3 Feb 2006 09:14:52 -0000 1.22 *************** *** 35,38 **** --- 35,39 ---- #include "shallows/internal/Shader.hpp" #include "shallows/internal/GLShader.hpp" + #include "shallows/shallowsexcept.hpp" #include <memory> *************** *** 158,162 **** * \return The location of the uniform */ ! int validate_uniform( const char* name ) const throw (std::invalid_argument ); /** Validate that a vertex attribute name is valid for the current shader. --- 159,163 ---- * \return The location of the uniform */ ! int validate_uniform( const char* name ) const throw (std::invalid_argument, shallows::shallows_runtime_error ); /** Validate that a vertex attribute name is valid for the current shader. |
|
From: Johan S. <jo...@us...> - 2006-02-03 09:13:59
|
Update of /cvsroot/shallows/shallows/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18361 Modified Files: GLProgram.cpp Log Message: Fixed bug in the uniformsmap when handling arrays. Index: GLProgram.cpp =================================================================== RCS file: /cvsroot/shallows/shallows/src/GLProgram.cpp,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** GLProgram.cpp 31 Jan 2006 14:17:32 -0000 1.30 --- GLProgram.cpp 3 Feb 2006 09:13:51 -0000 1.31 *************** *** 38,41 **** --- 38,43 ---- #include "shallows/OnScreenBuffer.hpp" + #include <iostream> + #include <sstream> using std::string; using namespace shallows::internal; *************** *** 484,500 **** GLint ! GLProgram::validate_uniform( const char* name ) const throw (std::invalid_argument) { const GLint location = glGetUniformLocation(programHandle_, name); if ( location == -1 ) { std::string s = "Uniform variable "; s += name; ! s += " was not found or illegal.\n(Hint: starting with gl_ is not allowed.)"; throw std::invalid_argument( s ); } ! NameTypeMap::const_iterator it = uniformsNameToType_.find( name ); ! assert( it != uniformsNameToType_.end() && ! "Internal Shallows error. The uniform map does not correspond with OpenGL." ); std::string type = it->second; if ( (type.find( "sampler" ) != string::npos) ) { --- 486,513 ---- GLint ! GLProgram::validate_uniform( const char* name ) const throw (std::invalid_argument, shallows_runtime_error ) { const GLint location = glGetUniformLocation(programHandle_, name); if ( location == -1 ) { std::string s = "Uniform variable "; s += name; ! s += " was not found or illegal.\n(Hint: The compiler might have optimized it away.)\n"; throw std::invalid_argument( s ); } ! // Name could index into an array. We remove everything after ! // the first trailing '[' ! string nm = name; ! string::size_type i = nm.find_first_of( '[' ); ! nm = nm.substr( 0, i ); + NameTypeMap::const_iterator it = uniformsNameToType_.find( nm ); + if ( it == uniformsNameToType_.end() ) { + std::ostringstream out; + out << "Internal Shallows error. The uniform map does not correspond with OpenGL.\n"; + out << printUniformsMap(); + out << std::endl; + throw shallows_runtime_error( out.str() ); + } + std::string type = it->second; if ( (type.find( "sampler" ) != string::npos) ) { *************** *** 547,552 **** start = what[0].second; // Add the uniform to the map ! uniformsNameToType_[what[2]] = what[1]; // update flags: flags |= boost::match_prev_avail; --- 560,570 ---- start = what[0].second; + // The type could be an array (of arrays of arrays...), so + // we strip everything from the first `[` and backwards. + string name = what[2]; + name = name.substr( 0, name.find_first_of( '[' ) ); + //std::cout << what[2] << " ,type: " << type << std::endl; // Add the uniform to the map ! uniformsNameToType_[name] = what[1]; // update flags: flags |= boost::match_prev_avail; |
|
From: Johan S. <jo...@us...> - 2006-01-31 14:17:46
|
Update of /cvsroot/shallows/shallows/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10042/src Modified Files: GLProgram.cpp Log Message: Make the log buffer larger. Index: GLProgram.cpp =================================================================== RCS file: /cvsroot/shallows/shallows/src/GLProgram.cpp,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** GLProgram.cpp 25 Nov 2005 11:18:16 -0000 1.29 --- GLProgram.cpp 31 Jan 2006 14:17:32 -0000 1.30 *************** *** 82,86 **** fragmentShader_ = initShader( fragmentShader_, internal::Shader::FragmentShader, fragmentShaderSource ); ! char str[4096]; // For GL-state reporting int result; --- 82,86 ---- fragmentShader_ = initShader( fragmentShader_, internal::Shader::FragmentShader, fragmentShaderSource ); ! char str[128*4096]; // For GL-state reporting int result; |
|
From: dyken <dy...@us...> - 2006-01-26 15:17:03
|
Update of /cvsroot/shallows/shallows/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14029/src Modified Files: readBuffer.cpp Log Message: Fixed typo, replaced '1' with 'i' in convertion from 3 ch to 2 ch. Index: readBuffer.cpp =================================================================== RCS file: /cvsroot/shallows/shallows/src/readBuffer.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** readBuffer.cpp 6 Dec 2005 14:00:35 -0000 1.12 --- readBuffer.cpp 26 Jan 2006 15:16:51 -0000 1.13 *************** *** 80,85 **** for (int i=0; i<(int)(height*width); i++) { ! pixels[2*i]=tmp[3*1]; ! pixels[2*i+1]=tmp[3*1+1]; } } else --- 80,85 ---- for (int i=0; i<(int)(height*width); i++) { ! pixels[2*i]=tmp[3*i]; ! pixels[2*i+1]=tmp[3*i+1]; } } else *************** *** 130,135 **** for (int i=0; i<(int)(height*width); i++) { ! pixels[2*i]=tmp[3*1]; ! pixels[2*i+1]=tmp[3*1+1]; } } else --- 130,135 ---- for (int i=0; i<(int)(height*width); i++) { ! pixels[2*i]=tmp[3*i]; ! pixels[2*i+1]=tmp[3*i+1]; } } else |
|
From: Trond H. <tr...@us...> - 2005-12-14 17:23:20
|
Update of /cvsroot/shallows/shallows/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1079/src Modified Files: OffScreenBuffer.cpp Log Message: Changed format from GL_R to GL_DEPTH_COMPONENT in createDepthTexture Index: OffScreenBuffer.cpp =================================================================== RCS file: /cvsroot/shallows/shallows/src/OffScreenBuffer.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** OffScreenBuffer.cpp 13 Dec 2005 14:05:02 -0000 1.22 --- OffScreenBuffer.cpp 14 Dec 2005 17:23:09 -0000 1.23 *************** *** 52,56 **** OffScreenBuffer::OffScreenBuffer(int internalFormat, unsigned int width, unsigned int height) : ! height_(0), width_(0), internalFormat_(internalFormat), id_(0) { init(internalFormat_, width, height); --- 52,56 ---- OffScreenBuffer::OffScreenBuffer(int internalFormat, unsigned int width, unsigned int height) : ! height_(0), width_(0), internalFormat_(internalFormat), id_(0), depthFormat_(0) { init(internalFormat_, width, height); *************** *** 153,157 **** width_, height_, ! GL_R, GL_FLOAT, 0, --- 153,157 ---- width_, height_, ! GL_DEPTH_COMPONENT, GL_FLOAT, 0, |
|
From: Trond H. <tr...@us...> - 2005-12-13 14:05:10
|
Update of /cvsroot/shallows/shallows/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22663/src Modified Files: OffScreenBuffer.cpp Log Message: Removed minor bug Index: OffScreenBuffer.cpp =================================================================== RCS file: /cvsroot/shallows/shallows/src/OffScreenBuffer.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** OffScreenBuffer.cpp 13 Dec 2005 12:09:04 -0000 1.21 --- OffScreenBuffer.cpp 13 Dec 2005 14:05:02 -0000 1.22 *************** *** 1,3 **** ! bg/********************************************************************** * * File: OffScreenBuffer.cpp --- 1,3 ---- ! /********************************************************************** * * File: OffScreenBuffer.cpp |
|
From: Jon H. <jon...@us...> - 2005-12-13 12:09:15
|
Update of /cvsroot/shallows/shallows/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29564/src Modified Files: OffScreenBuffer.cpp Log Message: Bugfix, createDepthTexture did not set depthFormat_ if it was set to 0 Index: OffScreenBuffer.cpp =================================================================== RCS file: /cvsroot/shallows/shallows/src/OffScreenBuffer.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** OffScreenBuffer.cpp 6 Dec 2005 12:49:41 -0000 1.20 --- OffScreenBuffer.cpp 13 Dec 2005 12:09:04 -0000 1.21 *************** *** 1,3 **** ! /********************************************************************** * * File: OffScreenBuffer.cpp --- 1,3 ---- ! bg/********************************************************************** * * File: OffScreenBuffer.cpp *************** *** 147,150 **** --- 147,152 ---- OffScreenBuffer::createDepthTexture(bool rectangular) { + if (depthFormat_==0) + depthFormat_=GL_DEPTH_COMPONENT24; boost::shared_ptr<Texture2D> tex; tex.reset(new Texture2D(depthFormat_, |
3 messages has been excluded from this view by a project administrator.