Merge branch 'dev'

.gitignore

@@ -52,56 +52,55 @@ Client/*.pb.*
 
 # C++ objects and libs
 
-Medusa/*.slo
-Medusa/*.lo
-Medusa/*.o
-Medusa/*.a
-Medusa/*.la
-Medusa/*.lai
-Medusa/*.so
-Medusa/*.dll
-Medusa/*.dylib
+Core/*.slo
+Core/*.lo
+Core/*.o
+Core/*.a
+Core/*.la
+Core/*.lai
+Core/*.so
+Core/*.dll
+Core/*.dylib
 
 # Qt-es
 
-Medusa/object_script.*.Release
-Medusa/object_script.*.Debug
-Medusa/*_plugin_import.cpp
-Medusa//.qmake.cache
-Medusa//.qmake.stash
-Medusa/*.pro.user
-Medusa/*.pro.user.*
-Medusa/*.qbs.user
-Medusa/*.qbs.user.*
-Medusa/*.moc
-Medusa/moc_*.cpp
-Medusa/moc_*.h
-Medusa/qrc_*.cpp
-Medusa/ui_*.h
-Medusa/Makefile*
-Medusa/*build*
+Core/object_script.*.Release
+Core/object_script.*.Debug
+Core/*_plugin_import.cpp
+Core//.qmake.cache
+Core//.qmake.stash
+Core/*.pro.user
+Core/*.pro.user.*
+Core/*.qbs.user
+Core/*.qbs.user.*
+Core/*.moc
+Core/moc_*.cpp
+Core/moc_*.h
+Core/qrc_*.cpp
+Core/ui_*.h
+Core/Makefile*
+Core/*build*
 
 # Qt unit tests
-Medusa/target_wrapper.*
+Core/target_wrapper.*
 
 
 # QtCreator
 
-Medusa/*.autosave
+Core/*.autosave
 
 # QtCtreator Qml
-Medusa/*.qmlproject.user
-Medusa/*.qmlproject.user.*
+Core/*.qmlproject.user
+Core/*.qmlproject.user.*
 
 # QtCtreator CMake
-Medusa/CMakeLists.txt.user*
+Core/CMakeLists.txt.user*
 
 # Protobuf
-Medusa/*.pb.*
-Medusa/*_pb2.py
-Medusa/src/LuaModule/lua_zeus.cpp
-Medusa/share/proto/cpp/
-
+Core/*.pb.*
+Core/*_pb2.py
+Core/src/LuaModule/lua_zeus.cpp
+Core/share/proto/cpp/
 
 
 
@@ -117,8 +116,8 @@ ZBin/LOG/*.log
 ZBin/Client.exp
 ZBin/Client.lib
 ZBin/Client
-ZBin/Medusa
-ZBin/MedusaD
+ZBin/Core
+ZBin/CoreD
 ZBin/grsim
 ZBin/Crazy
 ZBin/Client
@@ -127,6 +126,11 @@ ZBin/ballSpeedLog.txt
 ZBin/Core
 ZBin/Controller
 # python
+ZBin/__data
+ZBin/*/model
+ZBin/*/runs/
+ZBin/*/tbox
+ZBin/*/*.pth
 ZBin/__pycache__
 ZBin/*.py[cod]
 ZBin/*$py.class

Client/CMakeLists.txt

@@ -43,6 +43,11 @@ else()
     find_package(ZLIB)
 endif()
 
+## fmt
+find_package(fmt REQUIRED)
+include_directories(${fmt_INCLUDE_DIRS})
+list(APPEND libs fmt::fmt)
+
 include_directories(${ZLIB_INCLUDE_DIRS})
 list(APPEND libs ${ZLIB_LIBRARIES})
 ## find Qt

Client/plugins/sim/configwidget.cpp

@@ -1,6 +1,7 @@
 #include "configwidget.h"
 namespace{
     auto ppm = ZSS::pm::instance();
+    auto zpm = ZSS::ZParamManager::instance();
 }
 //#define END_ENUM(parents, name) \
 //    parents->addChild(v_##name);
@@ -15,24 +16,26 @@ namespace{
 #define ADD_VALUE(parent,type,name,defaultvalue,namestring) \
     ppm->loadParam(v_##name,#parent"/"#name,defaultvalue);
 
+#define ADD_CLIENT_VALUE(parent, type, name, defaultvalue, namestring, ratio) \
+    v_##name = zpm->value(#parent "/" #namestring, QVariant(ratio * defaultvalue)).to##type() / ratio;
 
 ConfigWidget::ConfigWidget()
 {
     ADD_VALUE(game_vars,Int,Robots_Count, 16, "Robots Count")
     ADD_VALUE(field_vars,Double,Field_Line_Width,0.020,"Line Thickness")
-    ADD_VALUE(field_vars,Double,Field_Length,9.000,"Length")
-    ADD_VALUE(field_vars,Double,Field_Width,6.000,"Width")
+    ADD_CLIENT_VALUE(field,Double,Field_Length,9.000,width, 1000.0)
+    ADD_CLIENT_VALUE(field,Double,Field_Width,6.000,height, 1000.0)
     ADD_VALUE(field_vars,Double,Field_Rad,0.500,"Radius")
     ADD_VALUE(field_vars,Double,Field_Free_Kick,0.700,"Free Kick Distanse From Defense Area")
-    ADD_VALUE(field_vars,Double,Field_Penalty_Width,2.0,"Penalty width")
-    ADD_VALUE(field_vars,Double,Field_Penalty_Depth,1.0,"Penalty depth")
+    ADD_CLIENT_VALUE(field,Double,Field_Penalty_Width,2.0,penaltyLength, 1000.0)
+    ADD_CLIENT_VALUE(field,Double,Field_Penalty_Depth,1.0,penaltyWidth, 1000.0)
     ADD_VALUE(field_vars,Double,Field_Penalty_Point,1.0,"Penalty point")
     ADD_VALUE(field_vars,Double,Field_Margin,0.4,"Margin")
     ADD_VALUE(field_vars,Double,Field_Referee_Margin,0.0,"Referee margin")
     ADD_VALUE(field_vars,Double,Wall_Thickness,0.050,"Wall thickness")
     ADD_VALUE(field_vars,Double,Goal_Thickness,0.020,"Goal thickness")
-    ADD_VALUE(field_vars,Double,Goal_Depth,0.200,"Goal depth")
-    ADD_VALUE(field_vars,Double,Goal_Width,1.000,"Goal width")
+    ADD_CLIENT_VALUE(field,Double,Goal_Depth,0.200,goalDepth, 1000.0)
+    ADD_CLIENT_VALUE(field,Double,Goal_Width,1.000,goalWidth, 1000.0)
     ADD_VALUE(field_vars,Double,Goal_Height,0.160,"Goal height")
     ADD_VALUE(field_vars,Double,overlap,0.20,"Camera Overlap")