Fix EOL characters

meow-7.2.2
simon 2013-05-14 09:24:58 -07:00
parent fddf97c6ba
commit f111b5b113
2 changed files with 476 additions and 476 deletions

View File

@ -1,209 +1,209 @@
/**
* @file llstringtable.h
* @brief The LLStringTable class provides a _fast_ method for finding
* unique copies of strings.
*
* $LicenseInfo:firstyear=2001&license=viewerlgpl$
* Second Life Viewer Source Code
* Copyright (C) 2010, Linden Research, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation;
* version 2.1 of the License only.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
* $/LicenseInfo$
*/
#ifndef LL_STRING_TABLE_H
#define LL_STRING_TABLE_H
#include "lldefs.h"
#include "llformat.h"
#include "llstl.h"
#include <list>
#include <set>
#if LL_WINDOWS
# if (_MSC_VER >= 1300 && _MSC_VER < 1400)
# define STRING_TABLE_HASH_MAP 1
# endif
#else
//# define STRING_TABLE_HASH_MAP 1
#endif
const U32 MAX_STRINGS_LENGTH = 256;
class LL_COMMON_API LLStringTableEntry
{
public:
LLStringTableEntry(const char *str);
~LLStringTableEntry();
void incCount() { mCount++; }
BOOL decCount() { return --mCount; }
char *mString;
S32 mCount;
};
class LL_COMMON_API LLStringTable
{
public:
LLStringTable(int tablesize);
~LLStringTable();
char *checkString(const char *str);
char *checkString(const std::string& str);
LLStringTableEntry *checkStringEntry(const char *str);
LLStringTableEntry *checkStringEntry(const std::string& str);
char *addString(const char *str);
char *addString(const std::string& str);
LLStringTableEntry *addStringEntry(const char *str);
LLStringTableEntry *addStringEntry(const std::string& str);
void removeString(const char *str);
S32 mMaxEntries;
S32 mUniqueEntries;
#if STRING_TABLE_HASH_MAP
#if LL_WINDOWS
typedef std::hash_multimap<U32, LLStringTableEntry *> string_hash_t;
#else
typedef __gnu_cxx::hash_multimap<U32, LLStringTableEntry *> string_hash_t;
#endif
string_hash_t mStringHash;
#else
typedef std::list<LLStringTableEntry *> string_list_t;
typedef string_list_t * string_list_ptr_t;
string_list_ptr_t *mStringList;
#endif
};
extern LL_COMMON_API LLStringTable gStringTable;
//============================================================================
// This class is designed to be used locally,
// e.g. as a member of an LLXmlTree
// Strings can be inserted only, then quickly looked up
typedef const std::string* LLStdStringHandle;
class LL_COMMON_API LLStdStringTable
{
public:
LLStdStringTable(S32 tablesize = 0)
{
if (tablesize == 0)
{
tablesize = 256; // default
}
// Make sure tablesize is power of 2
for (S32 i = 31; i>0; i--)
{
if (tablesize & (1<<i))
{
if (tablesize >= (3<<(i-1)))
tablesize = (1<<(i+1));
else
tablesize = (1<<i);
break;
}
}
mTableSize = tablesize;
mStringList = new string_set_t[tablesize];
}
~LLStdStringTable()
{
cleanup();
delete[] mStringList;
}
void cleanup()
{
// remove strings
for (S32 i = 0; i<mTableSize; i++)
{
string_set_t& stringset = mStringList[i];
for (string_set_t::iterator iter = stringset.begin(); iter != stringset.end(); iter++)
{
delete *iter;
}
stringset.clear();
}
}
LLStdStringHandle lookup(const std::string& s)
{
U32 hashval = makehash(s);
return lookup(hashval, s);
}
LLStdStringHandle checkString(const std::string& s)
{
U32 hashval = makehash(s);
return lookup(hashval, s);
}
LLStdStringHandle insert(const std::string& s)
{
U32 hashval = makehash(s);
LLStdStringHandle result = lookup(hashval, s);
if (result == NULL)
{
result = new std::string(s);
mStringList[hashval].insert(result);
}
return result;
}
LLStdStringHandle addString(const std::string& s)
{
return insert(s);
}
private:
U32 makehash(const std::string& s)
{
S32 len = (S32)s.size();
const char* c = s.c_str();
U32 hashval = 0;
for (S32 i=0; i<len; i++)
{
hashval = ((hashval<<5) + hashval) + *c++;
}
return hashval & (mTableSize-1);
}
LLStdStringHandle lookup(U32 hashval, const std::string& s)
{
string_set_t& stringset = mStringList[hashval];
LLStdStringHandle handle = &s;
string_set_t::iterator iter = stringset.find(handle); // compares actual strings
if (iter != stringset.end())
{
return *iter;
}
else
{
return NULL;
}
}
private:
S32 mTableSize;
typedef std::set<LLStdStringHandle, compare_pointer_contents<std::string> > string_set_t;
string_set_t* mStringList; // [mTableSize]
};
#endif
/**
* @file llstringtable.h
* @brief The LLStringTable class provides a _fast_ method for finding
* unique copies of strings.
*
* $LicenseInfo:firstyear=2001&license=viewerlgpl$
* Second Life Viewer Source Code
* Copyright (C) 2010, Linden Research, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation;
* version 2.1 of the License only.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
* $/LicenseInfo$
*/
#ifndef LL_STRING_TABLE_H
#define LL_STRING_TABLE_H
#include "lldefs.h"
#include "llformat.h"
#include "llstl.h"
#include <list>
#include <set>
#if LL_WINDOWS
# if (_MSC_VER >= 1300 && _MSC_VER < 1400)
# define STRING_TABLE_HASH_MAP 1
# endif
#else
//# define STRING_TABLE_HASH_MAP 1
#endif
const U32 MAX_STRINGS_LENGTH = 256;
class LL_COMMON_API LLStringTableEntry
{
public:
LLStringTableEntry(const char *str);
~LLStringTableEntry();
void incCount() { mCount++; }
BOOL decCount() { return --mCount; }
char *mString;
S32 mCount;
};
class LL_COMMON_API LLStringTable
{
public:
LLStringTable(int tablesize);
~LLStringTable();
char *checkString(const char *str);
char *checkString(const std::string& str);
LLStringTableEntry *checkStringEntry(const char *str);
LLStringTableEntry *checkStringEntry(const std::string& str);
char *addString(const char *str);
char *addString(const std::string& str);
LLStringTableEntry *addStringEntry(const char *str);
LLStringTableEntry *addStringEntry(const std::string& str);
void removeString(const char *str);
S32 mMaxEntries;
S32 mUniqueEntries;
#if STRING_TABLE_HASH_MAP
#if LL_WINDOWS
typedef std::hash_multimap<U32, LLStringTableEntry *> string_hash_t;
#else
typedef __gnu_cxx::hash_multimap<U32, LLStringTableEntry *> string_hash_t;
#endif
string_hash_t mStringHash;
#else
typedef std::list<LLStringTableEntry *> string_list_t;
typedef string_list_t * string_list_ptr_t;
string_list_ptr_t *mStringList;
#endif
};
extern LL_COMMON_API LLStringTable gStringTable;
//============================================================================
// This class is designed to be used locally,
// e.g. as a member of an LLXmlTree
// Strings can be inserted only, then quickly looked up
typedef const std::string* LLStdStringHandle;
class LL_COMMON_API LLStdStringTable
{
public:
LLStdStringTable(S32 tablesize = 0)
{
if (tablesize == 0)
{
tablesize = 256; // default
}
// Make sure tablesize is power of 2
for (S32 i = 31; i>0; i--)
{
if (tablesize & (1<<i))
{
if (tablesize >= (3<<(i-1)))
tablesize = (1<<(i+1));
else
tablesize = (1<<i);
break;
}
}
mTableSize = tablesize;
mStringList = new string_set_t[tablesize];
}
~LLStdStringTable()
{
cleanup();
delete[] mStringList;
}
void cleanup()
{
// remove strings
for (S32 i = 0; i<mTableSize; i++)
{
string_set_t& stringset = mStringList[i];
for (string_set_t::iterator iter = stringset.begin(); iter != stringset.end(); iter++)
{
delete *iter;
}
stringset.clear();
}
}
LLStdStringHandle lookup(const std::string& s)
{
U32 hashval = makehash(s);
return lookup(hashval, s);
}
LLStdStringHandle checkString(const std::string& s)
{
U32 hashval = makehash(s);
return lookup(hashval, s);
}
LLStdStringHandle insert(const std::string& s)
{
U32 hashval = makehash(s);
LLStdStringHandle result = lookup(hashval, s);
if (result == NULL)
{
result = new std::string(s);
mStringList[hashval].insert(result);
}
return result;
}
LLStdStringHandle addString(const std::string& s)
{
return insert(s);
}
private:
U32 makehash(const std::string& s)
{
S32 len = (S32)s.size();
const char* c = s.c_str();
U32 hashval = 0;
for (S32 i=0; i<len; i++)
{
hashval = ((hashval<<5) + hashval) + *c++;
}
return hashval & (mTableSize-1);
}
LLStdStringHandle lookup(U32 hashval, const std::string& s)
{
string_set_t& stringset = mStringList[hashval];
LLStdStringHandle handle = &s;
string_set_t::iterator iter = stringset.find(handle); // compares actual strings
if (iter != stringset.end())
{
return *iter;
}
else
{
return NULL;
}
}
private:
S32 mTableSize;
typedef std::set<LLStdStringHandle, compare_pointer_contents<std::string> > string_set_t;
string_set_t* mStringList; // [mTableSize]
};
#endif

View File

@ -1,267 +1,267 @@
/**
* @file llpostprocess.h
* @brief LLPostProcess class definition
*
* $LicenseInfo:firstyear=2007&license=viewerlgpl$
* Second Life Viewer Source Code
* Copyright (C) 2010, Linden Research, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation;
* version 2.1 of the License only.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
* $/LicenseInfo$
*/
#ifndef LL_POSTPROCESS_H
#define LL_POSTPROCESS_H
#include <map>
#include <fstream>
#include "llgl.h"
#include "llglheaders.h"
#include "llstaticstringtable.h"
class LLPostProcess
{
public:
typedef enum _QuadType {
QUAD_NORMAL,
QUAD_NOISE,
QUAD_BLOOM_EXTRACT,
QUAD_BLOOM_COMBINE
} QuadType;
/// GLSL Shader Encapsulation Struct
typedef LLStaticStringTable<GLuint> glslUniforms;
struct PostProcessTweaks : public LLSD {
inline PostProcessTweaks() : LLSD(LLSD::emptyMap())
{
}
inline LLSD & brightMult() {
return (*this)["brightness_multiplier"];
}
inline LLSD & noiseStrength() {
return (*this)["noise_strength"];
}
inline LLSD & noiseSize() {
return (*this)["noise_size"];
}
inline LLSD & extractLow() {
return (*this)["extract_low"];
}
inline LLSD & extractHigh() {
return (*this)["extract_high"];
}
inline LLSD & bloomWidth() {
return (*this)["bloom_width"];
}
inline LLSD & bloomStrength() {
return (*this)["bloom_strength"];
}
inline LLSD & brightness() {
return (*this)["brightness"];
}
inline LLSD & contrast() {
return (*this)["contrast"];
}
inline LLSD & contrastBaseR() {
return (*this)["contrast_base"][0];
}
inline LLSD & contrastBaseG() {
return (*this)["contrast_base"][1];
}
inline LLSD & contrastBaseB() {
return (*this)["contrast_base"][2];
}
inline LLSD & contrastBaseIntensity() {
return (*this)["contrast_base"][3];
}
inline LLSD & saturation() {
return (*this)["saturation"];
}
inline LLSD & useNightVisionShader() {
return (*this)["enable_night_vision"];
}
inline LLSD & useBloomShader() {
return (*this)["enable_bloom"];
}
inline LLSD & useColorFilter() {
return (*this)["enable_color_filter"];
}
inline F32 getBrightMult() const {
return F32((*this)["brightness_multiplier"].asReal());
}
inline F32 getNoiseStrength() const {
return F32((*this)["noise_strength"].asReal());
}
inline F32 getNoiseSize() const {
return F32((*this)["noise_size"].asReal());
}
inline F32 getExtractLow() const {
return F32((*this)["extract_low"].asReal());
}
inline F32 getExtractHigh() const {
return F32((*this)["extract_high"].asReal());
}
inline F32 getBloomWidth() const {
return F32((*this)["bloom_width"].asReal());
}
inline F32 getBloomStrength() const {
return F32((*this)["bloom_strength"].asReal());
}
inline F32 getBrightness() const {
return F32((*this)["brightness"].asReal());
}
inline F32 getContrast() const {
return F32((*this)["contrast"].asReal());
}
inline F32 getContrastBaseR() const {
return F32((*this)["contrast_base"][0].asReal());
}
inline F32 getContrastBaseG() const {
return F32((*this)["contrast_base"][1].asReal());
}
inline F32 getContrastBaseB() const {
return F32((*this)["contrast_base"][2].asReal());
}
inline F32 getContrastBaseIntensity() const {
return F32((*this)["contrast_base"][3].asReal());
}
inline F32 getSaturation() const {
return F32((*this)["saturation"].asReal());
}
};
bool initialized;
PostProcessTweaks tweaks;
// the map of all availible effects
LLSD mAllEffects;
private:
LLPointer<LLImageGL> mSceneRenderTexture ;
LLPointer<LLImageGL> mNoiseTexture ;
LLPointer<LLImageGL> mTempBloomTexture ;
public:
LLPostProcess(void);
~LLPostProcess(void);
void apply(unsigned int width, unsigned int height);
void invalidate() ;
/// Perform global initialization for this class.
static void initClass(void);
// Cleanup of global data that's only inited once per class.
static void cleanupClass();
void setSelectedEffect(std::string const & effectName);
inline std::string const & getSelectedEffect(void) const {
return mSelectedEffectName;
}
void saveEffect(std::string const & effectName);
private:
/// read in from file
std::string mShaderErrorString;
unsigned int screenW;
unsigned int screenH;
float noiseTextureScale;
/// Shader Uniforms
glslUniforms nightVisionUniforms;
glslUniforms bloomExtractUniforms;
glslUniforms bloomBlurUniforms;
glslUniforms colorFilterUniforms;
// the name of currently selected effect in mAllEffects
// invariant: tweaks == mAllEffects[mSelectedEffectName]
std::string mSelectedEffectName;
/// General functions
void initialize(unsigned int width, unsigned int height);
void doEffects(void);
void applyShaders(void);
bool shadersEnabled(void);
/// Night Vision Functions
void createNightVisionShader(void);
void applyNightVisionShader(void);
/// Bloom Functions
void createBloomShader(void);
void applyBloomShader(void);
/// Color Filter Functions
void createColorFilterShader(void);
void applyColorFilterShader(void);
/// OpenGL Helper Functions
void getShaderUniforms(glslUniforms & uniforms, GLhandleARB & prog);
void createTexture(LLPointer<LLImageGL>& texture, unsigned int width, unsigned int height);
void copyFrameBuffer(U32 & texture, unsigned int width, unsigned int height);
void createNoiseTexture(LLPointer<LLImageGL>& texture);
bool checkError(void);
void checkShaderError(GLhandleARB shader);
void drawOrthoQuad(unsigned int width, unsigned int height, QuadType type);
void viewOrthogonal(unsigned int width, unsigned int height);
void changeOrthogonal(unsigned int width, unsigned int height);
void viewPerspective(void);
};
extern LLPostProcess * gPostProcess;
#endif // LL_POSTPROCESS_H
/**
* @file llpostprocess.h
* @brief LLPostProcess class definition
*
* $LicenseInfo:firstyear=2007&license=viewerlgpl$
* Second Life Viewer Source Code
* Copyright (C) 2010, Linden Research, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation;
* version 2.1 of the License only.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
* $/LicenseInfo$
*/
#ifndef LL_POSTPROCESS_H
#define LL_POSTPROCESS_H
#include <map>
#include <fstream>
#include "llgl.h"
#include "llglheaders.h"
#include "llstaticstringtable.h"
class LLPostProcess
{
public:
typedef enum _QuadType {
QUAD_NORMAL,
QUAD_NOISE,
QUAD_BLOOM_EXTRACT,
QUAD_BLOOM_COMBINE
} QuadType;
/// GLSL Shader Encapsulation Struct
typedef LLStaticStringTable<GLuint> glslUniforms;
struct PostProcessTweaks : public LLSD {
inline PostProcessTweaks() : LLSD(LLSD::emptyMap())
{
}
inline LLSD & brightMult() {
return (*this)["brightness_multiplier"];
}
inline LLSD & noiseStrength() {
return (*this)["noise_strength"];
}
inline LLSD & noiseSize() {
return (*this)["noise_size"];
}
inline LLSD & extractLow() {
return (*this)["extract_low"];
}
inline LLSD & extractHigh() {
return (*this)["extract_high"];
}
inline LLSD & bloomWidth() {
return (*this)["bloom_width"];
}
inline LLSD & bloomStrength() {
return (*this)["bloom_strength"];
}
inline LLSD & brightness() {
return (*this)["brightness"];
}
inline LLSD & contrast() {
return (*this)["contrast"];
}
inline LLSD & contrastBaseR() {
return (*this)["contrast_base"][0];
}
inline LLSD & contrastBaseG() {
return (*this)["contrast_base"][1];
}
inline LLSD & contrastBaseB() {
return (*this)["contrast_base"][2];
}
inline LLSD & contrastBaseIntensity() {
return (*this)["contrast_base"][3];
}
inline LLSD & saturation() {
return (*this)["saturation"];
}
inline LLSD & useNightVisionShader() {
return (*this)["enable_night_vision"];
}
inline LLSD & useBloomShader() {
return (*this)["enable_bloom"];
}
inline LLSD & useColorFilter() {
return (*this)["enable_color_filter"];
}
inline F32 getBrightMult() const {
return F32((*this)["brightness_multiplier"].asReal());
}
inline F32 getNoiseStrength() const {
return F32((*this)["noise_strength"].asReal());
}
inline F32 getNoiseSize() const {
return F32((*this)["noise_size"].asReal());
}
inline F32 getExtractLow() const {
return F32((*this)["extract_low"].asReal());
}
inline F32 getExtractHigh() const {
return F32((*this)["extract_high"].asReal());
}
inline F32 getBloomWidth() const {
return F32((*this)["bloom_width"].asReal());
}
inline F32 getBloomStrength() const {
return F32((*this)["bloom_strength"].asReal());
}
inline F32 getBrightness() const {
return F32((*this)["brightness"].asReal());
}
inline F32 getContrast() const {
return F32((*this)["contrast"].asReal());
}
inline F32 getContrastBaseR() const {
return F32((*this)["contrast_base"][0].asReal());
}
inline F32 getContrastBaseG() const {
return F32((*this)["contrast_base"][1].asReal());
}
inline F32 getContrastBaseB() const {
return F32((*this)["contrast_base"][2].asReal());
}
inline F32 getContrastBaseIntensity() const {
return F32((*this)["contrast_base"][3].asReal());
}
inline F32 getSaturation() const {
return F32((*this)["saturation"].asReal());
}
};
bool initialized;
PostProcessTweaks tweaks;
// the map of all availible effects
LLSD mAllEffects;
private:
LLPointer<LLImageGL> mSceneRenderTexture ;
LLPointer<LLImageGL> mNoiseTexture ;
LLPointer<LLImageGL> mTempBloomTexture ;
public:
LLPostProcess(void);
~LLPostProcess(void);
void apply(unsigned int width, unsigned int height);
void invalidate() ;
/// Perform global initialization for this class.
static void initClass(void);
// Cleanup of global data that's only inited once per class.
static void cleanupClass();
void setSelectedEffect(std::string const & effectName);
inline std::string const & getSelectedEffect(void) const {
return mSelectedEffectName;
}
void saveEffect(std::string const & effectName);
private:
/// read in from file
std::string mShaderErrorString;
unsigned int screenW;
unsigned int screenH;
float noiseTextureScale;
/// Shader Uniforms
glslUniforms nightVisionUniforms;
glslUniforms bloomExtractUniforms;
glslUniforms bloomBlurUniforms;
glslUniforms colorFilterUniforms;
// the name of currently selected effect in mAllEffects
// invariant: tweaks == mAllEffects[mSelectedEffectName]
std::string mSelectedEffectName;
/// General functions
void initialize(unsigned int width, unsigned int height);
void doEffects(void);
void applyShaders(void);
bool shadersEnabled(void);
/// Night Vision Functions
void createNightVisionShader(void);
void applyNightVisionShader(void);
/// Bloom Functions
void createBloomShader(void);
void applyBloomShader(void);
/// Color Filter Functions
void createColorFilterShader(void);
void applyColorFilterShader(void);
/// OpenGL Helper Functions
void getShaderUniforms(glslUniforms & uniforms, GLhandleARB & prog);
void createTexture(LLPointer<LLImageGL>& texture, unsigned int width, unsigned int height);
void copyFrameBuffer(U32 & texture, unsigned int width, unsigned int height);
void createNoiseTexture(LLPointer<LLImageGL>& texture);
bool checkError(void);
void checkShaderError(GLhandleARB shader);
void drawOrthoQuad(unsigned int width, unsigned int height, QuadType type);
void viewOrthogonal(unsigned int width, unsigned int height);
void changeOrthogonal(unsigned int width, unsigned int height);
void viewPerspective(void);
};
extern LLPostProcess * gPostProcess;
#endif // LL_POSTPROCESS_H