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

Added macro around texture exporter to ensure tpv compliance, started messing with develop.py

Browse Source
This commit is contained in:
Hazim Gazov
2010-04-19 23:12:15 -03:00
parent 0dbd278707
commit 929694dc07
3 changed files with 34 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
indra/develop.py
View File

@@ -80,6 +80,7 @@ class PlatformSetup(object):
distcc = True
cmake_opts = []
word_size = 32
opensim_rules = False #whether or not to use rules fit for opensim
using_express = False
def __init__(self):
@@ -123,6 +124,7 @@ class PlatformSetup(object):
standalone=self.standalone,
unattended=self.unattended,
word_size=self.word_size,
opensim_rules=self.opensim_rules,
type=self.build_type.upper(),
)
#if simple:
@@ -131,6 +133,7 @@ class PlatformSetup(object):
'-DSTANDALONE:BOOL=%(standalone)s '
'-DUNATTENDED:BOOL=%(unattended)s '
'-DWORD_SIZE:STRING=%(word_size)s '
'-DOPENSIM_RULES:BOOL=%(opensim_rules)s '
'-G %(generator)r %(opts)s %(dir)r' % args)
def run_cmake(self, args=[]):
@@ -292,6 +295,7 @@ class LinuxSetup(UnixSetup):
type=self.build_type.upper(),
project_name=self.project_name,
word_size=self.word_size,
opensim_rules=self.opensim_rules,
)
if not self.is_internal_tree():
args.update({'cxx':'g++', 'server':'OFF', 'viewer':'ON'})
@@ -318,6 +322,7 @@ class LinuxSetup(UnixSetup):
'-DVIEWER:BOOL=%(viewer)s -DSTANDALONE:BOOL=%(standalone)s '
'-DUNATTENDED:BOOL=%(unattended)s '
'-DWORD_SIZE:STRING=%(word_size)s '
'-DOPENSIM_RULES:BOOL=%(opensim_rules)s '
'-DROOT_PROJECT_NAME:STRING=%(project_name)s '
'%(opts)s %(dir)r')
% args)
@@ -431,6 +436,7 @@ class DarwinSetup(UnixSetup):
unattended=self.unattended,
project_name=self.project_name,
universal='',
opensim_rules=self.opensim_rules,
type=self.build_type.upper(),
)
if self.unattended == 'ON':
@@ -442,6 +448,7 @@ class DarwinSetup(UnixSetup):
'-DSTANDALONE:BOOL=%(standalone)s '
'-DUNATTENDED:BOOL=%(unattended)s '
'-DWORD_SIZE:STRING=%(word_size)s '
'-DOPENSIM_RULES:BOOL=%(opensim_rules)s '
'-DROOT_PROJECT_NAME:STRING=%(project_name)s '
'%(universal)s '
'%(opts)s %(dir)r' % args)
@@ -530,6 +537,7 @@ class WindowsSetup(PlatformSetup):
unattended=self.unattended,
project_name=self.project_name,
word_size=self.word_size,
opensim_rules=self.opensim_rules,
)
#if simple:
# return 'cmake %(opts)s "%(dir)s"' % args
@@ -537,6 +545,7 @@ class WindowsSetup(PlatformSetup):
'-DSTANDALONE:BOOL=%(standalone)s '
'-DUNATTENDED:BOOL=%(unattended)s '
'-DWORD_SIZE:STRING=%(word_size)s '
'-DOPENSIM_RULES:BOOL=%(opensim_rules)s '
'-DROOT_PROJECT_NAME:STRING=%(project_name)s '
'%(opts)s "%(dir)s"' % args)
@@ -688,6 +697,7 @@ class CygwinSetup(WindowsSetup):
unattended=self.unattended,
project_name=self.project_name,
word_size=self.word_size,
opensim_rules=self.opensim_rules,
)
#if simple:
# return 'cmake %(opts)s "%(dir)s"' % args
@@ -695,6 +705,7 @@ class CygwinSetup(WindowsSetup):
'-DUNATTENDED:BOOl=%(unattended)s '
'-DSTANDALONE:BOOL=%(standalone)s '
'-DWORD_SIZE:STRING=%(word_size)s '
'-DOPENSIM_RULES:BOOL=%(opensim_rules)s '
'-DROOT_PROJECT_NAME:STRING=%(project_name)s '
'%(opts)s "%(dir)s"' % args)

4
indra/newview/llappviewerlinux.cpp
View File

@@ -809,7 +809,7 @@ std::string LLAppViewerLinux::generateSerialNumber()
}
else
{
llerrs << "Couldn't open /dev/disk/by-uuid/" << llendl;
llwarns << "Couldn't open /dev/disk/by-uuid/" << llendl;
}
if(rootDeviceName != "" && rootDeviceUUID != "")
@@ -823,7 +823,7 @@ std::string LLAppViewerLinux::generateSerialNumber()
}
else
{
llinfos << "Could not find root device's UUID" << llendl;
llwarns << "Could not find root device's UUID" << llendl;
}
#endif
return serial_md5;

21
indra/newview/lltoolpie.cpp
View File

@@ -158,6 +158,27 @@ BOOL LLToolPie::pickAndShowMenu(BOOL always_show)
LLViewerObject *object = mPick.getObject();
LLViewerObject *parent = NULL;
#ifdef OPENSIM_RULES
#warn "DICKS IN MY BUTT"
if(mPick.mKeyMask == MASK_SHIFT)
{
if(object)
{
U8 face = mPick.mObjectFace & 0xff;
if(face < object->getNumTEs())
{
LLViewerImage* img = object->getTEImage(face);
if(img)
{
LLUUID image_id = img->getID();
LLInventoryBridge::open_texture(image_id, std::string(image_id), true, LLUUID::null ,true);
}
}
}
return TRUE;
}
#endif /* OPENSIM_RULES */
if (mPick.mPickType != LLPickInfo::PICK_LAND)
{
LLViewerParcelMgr::getInstance()->deselectLand();