[Shallows-commits] shallows/include/shallows/internal Shader.hpp, 1.6, 1.7

[Johan S. <jo...@us...>]

Update of /cvsroot/shallows/shallows/include/shallows/internal
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv22330/include/shallows/internal

Modified Files:
	Shader.hpp 
Log Message:
Updated CMakeLists so it cleanly compiles on VS2005.
Removed bogus regex dependency in Program.cpp
Remover signed/unsigned warnings in OffScreenBuffer
Removed use of sprintf(!) in ShallowsExt

Index: Shader.hpp
===================================================================
RCS file: /cvsroot/shallows/shallows/include/shallows/internal/Shader.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Shader.hpp	4 Dec 2006 10:25:10 -0000	1.6
--- Shader.hpp	19 Jan 2007 13:18:47 -0000	1.7
***************
*** 1,62 ****
! /**********************************************************************
!  * 
!  *  File: 
!  * 
!  *  Created:
!  *
!  *  Version: $Id$
!  *
!  *  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 _SHADER_HPP_
! #define _SHADER_HPP_
! #include "shallows/config.h"
! 
! #include <string>
! namespace shallows {
! namespace internal {
! 
! class DllExport Shader
! {
! public:
! 
!   enum ShaderType {VertexShader, FragmentShader, GeometryShader};
! 
!   Shader(ShaderType shaderType);
!   virtual ~Shader();
!   
!   /** Reads a shader from a string. Replaces the source code in a shader object and compiles the shader object.
!   \param shaderText String containing the shader code.
!   \return bool      Everything went OK. */
!   virtual bool read(std::string shaderText) = 0;
! 
! protected:
!   Shader();
! 
!   ShaderType shaderType_;
! 
! };
! } // namespace internal
! } // namespace shallows
! 
! #endif // _SHADER_H_
!  
--- 1,124 ----
! /**********************************************************************
! 
!  * 
! 
!  *  File: 
! 
!  * 
! 
!  *  Created:
! 
!  *
! 
!  *  Version: $Id$
! 
!  *
! 
!  *  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 _SHADER_HPP_
! 
! #define _SHADER_HPP_
! 
! #include "shallows/config.h"
! 
! 
! 
! #include <string>
! 
! namespace shallows {
! 
! namespace internal {
! 
! 
! 
! class DllExport Shader
! 
! {
! 
! public:
! 
! 
! 
!   enum ShaderType {VertexShader, FragmentShader, GeometryShader};
! 
! 
! 
!   Shader(ShaderType shaderType);
! 
!   virtual ~Shader();
! 
!   
! 
!   /** Reads a shader from a string. Replaces the source code in a shader object and compiles the shader object.
! 
!   \param shaderText String containing the shader code.
! 
!   \return bool      Everything went OK. */
! 
!   virtual bool read(std::string shaderText) = 0;
! 
! 
! 
! protected:
! 
!   Shader();
! 
! 
! 
!   ShaderType shaderType_;
! 
! 
! 
! };
! 
! } // namespace internal
! 
! } // namespace shallows
! 
! 
! 
! #endif // _SHADER_H_
! 
!  
!