Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Merge with develop

Browse source
This commit is contained in:
kervala 2016-10-23 16:29:49 +02:00
parent bb9608bcea
commit 627dea4a06
4 changed files with 68 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
code/nel/tools/3d/build_interface/main.cpp
View file

@ -209,6 +209,7 @@ int main(int argc, char **argv)
NLMISC::CCmdArgs args; NLMISC::CCmdArgs args;
args.setDescription("Build a huge interface texture from several small elements to optimize video memory usage."); args.setDescription("Build a huge interface texture from several small elements to optimize video memory usage.");
args.addArg("f", "format", "format", "Output format (png or tga)");
args.addArg("s", "subset", "existing_uv_txt_name", "Build a subset of an existing interface definition while preserving the existing texture ids, to support freeing up VRAM by switching to the subset without rebuilding the entire interface."); args.addArg("s", "subset", "existing_uv_txt_name", "Build a subset of an existing interface definition while preserving the existing texture ids, to support freeing up VRAM by switching to the subset without rebuilding the entire interface.");
args.addArg("x", "extract", "", "Extract all interface elements from <output_filename> to <input_path>."); args.addArg("x", "extract", "", "Extract all interface elements from <output_filename> to <input_path>.");
args.addAdditionalArg("output_filename", "PNG or TGA file to generate", true); args.addAdditionalArg("output_filename", "PNG or TGA file to generate", true);
@ -229,12 +230,26 @@ int main(int argc, char **argv)
// extract all interface elements // extract all interface elements
bool extractElements = args.haveArg("x"); bool extractElements = args.haveArg("x");
// output format
std::string outputFormat;
if (args.haveArg("f"))
{
outputFormat = args.getArg("f").front();
if (outputFormat != "png" && outputFormat != "tga")
{
outString(toString("ERROR: Format %s not supported, only png and tga formats are", outputFormat.c_str()));
return -1;
}
}
std::vector<std::string> inputDirs = args.getAdditionalArg("input_path"); std::vector<std::string> inputDirs = args.getAdditionalArg("input_path");
string fmtName = args.getAdditionalArg("output_filename").front(); string fmtName = args.getAdditionalArg("output_filename").front();
// append PNG extension if no one provided // append PNG extension if no one provided
if (fmtName.rfind('.') == string::npos) fmtName += ".png"; if (fmtName.rfind('.') == string::npos) fmtName += "." + (outputFormat.empty() ? "png":outputFormat);
if (extractElements) if (extractElements)
{ {
@ -323,6 +338,14 @@ int main(int argc, char **argv)
sTGAname = inputDirs.front() + "/" + tgaName; sTGAname = inputDirs.front() + "/" + tgaName;
// force specific format instead of using original one
if (!outputFormat.empty())
{
sTGAname = sTGAname.substr(0, sTGAname.rfind('.'));
sTGAname += "." + outputFormat;
}
// write the file
if (writeFileDependingOnFilename(sTGAname, bitmap)) if (writeFileDependingOnFilename(sTGAname, bitmap))
{ {
outString(toString("Writing file %s", sTGAname.c_str())); outString(toString("Writing file %s", sTGAname.c_str()));

80
code/ryzom/client/data/gamedev/interfaces_v3/widgets.xml
View file

@ -147,7 +147,7 @@
id="real_txt" id="real_txt"
posref="ML ML" posref="ML ML"
x="26" x="26"
y="-2" y="0"
fontsize="12" fontsize="12"
shadow="true" shadow="true"
hardtext="uimGcmTradePact" hardtext="uimGcmTradePact"
@ -202,7 +202,7 @@
id="real_txt" id="real_txt"
posref="ML ML" posref="ML ML"
x="26" x="26"
y="-2" y="0"
fontsize="12" fontsize="12"
shadow="true" shadow="true"
hardtext="uimGcmTradePact" hardtext="uimGcmTradePact"
@ -230,7 +230,7 @@
win_priority="%win_priority_world_space" win_priority="%win_priority_world_space"
posref="BL BM" posref="BL BM"
use_cursor="false"> use_cursor="false">
<group id="right" <group id="right"
child_resize_w="true" child_resize_w="true"
child_resize_h="true" child_resize_h="true"
@ -347,7 +347,7 @@
render_layer="1" render_layer="1"
texture="" texture=""
global_color="false" /> global_color="false" />
<view type="bitmap" <view type="bitmap"
id="win_top" id="win_top"
posparent="info2" posparent="info2"
@ -455,7 +455,7 @@
color="128 128 128 255" color="128 128 128 255"
global_color="false" /> global_color="false" />
</group> </group>
<ctrl type="sheet" <ctrl type="sheet"
id="guild_logo" id="guild_logo"
posref="TL TR" posref="TL TR"
@ -484,7 +484,7 @@
render_layer="2" render_layer="2"
texture="" texture=""
global_color="false" /> global_color="false" />
<group id="right_pvp" <group id="right_pvp"
posref="TR TL" posref="TR TL"
posparent="right" posparent="right"
@ -746,7 +746,7 @@
opened="true" opened="true"
child_resize_w="true" child_resize_w="true"
child_resize_h="true" child_resize_h="true"
win_priority="%win_priority_world_space" win_priority="%win_priority_world_space"
posref="BL BM" posref="BL BM"
use_cursor="true"> use_cursor="true">
@ -1028,9 +1028,9 @@
<!-- NOT USED FOR THE MOMENT !!! <!-- NOT USED FOR THE MOMENT !!!
<template name="3dbulle_R" id="" > <template name="3dbulle_R" id="" >
<group id="#id" type="container" header_active="false" options="no_bordure" openable="false" savable="false" resizer="true" movable="false" right_button="false" opened="true" child_resize_w="true" w="0" max_w="256" min_w="48" h="48" > <group id="#id" type="container" header_active="false" options="no_bordure" openable="false" savable="false" resizer="true" movable="false" right_button="false" opened="true" child_resize_w="true" w="0" max_w="256" min_w="48" h="48" >
<group id="header_opened" x="0" y="0" child_resize_w="true" w="0" child_resize_h="true" h="0" max_w="256" min_w="48" max_h="256" min_h="48" posref="TL TL" > <group id="header_opened" x="0" y="0" child_resize_w="true" w="0" child_resize_h="true" h="0" max_w="256" min_w="48" max_h="256" min_h="48" posref="TL TL" >
<group id="window" x="0" y="0" child_resize_w="true" w="0" child_resize_h="true" h="0" posref="TL TL" > <group id="window" x="0" y="0" child_resize_w="true" w="0" child_resize_h="true" h="0" posref="TL TL" >
<view type="bitmap" id="win_M" posref="MM MM" scale="true" sizeref="wh" w="-10" h="-10" texture="Bulle_M.tga" global_color="false"/> <view type="bitmap" id="win_M" posref="MM MM" scale="true" sizeref="wh" w="-10" h="-10" texture="Bulle_M.tga" global_color="false"/>
<view type="bitmap" id="win_T" posparent="win_M" posref="TL BL" scale="true" sizeref="w" w="0" h="5" texture="Bulle_T.tga" global_color="false"/> <view type="bitmap" id="win_T" posparent="win_M" posref="TL BL" scale="true" sizeref="w" w="0" h="5" texture="Bulle_T.tga" global_color="false"/>
@ -1041,19 +1041,19 @@
<view type="bitmap" id="win_TR" posref="TR TR" texture="Bulle_TR.tga" global_color="false"/> <view type="bitmap" id="win_TR" posref="TR TR" texture="Bulle_TR.tga" global_color="false"/>
<view type="bitmap" id="win_BL" posref="BL BL" texture="Bulle_BL.tga" global_color="false"/> <view type="bitmap" id="win_BL" posref="BL BL" texture="Bulle_BL.tga" global_color="false"/>
<view type="bitmap" id="win_BR" posref="BR BR" texture="Bulle_BR.tga" global_color="false"/> <view type="bitmap" id="win_BR" posref="BR BR" texture="Bulle_BR.tga" global_color="false"/>
<view type="text" id="text" posref="TL TL" x="5" y="-5" hardtext="#hardtext" <view type="text" id="text" posref="TL TL" x="5" y="-5" hardtext="#hardtext"
fontsize="12" justification="justified" color="0 0 0 255" global_color="false" fontsize="12" justification="justified" color="0 0 0 255" global_color="false"
multi_line="true" multi_line_space="0" line_maxw="160" multi_line_maxw_only="true" /> multi_line="true" multi_line_space="0" line_maxw="160" multi_line_maxw_only="true" />
<! - Yoyo: Fake to have minimum bubble size - > <! - Yoyo: Fake to have minimum bubble size - >
<group id="min_w" posparent="text" posref="TL TL" x="0" y="0" w="48" h="14" /> <group id="min_w" posparent="text" posref="TL TL" x="0" y="0" w="48" h="14" />
</group> </group>
<view type="bitmap" id="win_talk" posref="BL TL" x="24" y="2" posparent="window" texture="Bulle_Say_R.tga" global_color="false"/> <view type="bitmap" id="win_talk" posref="BL TL" x="24" y="2" posparent="window" texture="Bulle_Say_R.tga" global_color="false"/>
</group> </group>
</group> </group>
</template> </template>
--> -->
@ -1249,7 +1249,7 @@
</group> </group>
</group> </group>
</template> </template>
<!-- * Bulle de dialogue dynamique a gauche du perso <!-- * Bulle de dialogue dynamique a gauche du perso
textid of the views are updated by code * --> textid of the views are updated by code * -->
<style style="dynchat_desc" <style style="dynchat_desc"
type="text" type="text"
@ -1938,13 +1938,13 @@
<proc id="test_can_drop"> --> <proc id="test_can_drop"> -->
<!-- If the item is from the inventory, can drop if it is an item --> <!-- If the item is from the inventory, can drop if it is an item -->
<!-- <!--
<action handler="isitem" params="@0" cond="eq(getSheetSelectionGroup(getDraggedSheet()), 'inventory_selection')"/> <action handler="isitem" params="@0" cond="eq(getSheetSelectionGroup(getDraggedSheet()), 'inventory_selection')"/>
--> -->
<!-- If the items comes from a bot inventory, can drop on an empty slot only. The source must also be an item --> <!-- If the items comes from a bot inventory, can drop on an empty slot only. The source must also be an item -->
<!-- <!--
<action handler="itemtoemptyslottest" params="@0" cond="eq(getSheetSelectionGroup(getDraggedSheet()), 'buy_selection')"/> <action handler="itemtoemptyslottest" params="@0" cond="eq(getSheetSelectionGroup(getDraggedSheet()), 'buy_selection')"/>
--> -->
<!-- <!--
</proc> </proc>
--> -->
<proc id="test_can_drop"> <proc id="test_can_drop">
@ -2414,7 +2414,7 @@
<!-- ********** --> <!-- ********** -->
<!-- * SETS * --> <!-- * SETS * -->
<!-- ********** --> <!-- ********** -->
<!-- test if drop can be done depending on the mode <!-- test if drop can be done depending on the mode
Param 0 is src=... (filled by code) Param 0 is src=... (filled by code)
--> -->
<proc id="slot_can_drop"> <proc id="slot_can_drop">
@ -2426,7 +2426,7 @@
params="@0|test_empty=true" /> params="@0|test_empty=true" />
</proc> </proc>
<!-- Exemple of ifthenelse function <!-- Exemple of ifthenelse function
<view type="text" id="notabene" posparent="handr" posref="MM MM" color="255 255 255 255" fontsize="12" shadow="true" hardtext="0" /> <view type="text" id="notabene" posparent="handr" posref="MM MM" color="255 255 255 255" fontsize="12" shadow="true" hardtext="0" />
<link expr="ifthenelse(isRangeWeapon (@%set_base:#setnumber:%set_r),str('RW'),str('.'))" target="notabene:hardtext" /> <link expr="ifthenelse(isRangeWeapon (@%set_base:#setnumber:%set_r),str('RW'),str('.'))" target="notabene:hardtext" />
--> -->
<!-- template for border inside of a group --> <!-- template for border inside of a group -->
@ -4112,7 +4112,7 @@
texture="ico_heal.tga" texture="ico_heal.tga"
global_color="false" global_color="false"
posref="BL TL" posref="BL TL"
posparent="text" posparent="text"
active="true"/> active="true"/>
<view type="bitmap" <view type="bitmap"
id="sta_buff" id="sta_buff"
@ -4282,7 +4282,7 @@
posparent="text" posparent="text"
xcost="230" xcost="230"
line_maxw="185" line_maxw="185"
multi_line_maxw_only="true" multi_line_maxw_only="true"
param_deltax="13" param_deltax="13"
sizeref="none" sizeref="none"
child_resize_w="true" child_resize_w="true"
@ -4290,7 +4290,7 @@
global_color="false"/> global_color="false"/>
</group> </group>
<!-- Over Text used for SingleLine TextView that are clamped (group_tree, keys interface....) --> <!-- Over Text used for SingleLine TextView that are clamped (group_tree, keys interface....) -->
<group id="over_extend_view_text" <group id="over_extend_view_text"
child_resize_w="true" child_resize_w="true"
@ -4654,7 +4654,7 @@
params="dblink=%inventory_open_value|value=isOpen('ui:interface:inventory')" /> params="dblink=%inventory_open_value|value=isOpen('ui:interface:inventory')" />
<!-- force to open the inventory --> <!-- force to open the inventory -->
<!-- <action handler="set_open" cond="le(1,@%bag_nb)" params="target=ui:interface:userbags|open='true'"/> <!-- <action handler="set_open" cond="le(1,@%bag_nb)" params="target=ui:interface:userbags|open='true'"/>
<action handler="set_open" cond="le(1,@%bag_nb)" params="target=ui:interface:userbag1|open='true'"/> <action handler="set_open" cond="le(1,@%bag_nb)" params="target=ui:interface:userbag1|open='true'"/>
<action handler="set_open" cond="le(2,@%bag_nb)" params="target=ui:interface:userbag2|open='true'"/> <action handler="set_open" cond="le(2,@%bag_nb)" params="target=ui:interface:userbag2|open='true'"/>
<action handler="set_open" cond="le(3,@%bag_nb)" params="target=ui:interface:userbag3|open='true'"/> <action handler="set_open" cond="le(3,@%bag_nb)" params="target=ui:interface:userbag3|open='true'"/>
<action handler="set_open" cond="le(4,@%bag_nb)" params="target=ui:interface:userbag4|open='true'"/> <action handler="set_open" cond="le(4,@%bag_nb)" params="target=ui:interface:userbag4|open='true'"/>
@ -4678,7 +4678,7 @@
<action handler="set_open" cond="and(eq(@%bag2_touched, 0), le(2,@%bag_nb))" params="target=ui:interface:userbag2|open=@@%bag2_open_value"/> <action handler="set_open" cond="and(eq(@%bag2_touched, 0), le(2,@%bag_nb))" params="target=ui:interface:userbag2|open=@@%bag2_open_value"/>
<action handler="set_open" cond="and(eq(@%bag3_touched, 0), le(3,@%bag_nb))" params="target=ui:interface:userbag3|open=@@%bag3_open_value"/> <action handler="set_open" cond="and(eq(@%bag3_touched, 0), le(3,@%bag_nb))" params="target=ui:interface:userbag3|open=@@%bag3_open_value"/>
<action handler="set_open" cond="and(eq(@%bag4_touched, 0), le(4,@%bag_nb))" params="target=ui:interface:userbag4|open=@@%bag4_open_value"/> <action handler="set_open" cond="and(eq(@%bag4_touched, 0), le(4,@%bag_nb))" params="target=ui:interface:userbag4|open=@@%bag4_open_value"/>
<action handler="set_open" cond="and(eq(@%bags_touched, 0), le(1,@%bag_nb))" params="target=ui:interface:userbags|open=@@%bags_open_value"/> <action handler="set_open" cond="and(eq(@%bags_touched, 0), le(1,@%bag_nb))" params="target=ui:interface:userbags|open=@@%bags_open_value"/>
<action handler="set_open" cond="eq(@%player_touched, 0)" params="target=ui:interface:player|open=@@%player_open_value"/> <action handler="set_open" cond="eq(@%player_touched, 0)" params="target=ui:interface:player|open=@@%player_open_value"/>
<action handler="set_open" cond="eq(@%money_touched, 0)" params="target=ui:interface:usermoney|open=@@%money_open_value"/>--> <action handler="set_open" cond="eq(@%money_touched, 0)" params="target=ui:interface:usermoney|open=@@%money_open_value"/>-->
<action handler="set_open" <action handler="set_open"
@ -4822,7 +4822,7 @@
<!-- ******************* --> <!-- ******************* -->
<!-- * STYLES * --> <!-- * STYLES * -->
<!-- ******************* --> <!-- ******************* -->
<!-- Common Style of a Modal Container. user should define <!-- Common Style of a Modal Container. user should define
- the "modal_parent" window - the "modal_parent" window
- and the "on_enter" ActionHandler to support all "Modal Container" aspects. - and the "on_enter" ActionHandler to support all "Modal Container" aspects.
--> -->
@ -5626,7 +5626,7 @@
child_resize_w="false" child_resize_w="false"
child_resize_wmargin="0" child_resize_wmargin="0"
line_maxw="170" line_maxw="170"
multi_line_maxw_only="false" multi_line_maxw_only="false"
xcost="215" xcost="215"
auto_grayed="false" auto_grayed="false"
global_color="true"> global_color="true">
@ -5835,7 +5835,7 @@
tooltip="uittKeepInfo" tooltip="uittKeepInfo"
onclick_l="help_keep" onclick_l="help_keep"
params_l="#index" /> params_l="#index" />
<!-- <!--
<ctrl style="text_button_16" button_type="toggle_button" id="keep" posref="MR MR" x="-16" y="1" wmargin="8" hardtext="uiKeepInfoButton" tooltip="uittKeepInfo" onclick_l="help_keep" params_l="#index" /> <ctrl style="text_button_16" button_type="toggle_button" id="keep" posref="MR MR" x="-16" y="1" wmargin="8" hardtext="uiKeepInfoButton" tooltip="uittKeepInfo" onclick_l="help_keep" params_l="#index" />
--> -->
</group> </group>
@ -6011,9 +6011,9 @@
far="4.0" /> far="4.0" />
</scene3d> </scene3d>
</group> </group>
<!-- Item preview 3D window --> <!-- Item preview 3D window -->
<group id="item_preview" <group id="item_preview"
posref="TL TL" posref="TL TL"
sizeref="w" sizeref="w"
@ -6021,12 +6021,12 @@
h="300" h="300"
x="0" x="0"
y="-60"> y="-60">
<scene3d id="scene_item_preview" <scene3d id="scene_item_preview"
sizeref="wh" sizeref="wh"
w="-2" w="-2"
h="-2" h="-2"
posref="TL TL" posref="TL TL"
x="1" x="1"
curcam="cam_item_preview" curcam="cam_item_preview"
user_interaction="true" user_interaction="true"
@ -6048,19 +6048,19 @@
rot="0.0 0.0 -60.0" rot="0.0 0.0 -60.0"
anim="1" /> anim="1" />
<camera id="cam_item_preview" <camera id="cam_item_preview"
fov="5" fov="5"
pos="0.0 -40.0 0.0" pos="0.0 -40.0 0.0"
target="0.0 0.0 -0.85" target="0.0 0.0 -0.85"
roll="0" /> roll="0" />
<light id="back" pos="0.0 28.2 1.6" color="96 64 32" near="1.0" far="4.0" /> <light id="back" pos="0.0 28.2 1.6" color="96 64 32" near="1.0" far="4.0" />
<light id="lgt" pos="0.0 25.3 2.48" color="255 255 255" near="1.0" far="4.0" /> <light id="lgt" pos="0.0 25.3 2.48" color="255 255 255" near="1.0" far="4.0" />
</scene3d> </scene3d>
</group> </group>
</group> </group>
<ctrl style="skin_scroll" <ctrl style="skin_scroll"
id="sv" id="sv"
posref="TL TL" posref="TL TL"
@ -6844,7 +6844,7 @@
posref="MR MR" posref="MR MR"
x="-4" x="-4"
texture="W_arrow_down_2.tga" /> texture="W_arrow_down_2.tga" />
<!-- SYSTEM <!-- SYSTEM
<view type="text" id="text" posref="ML ML" x="2" />--> <view type="text" id="text" posref="ML ML" x="2" />-->
<group id="text_group" <group id="text_group"
posparent="parent" posparent="parent"

3
code/ryzom/tools/client/ryzom_installer/src/configfile.cpp
View file

@ -83,6 +83,9 @@ bool CConfigFile::load(const QString &filename)
m_use64BitsClient = settings.value("use_64bits_client", true).toBool(); m_use64BitsClient = settings.value("use_64bits_client", true).toBool();
m_shouldUninstallOldClient = settings.value("should_uninstall_old_client", true).toBool(); m_shouldUninstallOldClient = settings.value("should_uninstall_old_client", true).toBool();
// fix problems when src directory doesn't exist anymore
if (!m_srcDirectory.isEmpty() && QFile::exists(m_srcDirectory)) m_srcDirectory.clear();
if (!useDefaultValues) if (!useDefaultValues)
{ {
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN)

2
code/ryzom/tools/client/ryzom_installer/src/filesextractor.cpp
View file

@ -289,7 +289,7 @@ bool CFilesExtractor::exec()
return extractBnp(); return extractBnp();
} }
nlwarning("Unsupported format"); nlwarning("Unsupported format for file %s", Q2C(m_sourceFile));
return false; return false;
} }