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

Merge branch 'master' of https://github.com/Shyotl/SingularityViewer

Browse Source
This commit is contained in:
Siana Gearz
2012-01-28 22:25:40 +01:00
parent ef696d895d c39ddb5991
commit 5245547f28
4 changed files with 44 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
indra/newview/CMakeLists.txt
View File

@@ -1393,8 +1393,20 @@ if (WINDOWS)
else()
set(release_flags "/MAP:Release/${VIEWER_BINARY_NAME}.map")
endif()
if (FMOD)
if(MANIFEST_LIBRARIES)
set(MANIFEST_LIBRARIES "${MANIFEST_LIBRARIES}|${FMOD_BINARY_DIR}/fmod.dll")
else(MANIFEST_LIBRARIES)
set(MANIFEST_LIBRARIES "--extra_libraries=${FMOD_BINARY_DIR}/fmod.dll")
endif(MANIFEST_LIBRARIES)
endif (FMOD)
if (FMODEX)
if(MANIFEST_LIBRARIES)
set(MANIFEST_LIBRARIES "${MANIFEST_LIBRARIES}|${FMODEX_BINARY_DIR}/fmodex.dll")
else(MANIFEST_LIBRARIES)
set(MANIFEST_LIBRARIES "--extra_libraries=${FMODEX_BINARY_DIR}/fmodex.dll")
endif(MANIFEST_LIBRARIES)
set(EXTRA_LINKER_FLAGS "/DELAYLOAD:fmodex.dll")
endif (FMODEX)
@@ -1463,6 +1475,7 @@ endif (FMODEX)
--build=${CMAKE_CURRENT_BINARY_DIR}
--dest=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}
--touch=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/touched.bat
${MANIFEST_LIBRARIES}
DEPENDS ${VIEWER_BINARY_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
)

14
indra/newview/llvovolume.cpp
View File

@@ -4211,6 +4211,11 @@ void LLVolumeGeometryManager::genDrawInfo(LLSpatialGroup* group, U32 mask, std::
fullbright = TRUE;
}
if (hud_group)
{ //all hud attachments are fullbright
fullbright = TRUE;
}
const LLTextureEntry* te = facep->getTextureEntry();
tex = facep->getTexture();
@@ -4236,7 +4241,6 @@ void LLVolumeGeometryManager::genDrawInfo(LLSpatialGroup* group, U32 mask, std::
}
}
else if (gPipeline.canUseVertexShaders()
&& group->mSpatialPartition->mPartitionType != LLViewerRegion::PARTITION_HUD
&& LLPipeline::sRenderBump
&& te->getShiny())
{ //shiny
@@ -4301,9 +4305,11 @@ void LLVolumeGeometryManager::genDrawInfo(LLSpatialGroup* group, U32 mask, std::
}
}
//not sure why this is here -- shiny HUD attachments maybe? -- davep 5/11/2010
if (!is_alpha && te->getShiny() && LLPipeline::sRenderBump)
{
if (!gPipeline.canUseVertexShaders() &&
!is_alpha &&
te->getShiny() &&
LLPipeline::sRenderBump)
{ //shiny as an extra pass when shaders are disabled
registerFace(group, facep, LLRenderPass::PASS_SHINY);
}
}

6
indra/newview/pipeline.cpp
View File

@@ -295,7 +295,7 @@ BOOL LLPipeline::sRenderBeacons = FALSE;
BOOL LLPipeline::sRenderHighlight = TRUE;
BOOL LLPipeline::sForceOldBakedUpload = FALSE;
S32 LLPipeline::sUseOcclusion = 0;
BOOL LLPipeline::sDelayVBUpdate = TRUE;
BOOL LLPipeline::sDelayVBUpdate = FALSE;
BOOL LLPipeline::sAutoMaskAlphaDeferred = TRUE;
BOOL LLPipeline::sAutoMaskAlphaNonDeferred = FALSE;
BOOL LLPipeline::sDisableShaders = FALSE;
@@ -456,7 +456,7 @@ void LLPipeline::init()
gSavedSettings.getControl("RenderAutoMaskAlphaNonDeferred")->getCommitSignal()->connect(boost::bind(&LLPipeline::refreshCachedSettings));
gSavedSettings.getControl("RenderUseFarClip")->getCommitSignal()->connect(boost::bind(&LLPipeline::refreshCachedSettings));
gSavedSettings.getControl("RenderAvatarMaxVisible")->getCommitSignal()->connect(boost::bind(&LLPipeline::refreshCachedSettings));
gSavedSettings.getControl("RenderDelayVBUpdate")->getCommitSignal()->connect(boost::bind(&LLPipeline::refreshCachedSettings));
//gSavedSettings.getControl("RenderDelayVBUpdate")->getCommitSignal()->connect(boost::bind(&LLPipeline::refreshCachedSettings));
}
@@ -802,7 +802,7 @@ void LLPipeline::refreshCachedSettings()
LLPipeline::sAutoMaskAlphaNonDeferred = gSavedSettings.getBOOL("RenderAutoMaskAlphaNonDeferred");
LLPipeline::sUseFarClip = gSavedSettings.getBOOL("RenderUseFarClip");
LLVOAvatar::sMaxVisible = (U32)gSavedSettings.getS32("RenderAvatarMaxVisible");
LLPipeline::sDelayVBUpdate = gSavedSettings.getBOOL("RenderDelayVBUpdate");
//LLPipeline::sDelayVBUpdate = gSavedSettings.getBOOL("RenderDelayVBUpdate");
LLPipeline::sUseOcclusion =
(!gUseWireframe

25
indra/newview/viewer_manifest.py
View File

@@ -208,14 +208,14 @@ class WindowsManifest(ViewerManifest):
self.path("dbghelp.dll")
# For using FMOD for sound... DJS
if self.prefix(src="../../libraries/i686-win32/lib/release", dst=""):
try:
self.path("fmod.dll")
pass
except:
print "Skipping fmod.dll - not found"
pass
self.end_prefix()
#~if self.prefix(src="../../libraries/i686-win32/lib/release", dst=""):
#~try:
#~self.path("fmod.dll")
#~pass
#~except:
#~print "Skipping fmod.dll - not found"
#~ pass
#~self.end_prefix()
# For textures
#if self.prefix(src="../../libraries/i686-win32/lib/release", dst=""):
@@ -320,6 +320,15 @@ class WindowsManifest(ViewerManifest):
self.path("wrap_oal.dll")
self.end_prefix()
if self.args['extra_libraries'] != None:
print self.args['extra_libraries']
path_list = self.args['extra_libraries'].split('|')
for path in path_list:
path_pair = path.rsplit('/', 1)
if self.prefix(src=path_pair[0], dst=""):
self.path(path_pair[1])
self.end_prefix()
# pull in the crash logger and updater from other projects
self.path(src='../win_crash_logger/%s/windows-crash-logger.exe' % self.args['configuration'], dst="win_crash_logger.exe")
self.path(src='../win_updater/%s/windows-updater.exe' % self.args['configuration'], dst="updater.exe")