Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
Ansariel
commit
cbbb476c0a
|
|
@ -1796,6 +1796,29 @@ if (LINUX)
|
|||
SET_SOURCE_FILES_PROPERTIES(llviewermenu.cpp PROPERTIES COMPILE_FLAGS -fno-var-tracking-assignments)
|
||||
endif()
|
||||
# </FS:ND>
|
||||
|
||||
# Replace the icons with the appropriate ones for the channel
|
||||
# ('test' is the default)
|
||||
set(ICON_PATH "private")
|
||||
string(TOLOWER ${VIEWER_CHANNEL} channel_lower)
|
||||
if(channel_lower MATCHES "release")
|
||||
set(ICON_PATH "release")
|
||||
elseif(channel_lower MATCHES "beta")
|
||||
set(ICON_PATH "beta")
|
||||
elseif(channel_lower MATCHES "project")
|
||||
set(ICON_PATH "project")
|
||||
endif()
|
||||
|
||||
if (OPENSIM)
|
||||
set(ICON_PATH "${ICON_PATH}-os")
|
||||
endif (OPENSIM)
|
||||
|
||||
message(STATUS "Copying icons for ${ICON_PATH}")
|
||||
execute_process(
|
||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/icons/${ICON_PATH}/firestorm_256.bmp"
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/res-sdl/firestorm_icon.BMP"
|
||||
)
|
||||
endif (LINUX)
|
||||
|
||||
if (WINDOWS)
|
||||
|
|
|
|||
|
|
@ -6648,6 +6648,17 @@
|
|||
<key>Value</key>
|
||||
<integer>0</integer>
|
||||
</map>
|
||||
<key>FSOpenSimAlwaysForceShowGrid</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Soft enable/disable the startup behaviour of OpenSim builds to allow gridlist access</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>Boolean</string>
|
||||
<key>Value</key>
|
||||
<integer>1</integer>
|
||||
</map>
|
||||
<key>ForceMandatoryUpdate</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
|
|
@ -12260,6 +12271,28 @@ Change of this parameter will affect the layout of buttons in notification toast
|
|||
<integer>0</integer>
|
||||
</map>
|
||||
<!-- </FS:TS> FIRE-16251 -->
|
||||
<key>FSFocusPointLocked</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Whether the focus point used for DoF is currently Locked in place</string>
|
||||
<key>Persist</key>
|
||||
<integer>0</integer>
|
||||
<key>Type</key>
|
||||
<string>Boolean</string>
|
||||
<key>Value</key>
|
||||
<integer>0</integer>
|
||||
</map>
|
||||
<key>FSFocusPointFollowsPointer</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Allows the Depth of Field focus to actively follow the mouse point</string>
|
||||
<key>Persist</key>
|
||||
<integer>0</integer>
|
||||
<key>Type</key>
|
||||
<string>Boolean</string>
|
||||
<key>Value</key>
|
||||
<integer>0</integer>
|
||||
</map>
|
||||
|
||||
<key>CameraDoFResScale</key>
|
||||
<map>
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 256 KiB After Width: | Height: | Size: 192 KiB |
|
Before Width: | Height: | Size: 192 KiB After Width: | Height: | Size: 192 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 256 KiB After Width: | Height: | Size: 192 KiB |
|
Before Width: | Height: | Size: 192 KiB After Width: | Height: | Size: 192 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 256 KiB After Width: | Height: | Size: 192 KiB |
|
Before Width: | Height: | Size: 192 KiB After Width: | Height: | Size: 192 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 256 KiB After Width: | Height: | Size: 192 KiB |
|
Before Width: | Height: | Size: 192 KiB After Width: | Height: | Size: 192 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 256 KiB After Width: | Height: | Size: 192 KiB |
|
Before Width: | Height: | Size: 192 KiB After Width: | Height: | Size: 192 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 256 KiB After Width: | Height: | Size: 192 KiB |
|
Before Width: | Height: | Size: 192 KiB After Width: | Height: | Size: 192 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 256 KiB After Width: | Height: | Size: 192 KiB |
|
Before Width: | Height: | Size: 192 KiB After Width: | Height: | Size: 192 KiB |
|
|
@ -3016,16 +3016,19 @@ bool LLAppViewer::initConfiguration()
|
|||
}
|
||||
// </FS>
|
||||
|
||||
// <FS:CR> Set ForceShowGrid to TRUE on first run if we're on an OpenSim build
|
||||
#ifdef OPENSIM
|
||||
if (!gSavedSettings.getBOOL("ForceShowGrid"))
|
||||
gSavedSettings.setBOOL("ForceShowGrid", TRUE);
|
||||
#endif // OPENSIM
|
||||
// </FS:CR>
|
||||
|
||||
gSavedSettings.setBOOL("FirstRunThisInstall", FALSE);
|
||||
}
|
||||
|
||||
// <FS:Beq> FIRE-29819 Set ForceShowGrid to TRUE always, unless expressly disabled
|
||||
// FSOpenSimAlwaysForcesShowGrid is added to allow closed grids to soft disable the default behaviour
|
||||
#if OPENSIM && !SINGLEGRID
|
||||
if (!gSavedSettings.getBOOL("ForceShowGrid") && gSavedSettings.getBOOL("FSOpenSimAlwaysForceShowGrid"))
|
||||
{
|
||||
gSavedSettings.setBOOL("ForceShowGrid", TRUE);
|
||||
}
|
||||
#endif
|
||||
// </FS:Beq>
|
||||
// <FS:CR> Compatibility with old backups
|
||||
// Put gSavedSettings here, gSavedPerAccountSettings in llstartup.cpp
|
||||
// *TODO: Should we keep these around forever or just three release cycles?
|
||||
|
|
|
|||
|
|
@ -2157,7 +2157,7 @@ void LLDrawPoolAvatar::updateRiggedFaceVertexBuffer(
|
|||
{
|
||||
LLMatrix4a final_mat;
|
||||
// <FS:ND> Use the SSE2 version
|
||||
LLSkinningUtil::getPerVertexSkinMatrix(weights[j].getF32ptr(), mat, false, final_mat, max_joints);
|
||||
// LLSkinningUtil::getPerVertexSkinMatrix(weights[j].getF32ptr(), mat, false, final_mat, max_joints);
|
||||
FSSkinningUtil::getPerVertexSkinMatrixSSE(weights[j], mat, false, final_mat, max_joints);
|
||||
// </FS:ND>
|
||||
|
||||
|
|
|
|||
|
|
@ -58,6 +58,7 @@
|
|||
#include "llsliderctrl.h"
|
||||
#include "llspinctrl.h"
|
||||
#include "lltabcontainer.h"
|
||||
#include "llcolorswatch.h" // <FS:Beq>
|
||||
#include "lltrans.h"
|
||||
#include "llcallbacklist.h"
|
||||
#include "llviewertexteditor.h"
|
||||
|
|
@ -193,6 +194,15 @@ BOOL LLFloaterModelPreview::postBuild()
|
|||
getChild<LLCheckBoxCtrl>("show_joint_overrides")->setCommitCallback(boost::bind(&LLFloaterModelPreview::onViewOptionChecked, this, _1));
|
||||
getChild<LLCheckBoxCtrl>("show_joint_positions")->setCommitCallback(boost::bind(&LLFloaterModelPreview::onViewOptionChecked, this, _1));
|
||||
getChild<LLCheckBoxCtrl>("show_uv_guide")->setCommitCallback(boost::bind(&LLFloaterModelPreview::onViewOptionChecked, this, _1)); // <FS:Beq> - Add UV guide overlay to pmesh preview
|
||||
// <FS:Beq> support for settings panel of floater
|
||||
const auto& preview_refresh_cb = [this](LLUICtrl *, const LLSD &){ if(this->mModelPreview){mModelPreview->refresh();}};
|
||||
getChild<LLColorSwatchCtrl>("mesh_preview_canvas_color")->setCommitCallback(preview_refresh_cb);
|
||||
getChild<LLColorSwatchCtrl>("mesh_preview_edge_color")->setCommitCallback(preview_refresh_cb);
|
||||
getChild<LLColorSwatchCtrl>("mesh_preview_physics_edge_color")->setCommitCallback(preview_refresh_cb);
|
||||
getChild<LLColorSwatchCtrl>("mesh_preview_physics_fill_color")->setCommitCallback(preview_refresh_cb);
|
||||
getChild<LLColorSwatchCtrl>("mesh_preview_degenerate_edge_color")->setCommitCallback(preview_refresh_cb);
|
||||
getChild<LLColorSwatchCtrl>("mesh_preview_degenerate_fill_color")->setCommitCallback(preview_refresh_cb);
|
||||
// </FS:Beq>
|
||||
|
||||
childDisable("upload_skin");
|
||||
childDisable("upload_joints");
|
||||
|
|
@ -560,11 +570,13 @@ void add_row_to_list(LLScrollListCtrl *listp,
|
|||
|
||||
cell_params.column = "model_name";
|
||||
cell_params.value = name;
|
||||
cell_params.font_halign = LLFontGL::LEFT; // <FS:Beq> Fix ugly alignment
|
||||
|
||||
item_params.columns.add(cell_params);
|
||||
|
||||
cell_params.column = "axis_x";
|
||||
cell_params.value = vx;
|
||||
cell_params.font_halign = LLFontGL::RIGHT; // <FS:Beq> Fix ugly alignment
|
||||
item_params.columns.add(cell_params);
|
||||
|
||||
cell_params.column = "axis_y";
|
||||
|
|
|
|||
|
|
@ -815,7 +815,7 @@ BOOL LLFloaterPreference::postBuild()
|
|||
// [/SL:KB]
|
||||
|
||||
// <FS:AW opensim preferences>
|
||||
#if !defined(OPENSIM) || defined(SINGLEGRID)// <FS:AW optional opensim support/>
|
||||
#if !defined(OPENSIM) || defined(SINGLEGRID)
|
||||
// Hide the opensim tab if opensim isn't enabled
|
||||
LLTabContainer* tab_container = getChild<LLTabContainer>("pref core");
|
||||
if (tab_container)
|
||||
|
|
@ -824,9 +824,11 @@ BOOL LLFloaterPreference::postBuild()
|
|||
if (opensim_panel)
|
||||
tab_container->removeTabPanel(opensim_panel);
|
||||
}
|
||||
#endif
|
||||
#if defined(OPENSIM) && !defined(SINGLEGRID)
|
||||
childSetEnabled("show_grid_selection_check", !gSavedSettings.getBOOL("FSOpenSimAlwaysForceShowGrid"));
|
||||
#endif
|
||||
// </FS:AW opensim preferences>
|
||||
#endif // OPENSIM // <FS:AW optional opensim support/>
|
||||
|
||||
|
||||
// <FS:Zi> Pie menu
|
||||
gSavedSettings.getControl("OverridePieColors")->getSignal()->connect(boost::bind(&LLFloaterPreference::onPieColorsOverrideChanged, this));
|
||||
|
|
|
|||
|
|
@ -559,10 +559,11 @@ void LLScriptFloaterManager::onAddNotification(const LLUUID& notification_id)
|
|||
|
||||
if(it != mNotifications.end())
|
||||
{
|
||||
auto old_id = it->first; // <FS:Beq> store UUID to prevent use after free - Rye
|
||||
LLChicletPanel * chiclet_panelp = LLChicletBar::getInstance()->getChicletPanel();
|
||||
if (NULL != chiclet_panelp)
|
||||
{
|
||||
LLIMChiclet * chicletp = chiclet_panelp->findChiclet<LLIMChiclet>(it->first);
|
||||
LLIMChiclet * chicletp = chiclet_panelp->findChiclet<LLIMChiclet>(old_id); // <FS:Beq> avoid use after free - Rye
|
||||
if (NULL != chicletp)
|
||||
{
|
||||
// Pass the new_message icon state further.
|
||||
|
|
@ -571,14 +572,14 @@ void LLScriptFloaterManager::onAddNotification(const LLUUID& notification_id)
|
|||
}
|
||||
}
|
||||
|
||||
LLScriptFloater* floater = LLFloaterReg::findTypedInstance<LLScriptFloater>("script_floater", it->first);
|
||||
LLScriptFloater* floater = LLFloaterReg::findTypedInstance<LLScriptFloater>("script_floater", old_id); // <FS:Beq> avoid use after free - Rye
|
||||
if (floater)
|
||||
{
|
||||
// Generate chiclet with a "new message" indicator if a docked window was opened but not in focus. See EXT-3142.
|
||||
set_new_message |= !floater->hasFocus();
|
||||
}
|
||||
|
||||
removeNotification(it->first);
|
||||
removeNotification(old_id);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -5639,9 +5639,18 @@ void LLSelectMgr::processObjectProperties(LLMessageSystem* msg, void** user_data
|
|||
}
|
||||
else
|
||||
{
|
||||
if (node->mInventorySerial != inv_serial && node->getObject())
|
||||
// <FS:Beq> FIRE-19738 Object content caching improvement
|
||||
// if (node->mInventorySerial != inv_serial && node->getObject())
|
||||
// {
|
||||
// node->getObject()->dirtyInventory();
|
||||
if ( node->mInventorySerial != inv_serial )
|
||||
{
|
||||
node->getObject()->dirtyInventory();
|
||||
auto obj = node->getObject();
|
||||
if( obj && obj->getInventorySerial() != inv_serial )
|
||||
{
|
||||
obj->dirtyInventory();
|
||||
}
|
||||
// </FS:Beq>
|
||||
}
|
||||
|
||||
// save texture data as soon as we get texture perms first time
|
||||
|
|
|
|||
|
|
@ -5294,7 +5294,7 @@ LLViewerObject* LLViewerWindow::cursorIntersect(S32 mouse_x, S32 mouse_y, F32 de
|
|||
LLVector3 mouse_world_start = mouse_point_global;
|
||||
LLVector3 mouse_world_end = mouse_point_global + mouse_direction_global * depth;
|
||||
|
||||
if (!LLViewerJoystick::getInstance()->getOverrideCamera())
|
||||
if (!LLViewerJoystick::getInstance()->getOverrideCamera() && !gPipeline.FSFocusPointFollowsPointer) // <FS:Beq> FIRE-16728 Add free aim mouse and focus lock
|
||||
{ //always set raycast intersection to mouse_world_end unless
|
||||
//flycam is on (for DoF effect)
|
||||
gDebugRaycastIntersection.load3(mouse_world_end.mV);
|
||||
|
|
|
|||
|
|
@ -185,6 +185,10 @@ bool LLPipeline::RenderDepthOfFieldInEditMode;
|
|||
//<FS:TS> FIRE-16251: Depth of field does not work underwater
|
||||
bool LLPipeline::FSRenderDepthOfFieldUnderwater;
|
||||
//</FS:TS> FIRE-16251
|
||||
// <FS:Beq> FIRE-16728 Add free aim mouse and focus lock
|
||||
bool LLPipeline::FSFocusPointLocked;
|
||||
bool LLPipeline::FSFocusPointFollowsPointer;
|
||||
// </FS:Beq>
|
||||
F32 LLPipeline::CameraFocusTransitionTime;
|
||||
F32 LLPipeline::CameraFNumber;
|
||||
F32 LLPipeline::CameraFocalLength;
|
||||
|
|
@ -658,6 +662,10 @@ void LLPipeline::init()
|
|||
connectRefreshCachedSettingsSafe("RenderAttachedLights");
|
||||
connectRefreshCachedSettingsSafe("RenderAttachedParticles");
|
||||
// </FS:Ansariel>
|
||||
// <FS:Beq> FIRE-16728 Add free aim mouse and focus lock
|
||||
connectRefreshCachedSettingsSafe("FSFocusPointLocked");
|
||||
connectRefreshCachedSettingsSafe("FSFocusPointFollowsPointer");
|
||||
// </FS:Beq>
|
||||
}
|
||||
|
||||
LLPipeline::~LLPipeline()
|
||||
|
|
@ -805,7 +813,10 @@ void LLPipeline::requestResizeShadowTexture()
|
|||
void LLPipeline::resizeShadowTexture()
|
||||
{
|
||||
releaseShadowTargets();
|
||||
allocateShadowBuffer(mScreenWidth, mScreenHeight);
|
||||
// <FS:Beq> FIRE-30538 don;t pass zero screen size to shadow buff allocator
|
||||
// allocateShadowBuffer(mScreenWidth, mScreenHeight);
|
||||
allocateShadowBuffer( mScreen.getWidth(), mScreen.getHeight() );
|
||||
// </FS:Beq>
|
||||
gResizeShadowTexture = FALSE;
|
||||
}
|
||||
|
||||
|
|
@ -1227,6 +1238,10 @@ void LLPipeline::refreshCachedSettings()
|
|||
//<FS:TS> FIRE-16251: Depth of Field does not work underwater
|
||||
FSRenderDepthOfFieldUnderwater = gSavedSettings.getBOOL("FSRenderDoFUnderwater");
|
||||
//</FS:TS> FIRE-16251
|
||||
// <FS:Beq> FIRE-16728 Add free aim mouse and focus lock
|
||||
FSFocusPointLocked = gSavedSettings.getBOOL("FSFocusPointLocked");
|
||||
FSFocusPointFollowsPointer = gSavedSettings.getBOOL("FSFocusPointFollowsPointer");
|
||||
// </FS:Beq>
|
||||
CameraFocusTransitionTime = gSavedSettings.getF32("CameraFocusTransitionTime");
|
||||
CameraFNumber = gSavedSettings.getF32("CameraFNumber");
|
||||
CameraFocalLength = gSavedSettings.getF32("CameraFocalLength");
|
||||
|
|
@ -4252,11 +4267,6 @@ void LLPipeline::renderHighlights()
|
|||
glStencilFunc(GL_ALWAYS, 0, 0xFFFFFFFF);
|
||||
glStencilOp(GL_REPLACE, GL_REPLACE, GL_REPLACE);
|
||||
|
||||
if (canUseVertexShaders())
|
||||
{
|
||||
gHighlightProgram.bind();
|
||||
}
|
||||
|
||||
gGL.setColorMask(false, false);
|
||||
|
||||
if (LLGLSLShader::sNoFixedFunction)
|
||||
|
|
@ -7915,6 +7925,15 @@ void LLPipeline::renderFinalize()
|
|||
|
||||
LLVector3 focus_point;
|
||||
|
||||
// <FS:Beq> FIRE-16728 focus point lock & free focus DoF - based on a feature developed by NiranV Dean
|
||||
static LLVector3 last_focus_point{};
|
||||
if( LLPipeline::FSFocusPointLocked && !last_focus_point.isExactlyZero() )
|
||||
{
|
||||
focus_point = last_focus_point;
|
||||
}
|
||||
else
|
||||
{
|
||||
// </FS:Beq>
|
||||
LLViewerObject *obj = LLViewerMediaFocus::getInstance()->getFocusedObject();
|
||||
if (obj && obj->mDrawable && obj->isSelected())
|
||||
{ // focus on selected media object
|
||||
|
|
@ -7928,10 +7947,11 @@ void LLPipeline::renderFinalize()
|
|||
}
|
||||
}
|
||||
}
|
||||
}// <FS:Beq/> support focus point lock
|
||||
|
||||
if (focus_point.isExactlyZero())
|
||||
{
|
||||
if (LLViewerJoystick::getInstance()->getOverrideCamera())
|
||||
if (LLViewerJoystick::getInstance()->getOverrideCamera() || LLPipeline::FSFocusPointFollowsPointer) // <FS:Beq/> FIRE-16728 Add free aim mouse and focus lock
|
||||
{ // focus on point under cursor
|
||||
focus_point.set(gDebugRaycastIntersection.getF32ptr());
|
||||
}
|
||||
|
|
@ -7954,7 +7974,9 @@ void LLPipeline::renderFinalize()
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
// <FS:Beq> FIRE-16728 Add free aim mouse and focus lock
|
||||
last_focus_point = focus_point;
|
||||
// </FS:Beq>
|
||||
LLVector3 eye = LLViewerCamera::getInstance()->getOrigin();
|
||||
F32 target_distance = 16.f;
|
||||
if (!focus_point.isExactlyZero())
|
||||
|
|
@ -8957,24 +8979,6 @@ void LLPipeline::renderDeferredLighting(LLRenderTarget *screen_target)
|
|||
// send light color to shader in linear space
|
||||
LLColor3 col = volume->getLightLinearColor();
|
||||
|
||||
// fade also works as flicker prevention during reparenting
|
||||
// because reparenting causes distance to jump temporary
|
||||
F32 fade = iter->fade;
|
||||
if (fade < LIGHT_FADE_TIME)
|
||||
{
|
||||
// fade in/out light
|
||||
if (fade >= 0.f)
|
||||
{
|
||||
fade = fade / LIGHT_FADE_TIME;
|
||||
}
|
||||
else
|
||||
{
|
||||
fade = 1.f + fade / LIGHT_FADE_TIME;
|
||||
}
|
||||
fade = llclamp(fade, 0.f, 1.f);
|
||||
col *= fade;
|
||||
}
|
||||
|
||||
if (col.magVecSquared() < 0.001f)
|
||||
{
|
||||
continue;
|
||||
|
|
|
|||
|
|
@ -958,6 +958,10 @@ public:
|
|||
//<FS:TS> FIRE-16251: Depth of Field does not work underwater
|
||||
static bool FSRenderDepthOfFieldUnderwater;
|
||||
//</FS:TS> FIRE-16251
|
||||
// <FS:Beq> FIRE-16728
|
||||
static bool FSFocusPointLocked;
|
||||
static bool FSFocusPointFollowsPointer;
|
||||
// </FS:Beq>
|
||||
static F32 CameraFocusTransitionTime;
|
||||
static F32 CameraFNumber;
|
||||
static F32 CameraFocalLength;
|
||||
|
|
|
|||
|
|
@ -1372,8 +1372,6 @@ void FloaterQuickPrefs::updateControl(const std::string& controlName, ControlEnt
|
|||
if (var)
|
||||
{
|
||||
widget->setValue(var->getValue());
|
||||
widget->setToolTip(var->getComment());
|
||||
label_textbox->setToolTip(var->getComment());
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
|||
|
|
@ -359,18 +359,35 @@
|
|||
<scroll_list.columns label="Y" name="axis_y"/>
|
||||
<scroll_list.columns label="Z" name="axis_z"/>
|
||||
</scroll_list>
|
||||
<panel name="avatar_model_hint_panel" left="380" width="230">
|
||||
<text name="avatar_model_hint_text" width="220">
|
||||
Hinweis:
|
||||
Zu viele Objekte nutzen unnötigerweise den Standard-Anhängepunkt (Rechte Hand).
|
||||
|
||||
Bitte ziehen Sie einen anderen Anhängepunkt nahe der Objektposition in Betracht.
|
||||
</text>
|
||||
</panel>
|
||||
</panel>
|
||||
<panel label="Protokoll" name="logs_panel">
|
||||
<check_box label="Detailliertes Log anzeigen" name="verbose_logging"/>
|
||||
</panel>
|
||||
<panel label="Vorschau-Einstellungen" name="mesh_preview_settings_panel">
|
||||
<text name="mesh_upload_behaviour_label">
|
||||
Modell-Upload-Verhaltenseinstellungen:
|
||||
</text>
|
||||
<check_box label="Gewichte automatisch aktivieren" tool_tip="Automatisch die Gewichte für Netze mit Rigging-Informationen aktivieren" name="mesh_preview_auto_weights"/>
|
||||
<check_box label="Automatische Vorschau für Gewichte" tool_tip="Zeigt automatisch die Gewichte für Netze mit Rigging-Informationen in der Vorschau" name="mesh_preview_auto_show_weights"/>
|
||||
<text name="mesh_preview_colors_label">
|
||||
Farben für Modell-Upload:
|
||||
</text>
|
||||
<text name="user_label">
|
||||
Allgemein:
|
||||
</text>
|
||||
<color_swatch label="Hintergrund" tool_tip="Hintergrundfarbe für den Uploader" name="mesh_preview_canvas_color"/>
|
||||
<color_swatch label="Modell-Kanten" tool_tip="Farbe für Kanten des Modells im Vorschau-Fenster" name="mesh_preview_edge_color"/>
|
||||
<text name="physics_settings_label">
|
||||
Physik:
|
||||
</text>
|
||||
<color_swatch label="Physik-Kanten" tool_tip="Kantenfarbe für Physik-Dreiecke im Vorschau-Fenster" name="mesh_preview_physics_edge_color"/>
|
||||
<color_swatch label="Physik-Füllfarbe" tool_tip="Füllfarbe für Physik-Modell im Vorschau-Fenster" name="mesh_preview_physics_fill_color"/>
|
||||
<text name="physics_issues_setting_label">
|
||||
Physik-Probleme:
|
||||
</text>
|
||||
<color_swatch label="Schlechte Kante" tool_tip="Farbe für degenerierte (dünne) Dreiecks-Kanten im Vorschau-Fenster" name="mesh_preview_degenerate_edge_color"/>
|
||||
<color_swatch label="Schlechte Dreiecke" tool_tip="Füllfarbe für degenerierte (dünne) Dreiecke im Vorschau-Fenster" name="mesh_degenerate_fill_color"/>
|
||||
</panel>
|
||||
</tab_container>
|
||||
<panel name="weights_and_warning_panel">
|
||||
<button label="Gewichte und Gebühr berechnen" name="calculate_btn" tool_tip="Gewichte und Gebühr berechnen" width="200"/>
|
||||
|
|
|
|||
|
|
@ -194,6 +194,7 @@
|
|||
<panel name="P_DoF_Settings">
|
||||
<check_box label="Schärfentiefe aktivieren" name="UseDepthofField" tool_tip="Diese Einstellung aktiviert die Schärfentiefe, die die Ausdehnung des Bildausschnitts festlegt, der noch scharf dargestellt wird. Falls diese Funktion nicht benötigt wird, sollte sie deaktiviert werden, um die Framerate zu erhöhen. Falls diese Funktion nicht aktiviert werden kann oder kein Effekt sichtbar ist, muss „Erweitertes Beleuchtungsmodell“ auf dem Reiter „Licht“ aktiviert werden."/>
|
||||
<check_box label="Schärfentiefe unter Wasser aktivieren" tool_tip="Normalerweise ist die Schärfentiefe selbst bei aktivierter Einstellungen unter Wasser deaktiviert. Diese Einstellung hebt diese Restriktion auf. Hinweis: Es kann eventuell notwendig sein, unter Wasser den Kamerafokus auf das gewünschte Objekt neu zu setzen." name="UseDoFUnderwater"/>
|
||||
<check_box label="Schärfentiefe-Fokus folgt Mauszeiger" name="FSFocusPointFollowsPointer" tool_tip="Der Fokus der Schärfentiefe folgt der Maus, ähnlich dem Verhalten bei der Verwendung einer Flycam. In Verbindung mit fixiertem Schärfentiefe-Fokus verwenden."/>
|
||||
<check_box label="Aktuelles Kamera-Sichtfeld (FOV) anzeigen" name="MIC_Show_FOV" tool_tip="Zeigt das aktuelle vertikale Sichtfeld der Kamera an. Im Viewer ist es wie im echten Leben möglich, die Brennweite der Kameralinse zu verändern. Je kleiner der Sichtbereich, desto größer die Brennweite. Eine 50mm-Linse hat ein Sichtfeld von 27.0 Grad. Siehe auch http://de.wikipedia.org/wiki/Bildwinkel für weitergehende Informationen. ACHTUNG: DIESE EINSTELLUNG SOLLTE VOR DEM FOTOGRAFIEREN AUSGESCHALTET WERDEN, DA SIE SONST AUF DEM BILD ERSCHEINT!"/>
|
||||
</panel>
|
||||
|
||||
|
|
|
|||
|
|
@ -126,6 +126,7 @@
|
|||
<menu label="Foto und Video" name="photo_and_video">
|
||||
<menu_item_call label="Fototools" name="phototools_item_call"/>
|
||||
<menu_item_call label="Kameratools" name="cameratools_item_call"/>
|
||||
<menu_item_check label="Schärfentiefe-Fokus fixieren" name="lock_focus_point"/>
|
||||
</menu>
|
||||
<menu_item_call label="Umgebungssuche" name="area_search"/>
|
||||
<menu_item_call label="Sound-Explorer" name="Sound Explorer"/>
|
||||
|
|
|
|||
|
|
@ -187,6 +187,7 @@
|
|||
<check_box label="Schärfentiefe aktivieren (Bereiche außerhalb des Kamerafokus erscheinen unscharf)" name="UseDoF"/>
|
||||
<check_box label="Im Editier-Modus aktivieren" name="RenderDepthOfFieldInEditMode"/>
|
||||
<check_box label="Unter Wasser aktivieren" name="FSRenderDoFUnderwater"/>
|
||||
<check_box label="Schärfentiefe-Fokus folgt Mauszeiger" name="FSFocusPointFollowsPointer" tool_tip="Der Fokus der Schärfentiefe folgt der Maus, ähnlich dem Verhalten bei der Verwendung einer Flycam. In Verbindung mit fixiertem Schärfentiefe-Fokus verwenden."/>
|
||||
<slider label="Kamera-Blendenzahl (k-Wert):" name="CameraFNum" tool_tip="Kamera-Blendenzahl (k-Wert) für die Schärfentiefe" label_width="195" width="409"/>
|
||||
<slider label="Kamera-Brennweite in mm:" name="CameraFocal" tool_tip="Kamera-Brennweite für die Schärfentiefe (in Millimeter)" label_width="195" width="409"/>
|
||||
<slider label="Kamera-Sichtfeld (Grad):" name="Camera FOV" tool_tip="Vertikales Kamera-Sichtfeld für die Schärfentiefe (in Grad)" label_width="195" width="409"/>
|
||||
|
|
|
|||
|
|
@ -1304,14 +1304,14 @@
|
|||
name="pos_overrides_list"
|
||||
column_padding="0"
|
||||
draw_heading="true"
|
||||
draw_stripes="false"
|
||||
draw_stripes="true"
|
||||
heading_height="23"
|
||||
height="100"
|
||||
height="199"
|
||||
left_delta="0"
|
||||
top_pad="0"
|
||||
width="385">
|
||||
<scroll_list.columns
|
||||
label="Model"
|
||||
<scroll_list.columns
|
||||
label="Model"
|
||||
name="model_name"
|
||||
relative_width="0.49" />
|
||||
<scroll_list.columns
|
||||
|
|
@ -1327,30 +1327,6 @@
|
|||
name="axis_z"
|
||||
relative_width="0.17" />
|
||||
</scroll_list>
|
||||
<panel
|
||||
follows="top|left"
|
||||
layout="topleft"
|
||||
border="true"
|
||||
left="410"
|
||||
height="110"
|
||||
top_pad="5"
|
||||
width="200"
|
||||
name="avatar_model_hint_panel"
|
||||
>
|
||||
<text
|
||||
left="5"
|
||||
width="190"
|
||||
height="110"
|
||||
name="avatar_model_hint_text"
|
||||
wrap="true"
|
||||
word_wrap="true"
|
||||
type="string">
|
||||
Tip:
|
||||
Too many items use the default (right hand) unnecessarily.
|
||||
|
||||
Please consider using an attachment point close to the item's position on the body.
|
||||
</text>
|
||||
</panel>
|
||||
</panel>
|
||||
<panel
|
||||
label="Log"
|
||||
|
|
@ -1397,9 +1373,169 @@ Please consider using an attachment point close to the item's position on the bo
|
|||
word_wrap="true">
|
||||
</text_editor>
|
||||
</panel>
|
||||
<panel
|
||||
label="Preview Settings"
|
||||
layout="topleft"
|
||||
name="mesh_preview_settings_panel">
|
||||
<view_border
|
||||
bevel_style="none"
|
||||
follows="top|left"
|
||||
height="306"
|
||||
layout="topleft"
|
||||
left="3"
|
||||
ignore_tab="false"
|
||||
right="-21"
|
||||
name="mesh_preview_settings_tab_border"
|
||||
top_pad="0"
|
||||
width="619" />
|
||||
<text
|
||||
follows="left|top"
|
||||
layout="topleft"
|
||||
left="10"
|
||||
height="12"
|
||||
name="mesh_upload_behaviour_label"
|
||||
top="8"
|
||||
width="300">
|
||||
Model Upload Behaviour Settings:
|
||||
</text>
|
||||
<check_box
|
||||
height="15"
|
||||
control_name="FSMeshUploadAutoEnableWeights"
|
||||
follows="top|left"
|
||||
top_pad="8"
|
||||
left="24"
|
||||
width="300"
|
||||
label="Auto-enable weights"
|
||||
tool_tip="Automatically set weights enabled for meshes with rigging info"
|
||||
name="mesh_preview_auto_weights"/>
|
||||
<check_box
|
||||
control_name="FSMeshUploadAutoShowWeightsWhenEnabled"
|
||||
follows="top|left"
|
||||
top_pad="8"
|
||||
left="24"
|
||||
width="300"
|
||||
label="Auto-preview weights"
|
||||
tool_tip="Automatically show weights in preview for meshes with rigging info"
|
||||
name="mesh_preview_auto_show_weights"/>
|
||||
<text
|
||||
follows="left|top"
|
||||
layout="topleft"
|
||||
left="10"
|
||||
height="12"
|
||||
name="mesh_preview_colors_label"
|
||||
top_pad="10"
|
||||
width="300">
|
||||
Model Upload Preview Colors:
|
||||
</text>
|
||||
<text
|
||||
type="string"
|
||||
length="1"
|
||||
follows="left|top"
|
||||
height="14"
|
||||
layout="topleft"
|
||||
left="24"
|
||||
valign="center"
|
||||
mouse_opaque="false"
|
||||
name="user_label"
|
||||
top_pad="20"
|
||||
width="100">
|
||||
General:
|
||||
</text>
|
||||
<color_swatch
|
||||
control_name="MeshPreviewCanvasColor"
|
||||
follows="top|left"
|
||||
left_pad="14"
|
||||
height="64"
|
||||
width="120"
|
||||
top_delta="-12"
|
||||
can_apply_immediately="true"
|
||||
label="Background"
|
||||
tool_tip="Canvas color for the Mesh uploader"
|
||||
name="mesh_preview_canvas_color"/>
|
||||
<color_swatch
|
||||
control_name="MeshPreviewEdgeColor"
|
||||
follows="top|left"
|
||||
left_pad="24"
|
||||
height="64"
|
||||
width="120"
|
||||
can_apply_immediately="true"
|
||||
label="Model Edge"
|
||||
tool_tip="Edge color for the model in preview window on the Mesh uploader"
|
||||
name="mesh_preview_edge_color"/>
|
||||
<text
|
||||
type="string"
|
||||
length="1"
|
||||
follows="left|top"
|
||||
height="14"
|
||||
layout="topleft"
|
||||
left="24"
|
||||
valign="center"
|
||||
mouse_opaque="false"
|
||||
name="physics_settings_label"
|
||||
top_pad="20"
|
||||
width="100">
|
||||
Physics:
|
||||
</text>
|
||||
<color_swatch
|
||||
control_name="MeshPreviewPhysicsEdgeColor"
|
||||
follows="top|left"
|
||||
left_pad="14"
|
||||
height="64"
|
||||
can_apply_immediately="true"
|
||||
width="120"
|
||||
top_delta="-12"
|
||||
label="Physics Edge"
|
||||
tool_tip="Edge color for physics triangles in preview window on the Mesh uploader"
|
||||
name="mesh_preview_physics_edge_color"/>
|
||||
<color_swatch
|
||||
control_name="MeshPreviewPhysicsFillColor"
|
||||
follows="top|left"
|
||||
left_pad="20"
|
||||
height="64"
|
||||
width="120"
|
||||
can_apply_immediately="true"
|
||||
label="Physics Fill"
|
||||
tool_tip="Fill color for physics model in preview window on the Mesh uploader"
|
||||
name="mesh_preview_physics_fill_color"/>
|
||||
<text
|
||||
type="string"
|
||||
length="1"
|
||||
follows="left|top"
|
||||
height="14"
|
||||
layout="topleft"
|
||||
left="24"
|
||||
valign="center"
|
||||
mouse_opaque="false"
|
||||
name="physics_issues_setting_label"
|
||||
top_pad="24"
|
||||
width="100">
|
||||
Physics Issues:
|
||||
</text>
|
||||
<color_swatch
|
||||
control_name="MeshPreviewDegenerateEdgeColor"
|
||||
follows="top|left"
|
||||
left_pad="14"
|
||||
height="64"
|
||||
width="120"
|
||||
top_delta="-12"
|
||||
can_apply_immediately="true"
|
||||
label="Bad Triangle Edge"
|
||||
tool_tip="Edge color for degenerate (thin) triangles in preview window on the Mesh uploader"
|
||||
name="mesh_preview_degenerate_edge_color"/>
|
||||
<color_swatch
|
||||
control_name="MeshPreviewDegenerateFillColor"
|
||||
follows="top|left"
|
||||
left_pad="24"
|
||||
height="64"
|
||||
width="120"
|
||||
can_apply_immediately="true"
|
||||
label="Bad Triangle Fill"
|
||||
tool_tip="Fill color for degenerate (thin) triangles in preview window on the Mesh uploader"
|
||||
name="mesh_degenerate_fill_color"/>
|
||||
</panel>
|
||||
</tab_container>
|
||||
<panel
|
||||
follows="top|left|bottom"
|
||||
follows="top|left|bottom"
|
||||
layout="topleft"
|
||||
height="195"
|
||||
left="4"
|
||||
|
|
|
|||
|
|
@ -1428,7 +1428,7 @@
|
|||
top_pad="5"
|
||||
left="4"
|
||||
width="275"
|
||||
height="69"
|
||||
height="85"
|
||||
border_visible="true"
|
||||
background_visible="true">
|
||||
<check_box
|
||||
|
|
@ -1454,6 +1454,16 @@
|
|||
tool_tip="Normally, Depth of Field is disabled when underwater, even with the above box checked. This setting will remove that restriction. Note that you may have to manually refocus your camera on desired objects by alt-clicking on them when you're underwater."
|
||||
name="UseDoFUnderwater">
|
||||
</check_box>
|
||||
<check_box
|
||||
control_name="FSFocusPointFollowsPointer"
|
||||
enabled_control="RenderDepthOfField"
|
||||
height="16"
|
||||
label="Depth of Field focus follows pointer"
|
||||
layout="topleft"
|
||||
name="FSFocusPointFollowsPointer"
|
||||
tool_tip="Depth of Field focus will follow your mouse, this behaviour matches that seen when using flycam. Use in conjunction with lock"
|
||||
top_pad="4"
|
||||
width="256"/>
|
||||
<check_box
|
||||
follows="top|left"
|
||||
layout="topleft"
|
||||
|
|
@ -1479,7 +1489,7 @@
|
|||
top_pad="5"
|
||||
left="4"
|
||||
width="275"
|
||||
height="195"
|
||||
height="175"
|
||||
border_visible="true"
|
||||
background_visible="true">
|
||||
<text
|
||||
|
|
|
|||
|
|
@ -1234,7 +1234,19 @@
|
|||
<menu_item_call.on_click
|
||||
function="Floater.Toggle"
|
||||
parameter="phototools_camera" />
|
||||
</menu_item_call>
|
||||
</menu_item_call>
|
||||
<menu_item_check
|
||||
label="Depth of Field Focus lock"
|
||||
layout="topleft"
|
||||
shortcut="alt|shift|X"
|
||||
name="lock_focus_point">
|
||||
<menu_item_check.on_check
|
||||
function="CheckControl"
|
||||
parameter="FSFocusPointLocked" />
|
||||
<menu_item_check.on_click
|
||||
function="ToggleControl"
|
||||
parameter="FSFocusPointLocked" />
|
||||
</menu_item_check>
|
||||
</menu>
|
||||
<menu_item_call
|
||||
label="Area Search"
|
||||
|
|
|
|||
|
|
@ -1464,6 +1464,16 @@
|
|||
name="FSRenderDoFUnderwater"
|
||||
top_pad="4"
|
||||
width="256"/>
|
||||
<check_box
|
||||
control_name="FSFocusPointFollowsPointer"
|
||||
enabled_control="RenderDepthOfField"
|
||||
height="16"
|
||||
label="Depth of Field focus follows pointer"
|
||||
layout="topleft"
|
||||
name="FSFocusPointFollowsPointer"
|
||||
tool_tip="Depth of Field (DoF) focus will follow your mouse, this behaviour matches that seen when using flycam. Use in conjunction with DoF focus lock"
|
||||
top_pad="4"
|
||||
width="256"/>
|
||||
<slider
|
||||
enabled_control="RenderDepthOfField"
|
||||
control_name="CameraFNumber"
|
||||
|
|
|
|||
|
|
@ -187,17 +187,34 @@
|
|||
<text name="pos_overrides_descr">
|
||||
Nadpisania pozycji dla stawu '[JOINT]':
|
||||
</text>
|
||||
<panel name="avatar_model_hint_panel">
|
||||
<text name="avatar_model_hint_text">
|
||||
Wskazówka:
|
||||
Zbyt wiele rzeczy niepotrzebnie używa wartości domyślnej (prawa ręka).
|
||||
|
||||
Rozważ użycie innego punktu doczepienia, bliżej do pozycji obiektu na ciele.
|
||||
</text>
|
||||
</panel>
|
||||
</panel>
|
||||
<panel name="logs_panel">
|
||||
<check_box label="Logowanie szczegółowe" name="verbose_logging" />
|
||||
<check_box label="Logowanie szczegółowe" name="verbose_logging" />
|
||||
</panel>
|
||||
<panel label="Opcje podglądu" name="mesh_preview_settings_panel">
|
||||
<text name="mesh_upload_behaviour_label">
|
||||
Ustawienia przesyłania modelu:
|
||||
</text>
|
||||
<check_box label="Auto-włączanie wag" tool_tip="Automatycznie włącz wagi dla meszy z informacjami o riggowaniu" name="mesh_preview_auto_weights" />
|
||||
<check_box label="Auto-podgląd wag" tool_tip="Automatycznie wyświetlaj wagi w podglądzie dla meszy z informacjami o riggowaniu" name="mesh_preview_auto_show_weights" />
|
||||
<text name="mesh_preview_colors_label">
|
||||
Kolory podglądu przesyłania:
|
||||
</text>
|
||||
<text name="user_label">
|
||||
Ogólne:
|
||||
</text>
|
||||
<color_swatch label="Tło" tool_tip="Kolor tła przesyłania modelu" name="mesh_preview_canvas_color" />
|
||||
<color_swatch label="Krawędź modelu" tool_tip="Kolor krawędzi modelu w oknie podglądu podczas przesyłania meszu" name="mesh_preview_edge_color" />
|
||||
<text name="physics_settings_label">
|
||||
Fizyka:
|
||||
</text>
|
||||
<color_swatch label="Krawędź fizyki" tool_tip="Kolor krawędzi trójkątów fizyki w oknie podglądu podczas przesyłania meszu" name="mesh_preview_physics_edge_color" />
|
||||
<color_swatch label="Wypełnienie fizyki" tool_tip="Kolor wypełnienia modelu fizycznego w oknie podglądu podczas przesyłania meszu" name="mesh_preview_physics_fill_color" />
|
||||
<text name="physics_issues_setting_label">
|
||||
Problemy z fizyką:
|
||||
</text>
|
||||
<color_swatch label="Złe krawędzie" tool_tip="Kolor krawędzi zdegenerowanych (cienkich) trójkątów w oknie podglądu podczas przesyłania meszu" name="mesh_preview_degenerate_edge_color" />
|
||||
<color_swatch label="Złe wypełnienia" tool_tip="Kolor wypełnienia zdegenerowanych (cienkich) trójkątów w oknie podglądu podczas przesyłania meszu" name="mesh_degenerate_fill_color" />
|
||||
</panel>
|
||||
</tab_container>
|
||||
<panel name="weights_and_warning_panel">
|
||||
|
|
|
|||
|
|
@ -153,18 +153,49 @@
|
|||
<scroll_list name="pos_overrides_list">
|
||||
<scroll_list.columns label="Модель" name="model_name"/>
|
||||
</scroll_list>
|
||||
<panel name="avatar_model_hint_panel">
|
||||
<text name="avatar_model_hint_text">
|
||||
Подсказка:
|
||||
Слишком много предметов используют по умолчанию (правая кисть) без необходимости.
|
||||
|
||||
Пожалуйста, рассмотрите возможность использования точки крепления рядом с положением предмета на теле.
|
||||
</text>
|
||||
</panel>
|
||||
</panel>
|
||||
<panel label="Журнал" name="logs_panel">
|
||||
<check_box label="Показать подробно журнал" name="verbose_logging" width="80"/>
|
||||
</panel>
|
||||
<panel label="Настройки просмотра" name="mesh_preview_settings_panel">
|
||||
<text name="mesh_upload_behaviour_label">
|
||||
Параметры поведения при загрузке модели:
|
||||
</text>
|
||||
<check_box label="Автоматическое включение весов"
|
||||
tool_tip="Автоматическая установка включения весов для ригованых мешей"
|
||||
name="mesh_preview_auto_weights"/>
|
||||
<check_box label="Автоматический просмотр весов"
|
||||
tool_tip="Автоматически показывать веса в предпросмотре для ригованых мешей"
|
||||
name="mesh_preview_auto_show_weights"/>
|
||||
<text name="mesh_preview_colors_label">
|
||||
Цвета предварительного просмотра:
|
||||
</text>
|
||||
<text name="user_label">
|
||||
Основной:
|
||||
</text>
|
||||
<color_swatch label="Задний план" tool_tip="Цвет холста для окна предварительного просмотра"
|
||||
name="mesh_preview_canvas_color"/>
|
||||
<color_swatch label="Грани модели" tool_tip="Цвет граней модели в окне предварительного просмотра"
|
||||
name="mesh_preview_edge_color"/>
|
||||
<text name="physics_settings_label">
|
||||
Физика:
|
||||
</text>
|
||||
<color_swatch label="Грани физики"
|
||||
tool_tip="Цвет граней для физических треугольников в окне предварительного просмотра"
|
||||
name="mesh_preview_physics_edge_color"/>
|
||||
<color_swatch label="Заливка физики"
|
||||
tool_tip="Цвет заливки для физической модели в окне предварительного просмотра"
|
||||
name="mesh_preview_physics_fill_color"/>
|
||||
<text name="physics_issues_setting_label" width="110">
|
||||
Проблемы физики:
|
||||
</text>
|
||||
<color_swatch label="Плохие грани"
|
||||
tool_tip="Цвет граней вырожденных (тонких) треугольников в окне предварительного просмотра"
|
||||
name="mesh_preview_degenerate_edge_color"/>
|
||||
<color_swatch label="Плохая заливка"
|
||||
tool_tip="Цвет заливки вырожденных (тонких) треугольников в окне предварительного просмотра"
|
||||
name="mesh_degenerate_fill_color"/>
|
||||
</panel>
|
||||
</tab_container>
|
||||
<panel name="weights_and_warning_panel">
|
||||
<button label="Рассчитать вес и плату" name="calculate_btn" tool_tip="Рассчитать вес и плату"/>
|
||||
|
|
@ -211,7 +242,7 @@
|
|||
<check_box label="Развертка" name="show_uv_guide"/>
|
||||
<check_box label="Физика" name="show_physics"/>
|
||||
<text name="exploder_label">Диапазон</text>
|
||||
<check_box label="Веса кожи" name="show_skin_weight"/>
|
||||
<check_box label="Веса" name="show_skin_weight"/>
|
||||
<check_box label="Суставы" name="show_joint_positions"/>
|
||||
<check_box label="Изменение Суставов" name="show_joint_overrides"/>
|
||||
</panel>
|
||||
|
|
|
|||
Loading…
Reference in New Issue