Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote branch 'shyotlsv/master'

Browse Source
This commit is contained in:
Siana Gearz
2011-02-16 21:05:57 +01:00
parent 94c13d3131 257a971fcd
commit 34e7773be3
17 changed files with 247 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/cmake/CARes.cmake
View File

@@ -19,5 +19,5 @@ else (STANDALONE)
else (WINDOWS)
set(CARES_LIBRARIES cares)
endif (WINDOWS)
set(CARES_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/ares)
set(CARES_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/ares)
endif (STANDALONE)

2
indra/cmake/CURL.cmake
View File

@@ -15,5 +15,5 @@ else (STANDALONE)
else (WINDOWS)
set(CURL_LIBRARIES curl)
endif (WINDOWS)
set(CURL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
set(CURL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
endif (STANDALONE)

1
indra/cmake/Variables.cmake
View File

@@ -31,6 +31,7 @@ set(SCRIPTS_DIR ${CMAKE_SOURCE_DIR}/${SCRIPTS_PREFIX})
set(SERVER_DIR ${CMAKE_SOURCE_DIR}/${SERVER_PREFIX})
set(VIEWER_DIR ${CMAKE_SOURCE_DIR}/${VIEWER_PREFIX})
set(LL_TESTS ON CACHE BOOL "Build and run unit and integration tests (disable for build timing runs to reduce variation)")
set(VISTA_ICON OFF CACHE BOOL "Allow vista icon with pre 2008 Visual Studio IDEs. (Assumes replacement old rcdll.dll with new rcdll.dll from win sdk 7.0 or later)")
set(LIBS_PREBUILT_DIR ${CMAKE_SOURCE_DIR}/../libraries CACHE PATH
"Location of prebuilt libraries.")

3
indra/develop.py
View File

@@ -755,6 +755,9 @@ Command-options for "configure":
-DVIEWER:BOOL=OFF Don't configure the viewer
-DPACKAGE:BOOL=ON Create "package" target to make installers
-DLOCALIZESETUP:BOOL=ON Create one win_setup target per supported language
-DLL_TESTS:BOOL=OFF Don't generate unit test projects
-DEXAMPLEPLUGIN:BOOL=OFF Don't generate example plugin project
-VISTA_ICON:BOOL=ON Allow pre-2008 VS to use vista-optimized resource file. (Requires updated rcdll.dll!)
Examples:
Set up a viewer-only project for your system:

5
indra/llrender/llfont.cpp
View File

@@ -39,7 +39,10 @@
# include <ft2build.h>
#else
// I had to do some work to avoid the system-installed FreeType headers... --ryan.
# include "llfreetype2/freetype/ft2build.h"
//This path no longer exists.
//# include "llfreetype2/freetype/ft2build.h"
//This works fine.
# include "../include/ft2build.h"
#endif
// For some reason, this won't work if it's not wrapped in the ifdef

12
indra/llrender/llpostprocess.cpp
View File

@@ -81,9 +81,9 @@ LLPostProcess::LLPostProcess(void) :
{
LLSD & defaultEffect = (mAllEffects["default"] = LLSD::emptyMap());
defaultEffect["enable_night_vision"] = LLSD::Boolean(false);
/*defaultEffect["enable_night_vision"] = LLSD::Boolean(false);
defaultEffect["enable_bloom"] = LLSD::Boolean(false);
defaultEffect["enable_color_filter"] = LLSD::Boolean(false);
defaultEffect["enable_color_filter"] = LLSD::Boolean(false);*/
/// NVG Defaults
defaultEffect["brightness_multiplier"] = 3.0;
@@ -192,7 +192,7 @@ void LLPostProcess::initialize(unsigned int width, unsigned int height)
checkError();
createNightVisionShader();
createBloomShader();
//createBloomShader();
createColorFilterShader();
createGaussBlurShader();
checkError();
@@ -202,7 +202,7 @@ inline bool LLPostProcess::shadersEnabled(void)
{
return (tweaks.useColorFilter().asBoolean() ||
tweaks.useNightVisionShader().asBoolean() ||
tweaks.useBloomShader().asBoolean() ||
/*tweaks.useBloomShader().asBoolean() ||*/
tweaks.useGaussBlurFilter().asBoolean() );
}
@@ -234,7 +234,7 @@ void LLPostProcess::applyShaders(void)
checkError();
copy_buffer = true;
}
if (tweaks.useBloomShader())
/*if (tweaks.useBloomShader())
{
/// If any of the above shaders have been called update the frame buffer;
if (copy_buffer)
@@ -242,7 +242,7 @@ void LLPostProcess::applyShaders(void)
applyBloomShader();
checkError();
copy_buffer = true;
}
}*/
}
void LLPostProcess::applyColorFilterShader(void)

4
indra/llrender/llpostprocess.h
View File

@@ -117,9 +117,9 @@ public:
return (*this)["enable_night_vision"];
}
inline LLSD & useBloomShader() {
/*inline LLSD & useBloomShader() {
return (*this)["enable_bloom"];
}
}*/
inline LLSD & useColorFilter() {
return (*this)["enable_color_filter"];

20
indra/newview/CMakeLists.txt
View File

@@ -1118,12 +1118,20 @@ if (WINDOWS)
include_directories(${ARTWORK_DIR}/res)
endif(NOT ARTWORK_IN_SOURCE)
set(viewer_RESOURCE_FILES
res/resource.h
res/viewerRes.rc
${viewer_RESOURCE_FILES}
)
if (MSVC71 OR MSVC80 AND NOT VISTA_ICON)
set(viewer_RESOURCE_FILES
res/resource.h
res/viewerRes_bc.rc
${viewer_RESOURCE_FILES}
)
else (MSVC71 OR MSVC80 AND NOT VISTA_ICON)
set(viewer_RESOURCE_FILES
res/resource.h
res/viewerRes.rc
${viewer_RESOURCE_FILES}
)
endif (MSVC71 OR MSVC80 AND NOT VISTA_ICON)
SOURCE_GROUP("Resource Files" FILES ${viewer_RESOURCE_FILES})
list(APPEND viewer_SOURCE_FILES ${viewer_RESOURCE_FILES})

BIN
indra/newview/installers/windows/install_icon_ascent.ico
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 9.4 KiB

BIN
indra/newview/installers/windows/install_icon_singularity.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 139 KiB

8
indra/newview/llfloaterpostprocess.cpp
View File

@@ -70,10 +70,10 @@ LLFloaterPostProcess::LLFloaterPostProcess() : LLFloater(std::string("Post-Proce
childSetCommitCallback("NightVisionNoiseStrength", &LLFloaterPostProcess::onFloatControlMoved, (char*)"noise_strength");
/// Bloom Callbacks
childSetCommitCallback("BloomToggle", &LLFloaterPostProcess::onBoolToggle, (char*)"enable_bloom");
/*childSetCommitCallback("BloomToggle", &LLFloaterPostProcess::onBoolToggle, (char*)"enable_bloom");
childSetCommitCallback("BloomExtract", &LLFloaterPostProcess::onFloatControlMoved, (char*)"extract_low");
childSetCommitCallback("BloomSize", &LLFloaterPostProcess::onFloatControlMoved, (char*)"bloom_width");
childSetCommitCallback("BloomStrength", &LLFloaterPostProcess::onFloatControlMoved, (char*)"bloom_strength");
childSetCommitCallback("BloomStrength", &LLFloaterPostProcess::onFloatControlMoved, (char*)"bloom_strength");*/
// Gauss Blur Callbacks
childSetCommitCallback("GaussBlurToggle", &LLFloaterPostProcess::onBoolToggle, (char*)"enable_gauss_blur");
@@ -268,10 +268,10 @@ void LLFloaterPostProcess::syncMenu()
childSetValue("NightVisionNoiseStrength", gPostProcess->tweaks.noiseStrength());
/// Sync Bloom Menu
childSetValue("BloomToggle", LLSD(gPostProcess->tweaks.useBloomShader()));
/*childSetValue("BloomToggle", LLSD(gPostProcess->tweaks.useBloomShader()));
childSetValue("BloomExtract", gPostProcess->tweaks.extractLow());
childSetValue("BloomSize", gPostProcess->tweaks.bloomWidth());
childSetValue("BloomStrength", gPostProcess->tweaks.bloomStrength());
childSetValue("BloomStrength", gPostProcess->tweaks.bloomStrength());*/
childSetValue("GaussBlurToggle", gPostProcess->tweaks.useGaussBlurFilter());
childSetValue("GaussBlurPasses", gPostProcess->tweaks.getGaussBlurPasses());

BIN
indra/newview/res/singularity_icon.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 139 KiB

BIN
indra/newview/res/singularity_icon_bc.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.3 KiB

BIN
indra/newview/res/snowglobe_icon.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 139 KiB

193
indra/newview/res/viewerRes_bc.rc Normal file
View File

@@ -0,0 +1,193 @@
// Microsoft Visual C++ generated resource script.
//
#include "resource.h"
#ifdef IDC_STATIC
#undef IDC_STATIC
#endif
#define IDC_STATIC (-1)
#include "winresrc.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
// Commented out because it only compiles if you have MFC installed.
//#include "winres.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
// English (U.S.) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
#endif //_WIN32
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
//
1 TEXTINCLUDE
BEGIN
"resource.h\0"
END
2 TEXTINCLUDE
BEGIN
"#include ""winres.h""\r\n"
"\0"
END
3 TEXTINCLUDE
BEGIN
"\r\n"
"\0"
END
#endif // APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Icon
//
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
IDI_LL_ICON ICON "singularity_icon_bc.ico"
IDI_LCD_LL_ICON ICON "singularity_icon_bc.ico"
/////////////////////////////////////////////////////////////////////////////
//
// Dialog
//
SPLASHSCREEN DIALOG 32, 32, 144, 34
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE
FONT 8, "MS Sans Serif"
BEGIN
ICON IDI_LL_ICON,IDC_STATIC,7,7,20,20
LTEXT "Loading Second Life...",666,36,13,91,8
END
/////////////////////////////////////////////////////////////////////////////
//
// DESIGNINFO
//
#ifdef APSTUDIO_INVOKED
GUIDELINES DESIGNINFO
BEGIN
"SPLASHSCREEN", DIALOG
BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 137
VERTGUIDE, 36
TOPMARGIN, 7
BOTTOMMARGIN, 27
END
END
#endif // APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Cursor
//
TOOLGRAB CURSOR "lltoolgrab.cur"
TOOLLAND CURSOR "lltoolland.cur"
TOOLZOOMIN CURSOR "lltoolzoomin.cur"
TOOLCREATE CURSOR "lltoolcreate.cur"
ARROWDRAG CURSOR "llarrowdrag.cur"
ARROW CURSOR "llarrow.cur"
NOLOCKED CURSOR "llnolocked.cur"
ARROWLOCKED CURSOR "llarrowlocked.cur"
GRABLOCKED CURSOR "llgrablocked.cur"
TOOLROTATE CURSOR "lltoolrotate.cur"
TOOLTRANSLATE CURSOR "lltooltranslate.cur"
TOOLSCALE CURSOR "lltoolscale.cur"
TOOLCAMERA CURSOR "lltoolcamera.cur"
TOOLPAN CURSOR "lltoolpan.cur"
TOOLFOCUS CURSOR "lltoolfocus.cur"
TOOLPICKOBJECT3 CURSOR "toolpickobject3.cur"
ARROWCOPY CURSOR "arrowcop.cur"
ARROWDRAGMULTI CURSOR "llarrowdragmulti.cur"
ARROWCOPYMULTI CURSOR "arrowcopmulti.cur"
TOOLSIT CURSOR "toolsit.cur"
TOOLBUY CURSOR "toolbuy.cur"
TOOLPAY CURSOR "toolpay.cur"
TOOLOPEN CURSOR "toolopen.cur"
TOOLPIPETTE CURSOR "toolpipette.cur"
TOOLPLAY CURSOR "toolplay.cur"
TOOLPAUSE CURSOR "toolpause.cur"
TOOLMEDIAOPEN CURSOR "toolmediaopen.cur"
/////////////////////////////////////////////////////////////////////////////
//
// Version
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,5,0,0
PRODUCTVERSION 1,5,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
#else
FILEFLAGS 0x0L
#endif
FILEOS 0x40004L
FILETYPE 0x1L
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "CompanyName", "Siana Gears"
VALUE "FileDescription", "Singularity Viewer"
VALUE "FileVersion", "1.5.0.0"
VALUE "InternalName", "Second Life"
VALUE "LegalCopyright", "Copyright <20> 2001-2010, Linden Research, Inc., Copyright 2010 Siana Gearz"
VALUE "OriginalFilename", "singularity.exe"
VALUE "ProductName", "Singularity Viewer"
VALUE "ProductVersion", "1.5.0.0"
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x409, 1200
END
END
/////////////////////////////////////////////////////////////////////////////
//
// Bitmap
//
#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////
#ifndef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 3 resource.
//
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED

4
indra/newview/skins/default/xui/en-us/floater_post_process.xml
View File

@@ -150,7 +150,7 @@
left="14" max_val="1" min_val="0" mouse_opaque="true"
name="NightVisionNoiseStrength" show_text="true" value="1.0" width="200" />
</panel>
<panel border="true" bottom="-180" follows="left|top|right|bottom" height="400"
<!--<panel border="true" bottom="-180" follows="left|top|right|bottom" height="400"
label="Bloom" left="1" mouse_opaque="true"
name="BloomPanel" width="398">
<check_box bottom="-20" control_name="BloomToggle" follows="left|top"
@@ -191,7 +191,7 @@
initial_val="1.2" label="" left="14" max_val="10" min_val="0"
mouse_opaque="true" name="BloomStrength" show_text="true" value="1.0"
width="200" />
</panel>
</panel>-->
<panel border="true" bottom="-180" follows="left|top|right|bottom" height="400"
label="Extras" left="1" mouse_opaque="false" name="Extras"
width="398">

32
install.xml
View File

@@ -125,30 +125,30 @@
<key>darwin</key>
<map>
<key>md5sum</key>
<string>cdb2f5c4a5a1f9ecd75bc1dbdd4db8e9</string>
<string>ad736bc1558c37ca6648bc7e72047faa</string>
<key>url</key>
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ares-1.7.1-darwin-20100606.tar.bz2</uri>
<uri>https://github.com/downloads/Shyotl/SingularityViewer/ares-1.7.1-darwin-20100606.tar.bz2</uri>
</map>
<key>linux</key>
<map>
<key>md5sum</key>
<string>91694429e391efeea1de974df26032a2</string>
<string>c6953535222475e248d57fa9c2eec5cf</string>
<key>url</key>
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ares-1.7.1-linux-20100527.tar.bz2</uri>
<uri>https://github.com/downloads/Shyotl/SingularityViewer/ares-1.7.1-linux-20100527.tar.bz2</uri>
</map>
<key>linux64</key>
<map>
<key>md5sum</key>
<string>c4242416e0b2e642c0bf062a19a250e4</string>
<string>f7cbf2b6e74de4556148663b93ead4d3</string>
<key>url</key>
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ares-1.3.0-linux64-20080909.tar.bz2</uri>
<uri>https://github.com/downloads/Shyotl/SingularityViewer/ares-1.3.0-linux64-20080909.tar.bz2</uri>
</map>
<key>windows</key>
<map>
<key>md5sum</key>
<string>4b84738eec2e21b0c096d53b79ee2681</string>
<string>b06f412608c8fccfc756935c262b03f0</string>
<key>url</key>
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ares-1.7.1-windows-20100611a.tar.bz2</uri>
<uri>https://github.com/downloads/Shyotl/SingularityViewer/ares-1.7.1-windows-20100611a.tar.bz2</uri>
</map>
</map>
</map>
@@ -240,30 +240,30 @@
<key>darwin</key>
<map>
<key>md5sum</key>
<string>752e295ccb17f0dcb7c0167db3ad1e69</string>
<string>525f6b18ea5af8fbd691c2ac1769056c</string>
<key>url</key>
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/curl-7.20.1-darwin-20100606.tar.bz2</uri>
<uri>https://github.com/downloads/Shyotl/SingularityViewer/curl-7.20.1-darwin-20100606.tar.bz2</uri>
</map>
<key>linux</key>
<map>
<key>md5sum</key>
<string>a20e73f2e7d6a032ff25a5161b1b7394</string>
<string>6244eec15fb26f9577785625fdb38f78</string>
<key>url</key>
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/curl-7.20.1-linux-20100527.tar.bz2</uri>
<uri>https://github.com/downloads/Shyotl/SingularityViewer/curl-7.20.1-linux-20100527.tar.bz2</uri>
</map>
<key>linux64</key>
<map>
<key>md5sum</key>
<string>6994192cea7ab2d885a158a3de474273</string>
<string>8a28849f4b9d99601dbc8db9d6a2f9ba</string>
<key>url</key>
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/curl-7.16.4a-linux64-20090303.tar.bz2</uri>
<uri>https://github.com/downloads/Shyotl/SingularityViewer/curl-7.16.4a-linux64-20090303.tar.bz2</uri>
</map>
<key>windows</key>
<map>
<key>md5sum</key>
<string>b28856d3d02ee680353ae440561a6579</string>
<string>7f73eeff95087369ffebeac8356c7eaa</string>
<key>url</key>
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/curl-7.20.1-windows-20100611.tar.bz2</uri>
<uri>https://github.com/downloads/Shyotl/SingularityViewer/curl-7.20.1-windows-20100611.tar.bz2</uri>
</map>
</map>
</map>