Master

Chili Framework 2016.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25123.0
+# Visual Studio 15
+VisualStudioVersion = 15.0.27703.2035
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Engine", "Engine\Engine.vcxproj", "{FFCA512B-49FC-4FC8-8A73-C4F87D322FF2}"
 EndProject
@@ -15,8 +15,8 @@ Global
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{FFCA512B-49FC-4FC8-8A73-C4F87D322FF2}.Debug|x64.ActiveCfg = Debug|x64
 		{FFCA512B-49FC-4FC8-8A73-C4F87D322FF2}.Debug|x64.Build.0 = Debug|x64
-		{FFCA512B-49FC-4FC8-8A73-C4F87D322FF2}.Debug|x86.ActiveCfg = Debug|Win32
-		{FFCA512B-49FC-4FC8-8A73-C4F87D322FF2}.Debug|x86.Build.0 = Debug|Win32
+		{FFCA512B-49FC-4FC8-8A73-C4F87D322FF2}.Debug|x86.ActiveCfg = Debug|x64
+		{FFCA512B-49FC-4FC8-8A73-C4F87D322FF2}.Debug|x86.Build.0 = Debug|x64
 		{FFCA512B-49FC-4FC8-8A73-C4F87D322FF2}.Release|x64.ActiveCfg = Release|x64
 		{FFCA512B-49FC-4FC8-8A73-C4F87D322FF2}.Release|x64.Build.0 = Release|x64
 		{FFCA512B-49FC-4FC8-8A73-C4F87D322FF2}.Release|x86.ActiveCfg = Release|Win32
@@ -25,4 +25,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {8E96B628-7273-433B-B7CE-8284E30105BC}
+	EndGlobalSection
 EndGlobal

Engine/ALIB_Bezier.h

@@ -0,0 +1,40 @@
+#pragma once
+
+#include "JC_Shape.h"
+#include "Camera.h"
+
+class ALIB_Bezier : public JC_Shape
+{
+public:
+	ALIB_Bezier(JC_Point2d P, JC_Point2d Q, JC_Point2d R,Color color_in = Colors::White)
+		:
+		P(P),
+		Q(Q),
+		R(R),
+		JC_Shape(color_in)
+	{}
+
+	void Draw(Camera cam) override
+	{
+		cam.DrawBezier(P, Q, R, Base_Color);
+	}
+	bool IsInRange(const JC_Point2d& M) override
+	{
+		return false;
+	}
+
+	std::wstring MakeDescription() override
+	{
+
+		std::wstring PosP = L"X: " + std::to_wstring(P.x) + L"\n Y: " + std::to_wstring(P.y);
+		std::wstring PosQ = L"X: " + std::to_wstring(Q.x) + L"\n Y: " + std::to_wstring(Q.y);
+		std::wstring PosR = L"X: " + std::to_wstring(R.x) + L"\n Y: " + std::to_wstring(R.y);
+
+		return	std::wstring(L"First point:\n " + PosP + L"Second point:\n " + PosQ + L"Third point:\n " + PosR);
+
+	}
+
+private:
+	JC_Point2d P, Q, R;
+
+};

Engine/Camera.h

@@ -0,0 +1,100 @@
+#pragma once
+
+#include "CordinateTrasformerh.h"
+#include "JC_Vector2.h"
+
+//Camera class should be responsible for scaling onad trafromation of the drawn objects
+//It is the part of the screen pipeline
+
+class Camera
+{
+public:
+	Camera (CoordinateTrasformer& ct)
+		:
+		ct(ct)
+	{}
+
+	JC_Point2d GetPos()const
+	{
+		return Camera_Pos;
+	}
+
+	void MoveBy(const JC_Vector2d& offset)
+	{
+		Camera_Pos += offset;
+	}
+
+	void MoweTo(const JC_Point2d pos_in)
+	{
+		Camera_Pos = pos_in;
+	}
+
+	void SetScale(double new_scale)
+	{
+		scale = new_scale;
+	}
+
+	double GetScale() const
+	{
+		return scale;
+	}
+
+	void DrawLine(JC_Point2d P_in, JC_Point2d Q_in, Color Color_in)
+	{
+		P_in -= Camera_Pos;
+		Q_in -= Camera_Pos;
+		ct.DrawLine(std::move(P_in), std::move(Q_in), std::move(Color_in));
+	}
+	void DrawPoliLine(std::vector<JC_Point2d> point_data, Color Color_in)
+	{
+		for (auto &P : point_data)
+		{
+			P -= Camera_Pos;
+		}
+
+		ct.DrawPoliLine(std::move(point_data), std::move(Color_in));
+	}
+	void DrawBezier(JC_Point2d P_in, JC_Point2d Q_in, JC_Point2d R_in, Color Color_in)
+	{
+		P_in -= Camera_Pos;
+		Q_in -= Camera_Pos;
+		R_in -= Camera_Pos;
+		ct.DrawBezier(std::move(P_in), std::move(Q_in), std::move(R_in) ,std::move(Color_in));
+	}
+
+	void DrawMPBezier(std::vector<JC_Point2d> point_data, Color Color_in)
+	{
+		for (auto &P : point_data)
+		{
+			P -= Camera_Pos;
+		}
+
+		ct.DrawMPBezier(std::move(point_data), std::move(Color_in));
+	}
+
+	void DrawCircle(JC_Point2d pos, double radius, int t, Color Color_in)
+	{
+		pos -= Camera_Pos;
+		ct.DrawCircle(std::move(pos), std::move(radius), t,  std::move(Color_in));
+	}
+
+	// trasforms Point screen coordinates to mathematical coordinates regardles from cmaera position
+
+	template <typename T> JC_Point2<T> TrasformPoint(JC_Point2<T> input)
+	{
+		//fixes disconection between screen and math coordinates
+		input.x += (T)(Camera_Pos.x); 
+		input.y -= (T)(Camera_Pos.y);
+
+		JC_Vector2<T> offset = { (T)(Graphics::ScreenWidth / 2), (T)(Graphics::ScreenHeight / 2) };
+		input -= offset;
+		input.y *= -1;
+		return input;
+	}
+
+private:
+	double scale = 1.0;
+	JC_Point2d Camera_Pos = { 0.0,0.0 };
+	CoordinateTrasformer& ct;
+
+};

Engine/ChiliRectangle.h

@@ -0,0 +1,67 @@
+#pragma once
+
+#include "JC_Vector2.h"
+
+template<typename T>
+class CRectangle
+{
+public:
+	CRectangle(T left_in, T right_in, T top_in, T bottom_in)
+		:
+		left(left_in),
+		right(right_in),
+		top(top_in),
+		bottom(bottom_in)
+	{}
+	CRectangle(const JC_Vector2<T>& topLeft, const  JC_Vector2<T>& bottomRight)
+		:
+		CRectangle(topLeft.x, bottomRight.x, topLeft.y, bottomRight.y)
+	{}
+	CRectangle(const JC_Vector2<T>& topLeft, T width, T height)
+		:
+		CRectangle(topLeft, topLeft + JC_Vector2<T>(width, height))
+	{}
+	bool IsOverlappingWith(const CRectangle& other) const
+	{
+		return right > other.left && left < other.right
+			&& bottom > other.top && top < other.bottom;
+	}
+	bool IsContainedBy(const CRectangle& other) const
+	{
+		return left >= other.left && right <= other.right &&
+			top >= other.top && bottom <= other.bottom;
+	}
+	bool Contains(const  JC_Vector2<T>& point) const
+	{
+		return point.x >= left && point.x < right && point.y >= top && point.y < bottom;
+	}
+	CRectangle FromCenter(const JC_Vector2<T>& center, T halfWidth, T halfHeight)
+	{
+		const JC_Vector2<T> half(halfWidth, halfHeight);
+		return CRectangle(center - half, center + half);
+	}
+	CRectangle GetExpanded(T offset) const
+	{
+		return CRectangle(left - offset, right + offset, top - offset, bottom + offset);
+	}
+	JC_Vector2<T> GetCenter() const
+	{
+		return JC_Vector2<T>((left + right) / (T)2, (top + bottom) / (T)2);
+	}
+	T GetWidth() const
+	{
+		return right - left;
+	}
+	T GetHeight() const
+	{
+		return bottom - top;
+	}
+public:
+	T left;
+	T right;
+	T top;
+	T bottom;
+};
+
+typedef CRectangle<int> RectI;
+typedef CRectangle<double> RectD;

Engine/ChiliUtil.h

@@ -0,0 +1,56 @@
+#pragma once
+
+#include <vector>
+
+// remove an element from a vector
+// messes up the order of elements
+// (faster than erase and doesn't need iter)
+template<typename T>
+inline void remove_element(std::vector<T>& vec, size_t index)
+{
+	// swap element to be removed with element at back
+	std::swap(vec[index], vec.back());
+	// back is now what we want dead, so pop back!
+	vec.pop_back();
+}
+
+// binary search finds matching element
+// otherwise returns end
+// Acc is a functor used to access the search keys in the elements
+template<class Iter, typename T, typename Acc>
+auto binary_find(Iter begin, Iter end, const T& val,
+	Acc acc = [](const Iter::value_type& obj)
+	->const Iter::value_type& { return obj; })
+{
+	// Finds the lower bound in at most log(last - first) + 1 comparisons
+	const auto i = std::lower_bound(begin, end, val,
+		[acc](const Iter::value_type& lhs, const T& rhs)
+	{
+		return acc(lhs) < rhs;
+	}
+	);
+
+	// if i is end, not found and do not dereference
+	// else i is either greater than or equal to value
+	// if not greater than, must be equal, so return it
+	if (i != end && !(val < acc(*i)))
+	{
+		return i; // found
+	}
+	else
+	{
+		return end; // not found
+	}
+}
+
+// uses remove_if to remove elements matching predicate over entire container
+// and then calls erase to remove the 'empty' husks at the end
+template<class Container, class Pred>
+void remove_erase_if(Container& container, Pred pred)
+{
+	// this destroys all elements matching the predicate
+	// and fills the spaces with elements from the end
+	const auto new_end = std::remove_if(container.begin(), container.end(), pred);
+	// erase garbage husk element at end
+	container.erase(new_end, container.end());
+}

Engine/ChiliWin.h

@@ -23,44 +23,51 @@
 // target Windows 7 or later
 #define _WIN32_WINNT 0x0601
 #include <sdkddkver.h>
+
 // The following #defines disable a bunch of unused windows stuff. If you 
 // get weird errors when trying to do some windows stuff, try removing some
 // (or all) of these defines (it will increase build time though).
-#define WIN32_LEAN_AND_MEAN
-#define NOGDICAPMASKS
-#define NOSYSMETRICS
-#define NOMENUS
-#define NOICONS
-#define NOSYSCOMMANDS
-#define NORASTEROPS
-#define OEMRESOURCE
-#define NOATOM
-#define NOCLIPBOARD
-#define NOCOLOR
-#define NOCTLMGR
-#define NODRAWTEXT
-#define NOKERNEL
-#define NONLS
-#define NOMEMMGR
-#define NOMETAFILE
-#define NOMINMAX
-#define NOOPENFILE
-#define NOSCROLL
-#define NOSERVICE
-#define NOSOUND
-#define NOTEXTMETRIC
-#define NOWH
-#define NOCOMM
-#define NOKANJI
-#define NOHELP
-#define NOPROFILER
-#define NODEFERWINDOWPOS
-#define NOMCX
-#define NORPC
-#define NOPROXYSTUB
-#define NOIMAGE
-#define NOTAPE
+#ifndef FULL_WINTARD
+
+#define WIN32_LEAN_AND_MEAN  //to exclude APIs such as Cryptography, DDE, RPC, Shell, and Windows Sockets.
+#define NOGDICAPMASKS	    
+#define NOSYSMETRICS	    
+#define NOICONS			    
+#define NOSYSCOMMANDS	    
+#define NORASTEROPS		 
+#define OEMRESOURCE		    
+#define NOATOM			    
+#define NOCLIPBOARD		    
+#define NOCOLOR			    
+#define NOCTLMGR		    
+#define NOKERNEL		    
+#define NONLS			    
+#define NOMEMMGR		    
+#define NOMETAFILE		    
+#define NOOPENFILE		    
+#define NOSCROLL		    
+#define NOSERVICE		    
+#define NOSOUND			    
+#define NOTEXTMETRIC	    
+#define NOWH			    
+#define NOCOMM			    
+#define NOKANJI			    
+#define NOHELP			    
+#define NOPROFILER		    
+#define NODEFERWINDOWPOS    
+#define NOMCX			    
+#define NORPC			    
+#define NOPROXYSTUB		    
+#define NOIMAGE			    
+#define NOTAPE			    
 
+#endif // FULL_WINTARD
+
+//#define NODRAWTEXT
+#define NOMINMAX
+//#define NOMENUS
+#ifndef STRICT
 #define STRICT
+#endif
 
 #include <Windows.h>