fix for different aspect ratios thingy. uhh fixed positions for stuff in menus

Author: Tr1NgleDev

Classes/AppDelegate.cpp

@@ -78,9 +78,25 @@ void AppDelegate::onGLFWwindowSizeCallback(GLFWwindow*, int w, int h)
 	auto glView = director->getOpenGLView();
 
 	glView->setFrameSize(w, h);
+
 
-	glView->setDesignResolutionSize(569, 320,
-		ResolutionPolicy::NO_BORDER);
+	// uhh stuff to make different aspect ratios work ig?
+	if (w > 1280)
+		glView->setDesignResolutionSize(569 + (w - 1280), 320,
+			ResolutionPolicy::FIXED_HEIGHT);
+	else
+		glView->setDesignResolutionSize(569, 320 - (w - 1280),
+			ResolutionPolicy::FIXED_WIDTH);
+
+	if (h > 720)
+		glView->setDesignResolutionSize(569, 320 + (h - 720),
+			ResolutionPolicy::FIXED_WIDTH);
+	else
+		glView->setDesignResolutionSize(569 - (h - 720), 320,
+			ResolutionPolicy::FIXED_HEIGHT);
+	
+	//glView->setDesignResolutionSize(569, 320,
+	//	ResolutionPolicy::SHOW_ALL);
 
 	director->getEventDispatcher()->dispatchCustomEvent(GLViewImpl::EVENT_WINDOW_RESIZED, nullptr);
 }
@@ -97,8 +113,9 @@ bool AppDelegate::applicationDidFinishLaunching()
 		glView = GLViewImpl::createWithRect(
 			"OpenGD", ax::Rect(0, 0, 1280, 720), 1.f, true);
 #else
-		glView = GLViewImpl::create("OpenGD");
+		glView = GLViewImpl::create("OpenGD", true);
 #endif
+		
 		/*
 		auto full = dynamic_cast<GLViewImpl *>(glView);
 		full->setFullscreen();
@@ -114,41 +131,35 @@ bool AppDelegate::applicationDidFinishLaunching()
 
 	// Set the design resolution
 	glView->setDesignResolutionSize(569, 320,
-									ResolutionPolicy::FIXED_WIDTH);
+									ResolutionPolicy::SHOW_ALL);
+
+	// uhh stuff to make different aspect ratios work ig?
+	if (glView->getFrameSize().width > 1280)
+		glView->setDesignResolutionSize(569 + (glView->getFrameSize().width - 1280), 320,
+			ResolutionPolicy::FIXED_HEIGHT);
+	else
+		glView->setDesignResolutionSize(569, 320 - (glView->getFrameSize().width - 1280),
+			ResolutionPolicy::FIXED_WIDTH);
+
+	if (glView->getFrameSize().height > 720)
+		glView->setDesignResolutionSize(569, 320 + (glView->getFrameSize().height - 720),
+			ResolutionPolicy::FIXED_WIDTH);
+	else
+		glView->setDesignResolutionSize(569 - (glView->getFrameSize().height - 720), 320,
+			ResolutionPolicy::FIXED_HEIGHT);
+
 
 #if (AX_TARGET_PLATFORM == AX_PLATFORM_WIN32) || (AX_TARGET_PLATFORM == AX_PLATFORM_MAC) || \
 	(AX_TARGET_PLATFORM == AX_PLATFORM_LINUX)
 
-	glfwSetWindowAspectRatio(static_cast<GLViewImpl*>(glView)->getWindow(), 16, 9);
+	//glfwSetWindowAspectRatio(static_cast<GLViewImpl*>(glView)->getWindow(), 16, 9);
 
 	glfwSetWindowSizeCallback(static_cast<GLViewImpl*>(glView)->getWindow(), AppDelegate::onGLFWwindowSizeCallback);
 
 #endif
 
-	//glView->setFrameSize(1280, 720);
-
 	director->setContentScaleFactor(2.0f);
 
-	/*
-	// if the frame's height is larger than the height of medium size.
-	if (frameSize.height > mediumResolutionSize.height)
-	{
-		director->setContentScaleFactor(MIN(largeResolutionSize.height / designResolutionSize.height,
-											largeResolutionSize.width / designResolutionSize.width));
-	}
-	// if the frame's height is larger than the height of small size.
-	else if (frameSize.height > smallResolutionSize.height)
-	{
-		director->setContentScaleFactor(MIN(mediumResolutionSize.height / designResolutionSize.height,
-											mediumResolutionSize.width / designResolutionSize.width));
-	}
-	// if the frame's height is smaller than the height of medium size.
-	else
-	{
-		director->setContentScaleFactor(MIN(smallResolutionSize.height / designResolutionSize.height,
-											smallResolutionSize.width / designResolutionSize.width));
-	}
-*/
 	register_all_packages();
 
 	// create a scene. it's an autorelease object

Classes/LevelPage.cpp

@@ -99,15 +99,16 @@ bool LevelPage::init(GJGameLevel* level)
 			if (!LevelPage::replacingScene)
 			{
 				ax::AudioEngine::stopAll();
-				ax::AudioEngine::play2d("playSound_01.ogg", false, 0.5f);
+				ax::AudioEngine::play2d("playSound_01.ogg", false, 0.2f);
 				ax::Director::getInstance()->replaceScene(ax::TransitionFade::create(0.5f, PlayLayer::scene(level)));
 				LevelPage::replacingScene = true;
+				MenuLayer::music = false;
 			}
 		});
 	mainBtn->setScaleMultiplier(1.1f);
 	auto levelMenu = ax::Menu::create();
 	levelMenu->addChild(mainBtn);
-	levelMenu->setPosition({283.5, 220});
+	levelMenu->setPosition({ winSize.width / 2.f, 220 });
 	addChild(levelMenu);
 
 	return true;

Classes/LevelSelectLayer.cpp

@@ -48,7 +48,7 @@ bool LevelSelectLayer::init()
 	_background->setPosition({-5.0f, -5.0f});
 	_background->setColor({0x28, 0x7D, 0xFF});
 
-	// // why does game manager store the ground id? who knows!
+	// why does game manager store the ground id? who knows!
 	_ground = GroundLayer::create(1);
 	_ground->setPositionY(-25.f);
 	addChild(_ground, -1);
@@ -75,6 +75,7 @@ bool LevelSelectLayer::init()
 
 	auto bsl = BoomScrollLayer::create(layers, 0);
 	addChild(bsl);
+
 	/* std::vector<GJGameLevel> mainLevels;
 	cocos2d::CCArray* levelPages = cocos2d::CCArray::create();
 	for (size_t i = 0; i < 22; i++)
@@ -147,7 +148,7 @@ bool LevelSelectLayer::init()
 	btnMenu->addChild(rightBtn);
 
 	//right->setScale(2.0f);
-	rightBtn->setPosition(btnMenu->convertToNodeSpace({569 - 25.0f, winSize.height / 2}));
+	rightBtn->setPosition(btnMenu->convertToNodeSpace({ winSize.width - 25.0f, winSize.height / 2 }));
 
 	auto back = Sprite::createWithSpriteFrameName("GJ_arrow_01_001.png");
 	MenuItemSpriteExtra* backBtn = MenuItemSpriteExtra::create(back, [&](Node* btn) {
@@ -174,7 +175,7 @@ bool LevelSelectLayer::init()
 	});
 	infoMenu->addChild(infoBtn, 1);
 
-	infoMenu->setPosition({569.f - 20.0f, 320 - 20.0f});
+	infoMenu->setPosition({ winSize.width - 20.0f, winSize.height - 20.0f });
 
 	//if (controller) GameToolbox::addBackButton(this, backBtn);
 	return true;

Classes/MenuLayer.cpp

@@ -23,7 +23,7 @@
 
 USING_NS_AX;
 
-bool music = true;
+bool MenuLayer::music = true;
 
 Scene* MenuLayer::scene()
 {
@@ -49,7 +49,7 @@ bool MenuLayer::init()
 	auto log_oSpr = Sprite::createWithSpriteFrameName("GJ_logo_001.png");
 	log_oSpr->setStretchEnabled(false);
 	//log_oSpr->setPosition({ winSize.width / 2, winSize.height - 100 });
-	log_oSpr->setPosition({284.5, 270});
+	log_oSpr->setPosition({ winSize.width / 2.f, winSize.height - 50 });
 	this->addChild(log_oSpr);
 	auto playBtn = MenuItemSpriteExtra::create("GJ_playBtn_001.png", [&](Node* btn) {
 		/* AudioEngine::stopAll();
@@ -60,7 +60,7 @@ bool MenuLayer::init()
 		Director::getInstance()->pushScene(TransitionFade::create(0.5f, scene));
 	});
 	playBtn->getChildren().at(0)->setAnchorPoint({0.5, 0.5});
-	playBtn->setPosition({0, 0});
+	playBtn->setPosition({ 0, 0 });
 	//static_cast<ax::Sprite*>(playBtn->getSprite())->setStretchEnabled(false);
 
 	auto garageBtn = MenuItemSpriteExtra::create("GJ_garageBtn_001.png", [&](Node* btn) {
@@ -81,7 +81,7 @@ bool MenuLayer::init()
 
 	auto mainButtonMenu = Menu::create(garageBtn, playBtn, creatorBtn, nullptr);
 
-	mainButtonMenu->setPosition({282.5f, 170});
+	mainButtonMenu->setPosition({ winSize.width / 2.f , winSize.height / 2.f + 10 });
 	addChild(mainButtonMenu);
 
 	auto robBtn = MenuItemSpriteExtra::create(
@@ -123,7 +123,7 @@ bool MenuLayer::init()
 
 	auto bottomMenu = Menu::create(achievementsBtn, optionsBtn, statsBtn, nullptr);
 
-	bottomMenu->setPosition({284.5, 45});
+	bottomMenu->setPosition({ winSize.width / 2.f, 45 });
 	//bottomMenu->setPositionY(100);
 	bottomMenu->alignItemsHorizontallyWithPadding(5);
 
@@ -137,7 +137,7 @@ bool MenuLayer::init()
 	});
 
 	auto moreMenu = Menu::create();
-	moreMenu->setPosition({524, 45});
+	moreMenu->setPosition({ winSize.width - 45, 45 });
 	moreMenu->addChild(moreGamesBtn);
 	addChild(moreMenu);
 

Classes/MenuLayer.h

@@ -7,6 +7,7 @@ extern bool music;
 class MenuLayer : public ax::Layer 
 {
 public:
+	static bool music;
 	static ax::Scene* scene();
 	bool init();
 	CREATE_FUNC(MenuLayer);

Classes/PlayLayer.cpp

@@ -974,11 +974,9 @@ void PlayLayer::onExit()
 	ImGuiPresenter::getInstance()->removeRenderLoop("#playlayer");
 #endif
 	LevelPage::replacingScene = false;
-	music = true;
 	Instance = nullptr;
 	Layer::onExit();
 }
-
 void PlayLayer::exit()
 {
 	m_pPlayer->deactivateStreak();
@@ -1005,6 +1003,7 @@ void PlayLayer::exit()
 	AudioEngine::stopAll();
 	AudioEngine::play2d("quitSound_01.ogg", false, 0.1f);
 	AudioEngine::play2d("menuLoop.mp3", true, 0.2f);
+	MenuLayer::music = false;
 	Director::getInstance()->replaceScene(TransitionFade::create(0.5f, LevelSelectLayer::scene()));
 
 }