WIP: Instance drawing

.gitignore

@@ -13,4 +13,5 @@ PublishProfiles
 plugin
 package
 .DS_Store
-*.user
+*.user
+/XPNetPluginTestHost/xpnetcfg.json

XPLMTestHarness/XPLMTestHarness.cpp

@@ -6,6 +6,7 @@
 #include "XPLMScenery.h"
 #include "XPLMGraphics.h"
 #include <map>
+#include <list>
 #include <tuple>
 #include <vector>
 #include <string>
@@ -118,6 +119,9 @@ static commandmap configuredCommands;
 static map<XPLMFlightLoop_f, flightloop> registeredFlightLoops;
 static map<tuple<XPLMDrawCallback_f, XPLMDrawingPhase, int>, drawcallback> registeredDrawCallbacks;
 
+static unsigned int instanceCounter = 0;
+static map<XPLMInstanceRef, std::list<string>> registeredInstances;
+
 template <typename T>
 void SetDataRef(const string name, const T& value, datarefmap<T>& container)
 {
@@ -557,6 +561,11 @@ XPLM_API void                 XPLMDrawObjects(
 	int                  earth_relative)
 {
 	std::cout << "XPLMTestHarness: Drawing object " << inObject << std::endl;
+	for (int c = 0; c < inCount; c++) 
+	{
+		std::cout << "XPLMTestHarness: Position #" << c << ": (" 
+			<< inLocations[c].x << ", " << inLocations[c].y << ", " << inLocations[c].z << ")" << std::endl;
+	}
 }
 
 XPLM_API void                 XPLMUnloadObject(
@@ -608,6 +617,43 @@ XPLM_API void                 XPLMLocalToWorld(
 	*outLatitude = inZ;
 }
 
+XPLM_API XPLMInstanceRef XPLMCreateInstance(XPLMObjectRef obj, const char ** datarefs)
+{
+	instanceCounter++;
+	std::cout << "XPLMTestHarness: Creating instance for object " <<  obj << std::endl;
+	unsigned int i = 0;
+	std::list<string> dRefList;
+	for (i = 0; datarefs[i] != NULL; i++) {
+		std::cout << "XPLMTestHarness: DataRef " << datarefs[i]  << std::endl;
+		dRefList.push_back(datarefs[i]);
+	}
+	XPLMInstanceRef instRef = reinterpret_cast<XPLMInstanceRef>(static_cast<uintptr_t>(instanceCounter));
+	registeredInstances.emplace(instRef, dRefList);
+
+	return instRef;
+}
+
+XPLM_API void XPLMDestroyInstance(XPLMInstanceRef instance)
+{
+	std::cout << "XPLMTestHarness: Destroying instance " << instance << std::endl;
+	registeredInstances.erase(instance);
+}
+
+XPLM_API void XPLMInstanceSetPosition(XPLMInstanceRef instance, const XPLMDrawInfo_t * new_position, const float * data)
+{
+	std::cout << "XPLMTestHarness: Instance set position for instance " << instance << std::endl;
+	auto it = registeredInstances.find(instance);
+	if (it != registeredInstances.end()) {
+		auto datarefs = it->second;
+		unsigned int i = 0;
+		for (string dref : datarefs) {
+			std::cout << "XPLMTestHarness: DataRef " << dref << " set to value " << data[i++] << std::endl;
+		}
+	}
+}
+
+
+
 XPLM_API void XPHarnessInvokeFlightLoop(float elapsedSinceLastCall, float elapsedTimeSinceLastFlightLoop, int counter)
 {
 	// Before invoking clean up all the unregistered flight loops.
@@ -627,11 +673,11 @@ XPLM_API void XPHarnessInvokeFlightLoop(float elapsedSinceLastCall, float elapse
 XPLM_API void XPHarnessInvokeDrawCallback()
 {
 	// Before invoking clean up all the unregistered draw callbacks.
-	auto it = registeredFlightLoops.begin();
-	while (it != registeredFlightLoops.end())
+	auto it = registeredDrawCallbacks.begin();
+	while (it != registeredDrawCallbacks.end())
 	{
 		if (it->second.deleted)
-			it = registeredFlightLoops.erase(it);
+			it = registeredDrawCallbacks.erase(it);
 		else
 			++it;
 	}

XPLMTestHarness/XPLMTestHarness.h

@@ -20,6 +20,7 @@
 #include "XPLMDataAccess.h"
 #include "XPLMProcessing.h"
 #include "XPLMDisplay.h"
+#include "XPLMInstance.h"
 #include "XPLMUtilities.h"
 
 typedef enum {

XPNet.CLR/Display/XPlaneDisplay.cs

@@ -6,7 +6,7 @@ namespace XPNet
 	/// Delegate for .NET code that wants to be called as part of the render loop.
 	/// </summary>
 	public delegate int DrawDelegate(
-		XPLMDrawingPhase inPhase,
+		XPDrawingPhase inPhase,
 		int inIsBefore
 	);
 
@@ -16,12 +16,12 @@ int inIsBefore
 	/// </summary>
 	public interface IXPlaneDisplay
 	{
-		IXPDrawingLoopHook RegisterDrawHook(DrawDelegate drawDelegate, XPLMDrawingPhase inPhase, int inWantsBefore);
+		IXPDrawingLoopHook RegisterDrawHook(DrawDelegate drawDelegate, XPDrawingPhase inPhase, int inWantsBefore);
 	}
 
 	internal class XPlaneDisplay : IXPlaneDisplay
 	{
-		public IXPDrawingLoopHook RegisterDrawHook(DrawDelegate drawDelegate, XPLMDrawingPhase inPhase, int inWantsBefore)
+		public IXPDrawingLoopHook RegisterDrawHook(DrawDelegate drawDelegate, XPDrawingPhase inPhase, int inWantsBefore)
 		{
 			return new XPDrawingLoopHook(drawDelegate, inPhase, inWantsBefore);
 		}
@@ -40,10 +40,10 @@ internal class XPDrawingLoopHook : IXPDrawingLoopHook
 		private readonly DrawDelegate m_loopDelegate;
 		private readonly XPLMDrawCallback_f m_hookDelegate;
 
-		private readonly XPLMDrawingPhase m_inPhase;
+		private readonly XPDrawingPhase m_inPhase;
 		private readonly int m_inWantsBefore;
 
-		public unsafe XPDrawingLoopHook(DrawDelegate drawCallbackDelegate, XPLMDrawingPhase inPhase, int inWantsBefore)
+		public unsafe XPDrawingLoopHook(DrawDelegate drawCallbackDelegate, XPDrawingPhase inPhase, int inWantsBefore)
 		{
 			m_loopDelegate = drawCallbackDelegate;
 			m_inPhase = inPhase;
@@ -62,7 +62,7 @@ public unsafe void Dispose()
 			PluginBridge.ApiFunctions.XPLMUnregisterDrawCallback(m_hookDelegate, m_inPhase, m_inWantsBefore, null);
 		}
 
-		private unsafe int XPLMDrawHook(XPLMDrawingPhase inPhase, int inIsBefore, void* inRefcon)
+		private unsafe int XPLMDrawHook(XPDrawingPhase inPhase, int inIsBefore, void* inRefcon)
 		{
 			try
 			{
@@ -75,6 +75,29 @@ private unsafe int XPLMDrawHook(XPLMDrawingPhase inPhase, int inIsBefore, void*
 				return 1; // If an exception happens in the draw hook, then let X-Plane draw
 			}
 		}
+	}
 
+	/// <summary>
+	/// Describes the phase in which X-Plane is currently drawing
+	/// </summary>
+	public enum XPDrawingPhase : int
+	{
+		// MAINT: This needs to be kept in sync with the
+		// XPLMDrawingPhase enumerable from the X-Plane API
+		FirstScene = 0,
+		Terrain = 5,
+		Airports = 10,
+		Vectors = 15,
+		Objects = 20,
+		Airplanes = 25,
+		LastScene = 30,
+		FirstCockpit = 35,
+		Panel = 40,
+		Gauges = 45,
+		Window = 50,
+		LastCockpit = 55,
+		LocalMap3D = 100,
+		LocalMap2D = 101,
+		LocalMapProfile = 102
 	}
 }

XPNet.CLR/Instance/XPlaneInstance.cs

@@ -0,0 +1,54 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace XPNet
+{
+	public interface IXPlaneInstance
+	{
+		void CreateInstance();
+		void DestroyInstance();
+	}
+
+	internal class XPlaneInstance : IXPlaneInstance
+	{
+		public void CreateInstance()
+		{
+			throw new NotImplementedException();
+		}
+
+		public void DestroyInstance()
+		{
+			throw new NotImplementedException();
+		}
+	}
+
+	public interface IXPInstance : IDisposable
+	{
+		void SetPosition(XPDrawInfo xPLMDrawInfo_t, IEnumerable<float> v);
+	}
+
+	internal unsafe class XPInstance : IXPInstance
+	{
+		readonly void* m_instanceRef;
+
+		public XPInstance(void* instanceRef)
+		{
+			m_instanceRef = instanceRef;
+		}
+
+		public void Dispose()
+		{
+			PluginBridge.ApiFunctions.XPLMDestroyInstance(m_instanceRef);
+		}
+
+		public void SetPosition(XPDrawInfo xPLMDrawInfo_t, IEnumerable<float> v)
+		{
+			var floatArray = v.ToArray();
+			fixed (float* p = &floatArray[0])
+			{
+				PluginBridge.ApiFunctions.XPLMInstanceSetPosition(m_instanceRef, xPLMDrawInfo_t, p);
+			}
+		}
+	}
+}