aleajactaest/khanat-code-old
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-code-old.git synced 2024-11-17 04:51:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge with develop

Browse source
This commit is contained in:
Nimetu 2016-11-26 15:24:24 +02:00
parent 99ab8fba3e
commit 3ab4c7d714
5 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
code/ryzom/client/client_default.cfg
View file

@ -105,6 +105,7 @@ FreeLookAcceleration_min = 20;
FreeLookAcceleration_max = 80; FreeLookAcceleration_max = 80;
FreeLookInverted = 0; FreeLookInverted = 0;
FreeLookTablet = 0;
AutomaticCamera = 0; AutomaticCamera = 0;
DblClickMode = 1; DblClickMode = 1;
AutoEquipTool = 1; AutoEquipTool = 1;

18
code/ryzom/client/data/gamedev/interfaces_v3/game_config.xml
View file

@ -2672,9 +2672,9 @@
<instance template="tgcw_checkbox" <instance template="tgcw_checkbox"
id="hard" id="hard"
text="uiMouseHardware" text="uiMouseHardware"
posref="TR TR" posref="TM TL"
x="-55" x="0"
y="-20" /> y="-35" />
<instance template="tgcw_checkbox" <instance template="tgcw_checkbox"
id="inverted" id="inverted"
text="uiMouseInverted" text="uiMouseInverted"
@ -2689,6 +2689,13 @@
posref="BL TL" posref="BL TL"
x="0" x="0"
y="-2" /> y="-2" />
<instance template="tgcw_checkbox"
id="tablet"
text="uiMouseTablet"
posparent="dbl"
posref="BL TL"
x="0"
y="-2" />
<view style="sgc_title2" <view style="sgc_title2"
type="text" type="text"
id="inter" id="inter"
@ -3833,6 +3840,11 @@
widget="boolbut" widget="boolbut"
link="DblClickMode" link="DblClickMode"
realtime="true" /> realtime="true" />
<param ui="mouse:tablet:c"
type="cfg"
widget="boolbut"
link="FreeLookTablet"
realtime="true" />
<param ui="mouse:dcspeed:c" <param ui="mouse:dcspeed:c"
type="db" type="db"
widget="sbint" widget="sbint"

2
code/ryzom/client/src/client_cfg.cpp
View file

@ -350,6 +350,7 @@ CClientConfig::CClientConfig()
FreeLookAcceleration = 0; // Default FreeLookAcceleration FreeLookAcceleration = 0; // Default FreeLookAcceleration
FreeLookSmoothingPeriod = 0.f; // when in absolute mode, free look factor is used instead of speed, the mouse gives the absolute angle FreeLookSmoothingPeriod = 0.f; // when in absolute mode, free look factor is used instead of speed, the mouse gives the absolute angle
FreeLookInverted = false; FreeLookInverted = false;
FreeLookTablet = false; // Mouse reports absolute coordinates, so avoid mouse recentering
AutomaticCamera = true; AutomaticCamera = true;
DblClickMode = true; // when in dbl click mode, a double click is needed to execute default contextual action DblClickMode = true; // when in dbl click mode, a double click is needed to execute default contextual action
AutoEquipTool = true; // when true player will auto-equip last used weapon or forage tool when doing an action AutoEquipTool = true; // when true player will auto-equip last used weapon or forage tool when doing an action
@ -855,6 +856,7 @@ void CClientConfig::setValues()
READ_INT_FV(FreeLookAcceleration) READ_INT_FV(FreeLookAcceleration)
READ_FLOAT_FV(FreeLookSmoothingPeriod) READ_FLOAT_FV(FreeLookSmoothingPeriod)
READ_BOOL_FV(FreeLookInverted) READ_BOOL_FV(FreeLookInverted)
READ_BOOL_FV(FreeLookTablet)
READ_BOOL_FV(AutomaticCamera) READ_BOOL_FV(AutomaticCamera)
READ_BOOL_FV(DblClickMode) READ_BOOL_FV(DblClickMode)
READ_BOOL_FV(AutoEquipTool) READ_BOOL_FV(AutoEquipTool)

1
code/ryzom/client/src/client_cfg.h
View file

@ -199,6 +199,7 @@ struct CClientConfig
uint FreeLookAcceleration; uint FreeLookAcceleration;
float FreeLookSmoothingPeriod; float FreeLookSmoothingPeriod;
bool FreeLookInverted; bool FreeLookInverted;
bool FreeLookTablet;
// true if camera is centered when user casts a spell // true if camera is centered when user casts a spell
bool AutomaticCamera; bool AutomaticCamera;
bool DblClickMode; bool DblClickMode;

2
code/ryzom/client/src/events_listener.cpp
View file

@ -204,7 +204,7 @@ void CEventsListener::operator()(const CEvent& event)
// updateFreeLookPos is called in updateMouseSmoothing per frame // updateFreeLookPos is called in updateMouseSmoothing per frame
// Center cursor // Center cursor
if (outsideBounds && !s_MouseFreeLookWaitCenter) if (outsideBounds && !s_MouseFreeLookWaitCenter && !ClientCfg.FreeLookTablet)
{ {
s_MouseFreeLookWaitCenter = true; s_MouseFreeLookWaitCenter = true;
Driver->setMousePos(0.5f, 0.5f); Driver->setMousePos(0.5f, 0.5f);