Merge branch 'main' of https://github.com/openshwprojects/OpenBK7231T…

…_App

.gitignore

@@ -13,7 +13,18 @@ output/**
 node_modules
 Debug*/**
 libs_for_simulator/**
+*.user
+DevIL.dll
+freeglut.dll
+ILU.dll
+ILUT.dll
+SDL2.dll
+nfd_d.lib
+/sim_lastPublish_long.txt
+/sim_lastPublishes.txt
+/sim_lastPublish.txt
+/lastMQTTPublishSentByOBK.txt
+*.sln
 
 # MacOS ignores
 .DS_Store
-

src/sim/Shape.cpp

@@ -67,7 +67,7 @@ float CShape::drawInformation2D(float x, float h) {
 	if (shapes.size()) {
 		h = drawText(NULL, x, h, "SubShapes: %i", shapes.size());
 		for (int i = 0; i < shapes.size(); i++) {
-			h = drawText(NULL, x + 20, h, "SubShape: %i/%i", i, shapes.size());
+			h = drawText(NULL, x + 20, h, "SubShape: %i/%i", i+1, shapes.size());
 			h = shapes[i]->drawInformation2D(x + 40, h);
 		}
 	}

src/sim/Simulator.cpp

@@ -29,7 +29,7 @@ CSimulator::CSimulator() {
 	activeTool = 0;
 	Window = 0;
 	Context = 0;
-	WindowFlags = SDL_WINDOW_OPENGL;
+	WindowFlags = SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE;
 	Running = 1;
 	FullScreen = 0;
 	//setTool(new Tool_Wire());
@@ -129,6 +129,9 @@ void CSimulator::drawWindow() {
 		else if (Event.type == SDL_WINDOWEVENT) {
 			switch (Event.window.event) {
 
+			case SDL_WINDOWEVENT_RESIZED:   // exit game
+				SDL_GetWindowSize(Window, &WinWidth, &WinHeight);
+				break;
 			case SDL_WINDOWEVENT_CLOSE:   // exit game
 				onUserClose();
 				break;

src/sim/sim_sdl.cpp

@@ -24,8 +24,8 @@
 #pragma comment (lib, "Opengl32.lib")
 #pragma comment (lib, "freeglut.lib")
 
-int WinWidth = 1680;
-int WinHeight = 940;
+int WinWidth = 800;
+int WinHeight = 600;
 #undef main
 
 CStyle g_style_shapes(CColor(165, 75, 75), 3.0f);