3D: Fixes compilation under MQL4

EA31337 · Oct 29, 2021 · d9a0b3a · d9a0b3a
1 parent 6e05989
commit d9a0b3a
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 4 deletions.
diff --git a/3D/Chart3D.h b/3D/Chart3D.h
@@ -37,9 +37,11 @@
 #include "Device.h"
 #include "Interface.h"
 
-// Resources.
+#ifdef __MQL5__
+// Resource variables.
 #resource "Shaders/chart3d_vs.hlsl" as string Chart3DShaderSourceVS;
 #resource "Shaders/chart3d_ps.hlsl" as string Chart3DShaderSourcePS;
+#endif
 
 typedef BarOHLC (*Chart3DPriceFetcher)(ENUM_TIMEFRAMES, int);
 
@@ -94,7 +96,9 @@ class Chart3D : public Dynamic {
     offset.x = offset.y = 0.0f;
     offset.z = 25.0f;
     initialized = false;
+#ifdef __MQL5__
     Interface::AddListener(chart3d_interface_listener, &this);
+#endif
   }
 
   void OnInterfaceEvent(InterfaceEvent& _event) {

diff --git a/3D/Cube.h b/3D/Cube.h
@@ -28,9 +28,11 @@
 #include "Face.h"
 #include "Mesh.h"
 
-// Resources.
+#ifdef __MQL5__
+// Resource variables.
 #resource "Shaders/cube_ps.hlsl" as string ShaderCubeSourcePS;
 #resource "Shaders/cube_vs.hlsl" as string ShaderCubeSourceVS;
+#endif
 
 /**
  * Cube mesh.
@@ -70,11 +72,13 @@ class Cube : public Mesh<T> {
     AddFace(f6);
   }
 
+#ifdef __MQL5__
   /**
    * Initializes graphics device-related things.
    */
   virtual void Initialize(Device* _device) {
     SetShaderVS(_device.VertexShader(ShaderCubeSourceVS, T::Layout));
     SetShaderPS(_device.PixelShader(ShaderCubeSourcePS));
   }
+#endif
 };
diff --git a/3D/Devices/MTDX/MTDXShader.h b/3D/Devices/MTDX/MTDXShader.h
@@ -117,6 +117,7 @@ class MTDXShader : public Shader {
     ResetLastError();
   }
 
+#ifdef __MQL5__
   /**
    * Converts vertex layout's item into required DX's color format.
    */
@@ -139,6 +140,7 @@ class MTDXShader : public Shader {
     Alert("Wrong vertex layout!");
     return (ENUM_DX_FORMAT)0;
   }
+#endif
 
   /**
    * Sets custom input buffer for shader.

diff --git a/3D/Interface.h b/3D/Interface.h
@@ -47,7 +47,12 @@ struct InterfaceEvent {
   } data;
 };
 
-
+#ifdef __MQL5__
+/**
+ * "OnChart" event handler function (MQL5 only).
+ *
+ * Invoked when the ChartEvent event occurs.
+ */
 void OnChartEvent(const int id, const long& lparam, const double& dparam, const string& sparam) {
   datetime _dt;
   double _mp;
@@ -65,6 +70,7 @@ void OnChartEvent(const int id, const long& lparam, const double& dparam, const
     Interface::FireEvent(_event);
   }
 }
+#endif
 
 typedef void (*InterfaceListener)(InterfaceEvent&, void*);
 
@@ -85,6 +91,7 @@ class Interface
   static int mouse_pos_y;
   static bool initialized;
 
+#ifdef __MQL5__
   static void AddListener(InterfaceListener _listener, void* _target) {
     if (!initialized) {
       ChartSetInteger(0, CHART_EVENT_MOUSE_MOVE, true);
@@ -120,10 +127,13 @@ class Interface
   static int GetMouseY() {
     return mouse_pos_y;
   }
+#endif
 };
 
+#ifdef __MQL5__
 Interface::Installation Interface::installations[];
 bool Interface::mouse_was_down = false;
 int Interface::mouse_pos_x = 0;
 int Interface::mouse_pos_y = 0;
 bool Interface::initialized = false;
+#endif
diff --git a/3D/Math.h b/3D/Math.h
@@ -3143,6 +3143,7 @@ void DXSHRotate(float &out[], int order, const DXMatrix &_matrix, const float &i
     return;
   }
 
+#ifdef __MQL5__
   if ((float)fabs(_matrix.m[2][2]) != 1.0f) {
     sinb = (float)sqrt(1.0f - _matrix.m[2][2] * _matrix.m[2][2]);
     alpha = (float)atan2(_matrix.m[2][1] / sinb, _matrix.m[2][0] / sinb);
@@ -3153,6 +3154,13 @@ void DXSHRotate(float &out[], int order, const DXMatrix &_matrix, const float &i
     beta = 0.0f;
     gamma = 0.0f;
   }
+#else
+    alpha = 0.0f;
+    beta = 0.0f;
+    gamma = 0.0f;
+    sinb = 0.0f;
+#endif
+
   //---
   DXSHRotateZ(temp, order, gamma, in);
   rotate_X(temp1, order, 1.0f, temp);

diff --git a/tests/CompileTest.mq5 b/tests/CompileTest.mq5
@@ -24,14 +24,18 @@
  * Test compilation of all class files.
  */
 
-// Includes.
+// 3D includes (MQL5 only).
+#ifdef __MQL5__
 #include "../3D/Chart3D.h"
 #include "../3D/Cube.h"
 #include "../3D/Devices/MTDX/MTDXDevice.h"
 #include "../3D/Devices/MTDX/MTDXIndexBuffer.h"
 #include "../3D/Devices/MTDX/MTDXShader.h"
 #include "../3D/Devices/MTDX/MTDXVertexBuffer.h"
 #include "../3D/Frontends/MT5Frontend.h"
+#endif
+
+// Includes.
 #include "../Account.mqh"
 #include "../Action.mqh"
 #include "../Array.mqh"