Merge pull request #665 from nseam/dev-fx-emcc

Emscripten refactor

.github/workflows/compile-cpp.yml

@@ -43,6 +43,11 @@ jobs:
         with:
           compiler: gcc-latest
       - name: Compile ${{ matrix.file }} via emcc
-        run: emcc "${{ matrix.file }}"
+        if: always()
+        run: >
+          emcc -s WASM=1 -s ENVIRONMENT=node -s EXIT_RUNTIME=0 -s NO_EXIT_RUNTIME=1 -s ASSERTIONS=1 -Wall -s
+          MODULARIZE=1 -s ERROR_ON_UNDEFINED_SYMBOLS=0 --bind -s EXPORTED_FUNCTIONS="[]" -g -std=c++17
+          "${{ matrix.file }}"
       - name: Compile ${{ matrix.file }} via g++
-        run: g++ -c "${{ matrix.file }}"
+        if: always()
+        run: g++ -g -std=c++17 -c "${{ matrix.file }}"

.github/workflows/test.yml

@@ -73,6 +73,7 @@ jobs:
           - SummaryReportTest
           - TickerTest
           - TradeTest
+      max-parallel: 4
     steps:
       - uses: actions/download-artifact@v2
         with:
@@ -86,6 +87,7 @@ jobs:
           MtVersion: 4.0.0.1349
           TestExpert: ${{ matrix.test }}
           RunOnError: show_logs 200
+        if: always()
     timeout-minutes: 10
 
   Scripts-MQL4:
@@ -113,6 +115,7 @@ jobs:
           - TerminalTest
           - TimerTest
           - ValueStorageTest
+      max-parallel: 4
     steps:
       - uses: actions/download-artifact@v2
         with:
@@ -121,6 +124,7 @@ jobs:
         uses: fx31337/mql-tester-action@master
         with:
           Script: ${{ matrix.test }}
+        if: always()
     timeout-minutes: 10
 
   Scripts-MQL4-Ignore:
@@ -146,6 +150,7 @@ jobs:
         with:
           Script: ${{ matrix.test }}
           RunOnFail: "exit 0"
+        if: always()
     timeout-minutes: 10
 
   Trade-Tests-MQL4:
@@ -167,4 +172,5 @@ jobs:
         uses: fx31337/mql-tester-action@master
         with:
           Script: ${{ matrix.test }}
+        if: always()
     timeout-minutes: 10

3D/Chart3DCandles.h

@@ -25,6 +25,7 @@
  * 3D chart candles renderer.
  */
 
+#include "../Chart.define.h"
 #include "Chart3DType.h"
 #include "Cube.h"
 #include "Device.h"

3D/Cube.h

@@ -77,8 +77,8 @@ class Cube : public Mesh<T> {
    * Initializes graphics device-related things.
    */
   virtual void Initialize(Device* _device) {
-    SetShaderVS(_device.VertexShader(ShaderCubeSourceVS, T::Layout));
-    SetShaderPS(_device.PixelShader(ShaderCubeSourcePS));
+    SetShaderVS(_device.CreateVertexShader(ShaderCubeSourceVS, T::Layout));
+    SetShaderPS(_device.CreatePixelShader(ShaderCubeSourcePS));
   }
 #endif
 };

3D/Device.h

@@ -138,20 +138,25 @@ class Device : public Dynamic {
   /**
    * Creates vertex shader to be used by current graphics device.
    */
-  virtual Shader* VertexShader(string _source_code, const ShaderVertexLayout& _layout[],
-                               string _entry_point = "main") = NULL;
+  virtual Shader* CreateVertexShader(string _source_code, const ShaderVertexLayout& _layout[],
+                                     string _entry_point = "main") = NULL;
 
   /**
    * Creates pixel shader to be used by current graphics device.
    */
-  virtual Shader* PixelShader(string _source_code, string _entry_point = "main") = NULL;
+  virtual Shader* CreatePixelShader(string _source_code, string _entry_point = "main") = 0;
+
+  /**
+   * Creates vertex buffer to be used by current graphics device.
+   */
+  virtual VertexBuffer* CreateVertexBuffer() = 0;
 
   /**
    * Creates vertex buffer to be used by current graphics device.
    */
   template <typename T>
-  VertexBuffer* VertexBuffer(T& data[]) {
-    VertexBuffer* _buff = VertexBuffer();
+  VertexBuffer* CreateVertexBuffer(T& data[]) {
+    VertexBuffer* _buff = CreateVertexBuffer();
     // Unfortunately we can't make this method virtual.
     if (dynamic_cast<MTDXVertexBuffer*>(_buff) != NULL) {
 // MT5's DirectX.
@@ -165,15 +170,10 @@ class Device : public Dynamic {
     return _buff;
   }
 
-  /**
-   * Creates vertex buffer to be used by current graphics device.
-   */
-  virtual VertexBuffer* VertexBuffer() = NULL;
-
   /**
    * Creates index buffer to be used by current graphics device.
    */
-  virtual IndexBuffer* IndexBuffer(unsigned int& _indices[]) = NULL;
+  virtual IndexBuffer* CreateIndexBuffer(unsigned int& _indices[]) = 0;
 
   /**
    * Renders vertex buffer with optional point indices.
@@ -183,7 +183,7 @@ class Device : public Dynamic {
   /**
    * Renders vertex buffer with optional point indices.
    */
-  virtual void RenderBuffers(VertexBuffer* _vertices, IndexBuffer* _indices = NULL) = NULL;
+  virtual void RenderBuffers(VertexBuffer* _vertices, IndexBuffer* _indices = NULL) = 0;
 
   /**
    * Renders given mesh.
@@ -233,6 +233,11 @@ class Device : public Dynamic {
   int Height() { return frontend.Ptr().Height(); }
 
   void SetCameraOrtho3D(float _pos_x = 0.0f, float _pos_y = 0.0f, float _pos_z = 0.0f) {
+    if (Width() <= 0 || Height() <= 0) {
+      Print("Cannot set 2D camera as width or height of the viewport is zero!");
+      DebugBreak();
+      return;
+    }
     DXMatrixOrthoLH(mtx_projection, 1.0f * _pos_z, 1.0f / Width() * Height() * _pos_z, -10000, 10000);
   }
 

3D/Devices/MTDX/MTDXDevice.h

@@ -93,15 +93,11 @@ class MTDXDevice : public Device {
     }
   }
 
-  /**
-   * Creates index buffer to be used by current graphics device.
-   */
-  IndexBuffer* IndexBuffer() { return NULL; }
-
   /**
    * Creates vertex shader to be used by current graphics device.
    */
-  virtual Shader* VertexShader(string _source_code, const ShaderVertexLayout& _layout[], string _entry_point = "main") {
+  Shader* CreateVertexShader(string _source_code, const ShaderVertexLayout& _layout[],
+                             string _entry_point = "main") override {
     MTDXShader* _shader = new MTDXShader(&this);
     _shader.Create(SHADER_TYPE_VS, _source_code, _entry_point);
     _shader.SetDataLayout(_layout);
@@ -111,7 +107,7 @@ class MTDXDevice : public Device {
   /**
    * Creates pixel shader to be used by current graphics device.
    */
-  virtual Shader* PixelShader(string _source_code, string _entry_point = "main") {
+  Shader* CreatePixelShader(string _source_code, string _entry_point = "main") override {
     MTDXShader* _shader = new MTDXShader(&this);
     _shader.Create(SHADER_TYPE_PS, _source_code, _entry_point);
     return _shader;
@@ -120,12 +116,12 @@ class MTDXDevice : public Device {
   /**
    * Creates vertex buffer to be used by current graphics device.
    */
-  VertexBuffer* VertexBuffer() { return new MTDXVertexBuffer(&this); }
+  VertexBuffer* CreateVertexBuffer() override { return new MTDXVertexBuffer(&this); }
 
   /**
    * Creates index buffer to be used by current graphics device.
    */
-  virtual IndexBuffer* IndexBuffer(unsigned int& _indices[]) {
+  IndexBuffer* CreateIndexBuffer(unsigned int& _indices[]) override {
     IndexBuffer* _buffer = new MTDXIndexBuffer(&this);
     _buffer.Fill(_indices);
     return _buffer;

3D/Mesh.h

@@ -45,8 +45,13 @@ struct PointEntry {
   T point;
   long key;
 
+  // Default constructor.
   PointEntry() {}
 
+  // Copy constructor.
+  PointEntry(const PointEntry<T>& r) : point(r.point), key(r.key) {}
+
+  // Constructor.
   PointEntry(const T& _point) {
     point = _point;
     key = MakeKey(_point.Position.x, _point.Position.y, _point.Position.z);
@@ -249,8 +254,8 @@ class Mesh : public Dynamic {
     Print("Indices: ", _s_indices);
 #endif
 
-    vbuff = _vbuff = _device.VertexBuffer<T>(_vertices);
-    ibuff = _ibuff = _device.IndexBuffer(_indices);
+    vbuff = _vbuff = _device.CreateVertexBuffer<T>(_vertices);
+    ibuff = _ibuff = _device.CreateIndexBuffer(_indices);
     return true;
   }
 };

3D/Vertex.h

@@ -8,11 +8,18 @@ struct Vertex {
   DXVector3 Normal;
   DXColor Color;
 
-  Vertex() {
-    Color.r = 1.0f;
-    Color.g = 1.0f;
-    Color.b = 1.0f;
-    Color.a = 1.0f;
+  // Default constructor.
+  Vertex(float r = 1, float g = 1, float b = 1, float a = 1) {
+    Color.r = r;
+    Color.g = g;
+    Color.b = b;
+    Color.a = a;
+  }
+
+  Vertex(const Vertex &r) {
+    Position = r.Position;
+    Normal = r.Normal;
+    Color = r.Color;
   }
 
   static const ShaderVertexLayout Layout[3];

Account/Account.struct.h

@@ -28,7 +28,7 @@
 #ifndef __MQL__
 // Allows the preprocessor to include a header file when it is needed.
 #pragma once
-#include "../Serializer.enum.h"
+#include "../Serializer/Serializer.enum.h"
 #endif
 
 // Forward class declaration.
@@ -48,6 +48,21 @@ struct AccountEntry {
   double margin_used;
   double margin_free;
   double margin_avail;
+
+  // Default constructor.
+  AccountEntry() {}
+
+  // Constructor.
+  AccountEntry(const AccountEntry& r)
+      : dtime(r.dtime),
+        balance(r.balance),
+        credit(r.credit),
+        equity(r.equity),
+        profit(r.profit),
+        margin_used(r.margin_used),
+        margin_free(r.margin_free),
+        margin_avail(r.margin_avail) {}
+
   // Serializers.
   void SerializeStub(int _n1 = 1, int _n2 = 1, int _n3 = 1, int _n4 = 1, int _n5 = 1) {}
   SerializerNodeType Serialize(Serializer& _s) {

Account/AccountBase.struct.h

@@ -28,14 +28,15 @@
 #ifndef __MQL__
 // Allows the preprocessor to include a header file when it is needed.
 #pragma once
-#include "../Serializer.enum.h"
+#include "../Serializer/Serializer.enum.h"
 #endif
 
 // Forward class declaration.
 class Serializer;
 
 // Includes.
 #include "../Serializer/Serializer.h"
+#include "../Std.h"
 #include "../Terminal.define.h"
 
 // Struct for account entries.

Account/AccountMt.h

@@ -37,6 +37,7 @@ class AccountMt;
 #include "../Orders.mqh"
 #include "../Serializer/Serializer.h"
 #include "../SymbolInfo.mqh"
+#include "../Task/TaskCondition.enum.h"
 #include "../Trade.struct.h"
 #include "Account.define.h"
 #include "Account.enum.h"
@@ -283,7 +284,7 @@ class AccountMt {
     return ::AccountFreeMarginMode();
 #else
     // @todo: Not implemented yet.
-    return NULL;
+    return NULL_VALUE;
 #endif
   }
   static double GetAccountFreeMarginMode() { return AccountMt::AccountFreeMarginMode(); }
@@ -469,7 +470,7 @@ class AccountMt {
    */
   bool IsFreeMargin(ENUM_ORDER_TYPE _cmd, double size_of_lot, string _symbol = NULL) {
     bool _res = true;
-    double margin = AccountFreeMarginCheck(_symbol, _cmd, size_of_lot);
+    // double margin = AccountFreeMarginCheck(_symbol, _cmd, size_of_lot);
     if (GetLastError() == 134 /* NOT_ENOUGH_MONEY */) _res = false;
     return (_res);
   }
@@ -617,9 +618,10 @@ class AccountMt {
     return StringFormat(
         "Type: %s, Server/Company/Name: %s/%s/%s, Currency: %s, Balance: %g, Credit: %g, Equity: %g, Profit: %g, "
         "Margin Used/Free/Avail: %g(%.1f%%)/%g/%g, Orders limit: %g: Leverage: 1:%d, StopOut Level: %d (Mode: %d)",
-        GetType(), GetServerName(), GetCompanyName(), GetAccountName(), GetCurrency(), GetBalance(), GetCredit(),
-        GetEquity(), GetProfit(), GetMarginUsed(), GetMarginUsedInPct(), GetMarginFree(), GetMarginAvail(),
-        GetLimitOrders(), GetLeverage(), GetStopoutLevel(), GetStopoutMode());
+        C_STR(GetType()), C_STR(GetServerName()), C_STR(GetCompanyName()), C_STR(GetAccountName()),
+        C_STR(GetCurrency()), GetBalance(), GetCredit(), GetEquity(), GetProfit(), GetMarginUsed(),
+        GetMarginUsedInPct(), GetMarginFree(), GetMarginAvail(), GetLimitOrders(), GetLeverage(), GetStopoutLevel(),
+        GetStopoutMode());
   }
 
   /**