Merge branch 'demo-dev' of https://github.com/firebase/quickstart-cpp into upstream/demo-dev

Author: Grant-Postma

demos/TicTacToe/game_resources/Classes/main_menu_scene.cc

@@ -171,7 +171,8 @@ void MainMenuScene::InitializeFirebase() {
 // 5. Adds the logout button.
 void MainMenuScene::InitializeGameMenuLayer() {
  // Label to display the users record.
- user_record_label_ = Label::createWithSystemFont("", "Arial", 24);
+ user_record_label_ =
+ Label::createWithTTF("", "fonts/GoogleSans-Regular.ttf", 24);
  user_record_label_->setAlignment(TextHAlignment::RIGHT);
  user_record_label_->setTextColor(Color4B::WHITE);
  user_record_label_->setPosition(Vec2(500, 600));
@@ -180,7 +181,8 @@ void MainMenuScene::InitializeGameMenuLayer() {
  // Creates the join_text_field.
  auto join_text_field_position = Size(480, 95);
  auto join_text_field_size = Size(180, 80);
- auto join_text_field = TextField::create("code", "Arial", 48);
+ auto join_text_field =
+ TextField::create("code", "fonts/GoogleSans-Regular.ttf", 48);
  join_text_field->setPosition(join_text_field_position);
  join_text_field->setTouchSize(join_text_field_size);
  join_text_field->setTouchAreaEnabled(true);
@@ -309,13 +311,15 @@ void MainMenuScene::InitializeSignUpLayer() {
  this->addChild(sign_up_background_, /*layer_index=*/10);
 
  // Creates the layer title label: sign up.
- auto layer_title = Label::createWithSystemFont("sign up", "Arial", 48);
+ auto layer_title =
+ Label::createWithTTF("sign up", "fonts/GoogleSans-Regular.ttf", 48);
  layer_title->setAnchorPoint(Vec2(.5, .5));
  layer_title->setPosition(Vec2(300, 475));
  sign_up_background_->addChild(layer_title);
 
  // Label to output sign up errors.
- sign_up_error_label_ = Label::createWithSystemFont("", "Arial", 24);
+ sign_up_error_label_ =
+ Label::createWithTTF("", "fonts/GoogleSans-Regular.ttf", 24);
  sign_up_error_label_->setTextColor(Color4B::RED);
  sign_up_error_label_->setPosition(Vec2(300, 425));
  sign_up_background_->addChild(sign_up_error_label_);
@@ -324,7 +328,8 @@ void MainMenuScene::InitializeSignUpLayer() {
  const auto id_font_size = 28;
  const auto id_position = Size(300, 375);
  const auto id_size = Size(450, id_font_size * 1.75);
- sign_up_id_ = TextField::create("email", "Arial", id_font_size);
+ sign_up_id_ =
+ TextField::create("email", "fonts/GoogleSans-Regular.ttf", id_font_size);
  sign_up_id_->setPosition(id_position);
  sign_up_id_->setTouchAreaEnabled(true);
  sign_up_id_->setTouchSize(id_size);
@@ -355,8 +360,8 @@ void MainMenuScene::InitializeSignUpLayer() {
  const auto password_font_size = 28;
  const auto password_position = Size(300, 300);
  const auto password_size = Size(450, password_font_size * 1.75);
- sign_up_password_ =
- TextField::create("password", "Arial", password_font_size);
+ sign_up_password_ = TextField::create(
+ "password", "fonts/GoogleSans-Regular.ttf", password_font_size);
  sign_up_password_->setPosition(password_position);
  sign_up_password_->setTouchAreaEnabled(true);
  sign_up_password_->setTouchSize(password_size);
@@ -392,8 +397,9 @@ void MainMenuScene::InitializeSignUpLayer() {
  const auto password_confirm_position = Size(300, 225);
  const auto password_confirm_size =
  Size(450, password_confirm_font_size * 1.75);
- sign_up_password_confirm_ = TextField::create("confirm password", "Arial",
- password_confirm_font_size);
+ sign_up_password_confirm_ =
+ TextField::create("confirm password", "fonts/GoogleSans-Regular.ttf",
+ password_confirm_font_size);
  sign_up_password_confirm_->setPosition(password_confirm_position);
  sign_up_password_confirm_->setTouchAreaEnabled(true);
  sign_up_password_confirm_->setTouchSize(password_confirm_size);
@@ -499,13 +505,15 @@ void MainMenuScene::InitializeLoginLayer() {
  this->addChild(login_background_, /*layer_index=*/10);
 
  // Creates the layer title label: login.
- auto layer_title = Label::createWithSystemFont("Login", "Arial", 48);
+ auto layer_title =
+ Label::createWithTTF("Login", "fonts/GoogleSans-Regular.ttf", 48);
  layer_title->setAnchorPoint(Vec2(.5, .5));
  layer_title->setPosition(Vec2(300, 475));
  login_background_->addChild(layer_title);
 
  // Label to output login errors.
- login_error_label_ = Label::createWithSystemFont("", "Arial", 24);
+ login_error_label_ =
+ Label::createWithTTF("", "fonts/GoogleSans-Regular.ttf", 24);
  login_error_label_->setTextColor(Color4B::RED);
  login_error_label_->setPosition(Vec2(300, 425));
  login_background_->addChild(login_error_label_);
@@ -514,7 +522,8 @@ void MainMenuScene::InitializeLoginLayer() {
  const auto id_font_size = 28;
  const auto id_position = Size(300, 375);
  const auto id_size = Size(450, id_font_size * 1.75);
- login_id_ = TextField::create("email", "Arial", id_font_size);
+ login_id_ =
+ TextField::create("email", "fonts/GoogleSans-Regular.ttf", id_font_size);
  login_id_->setPosition(id_position);
  login_id_->setTouchAreaEnabled(true);
  login_id_->setTouchSize(id_size);
@@ -545,7 +554,8 @@ void MainMenuScene::InitializeLoginLayer() {
  const auto password_font_size = 28;
  const auto password_position = Size(300, 300);
  const auto password_size = Size(450, password_font_size * 1.75);
- login_password_ = TextField::create("password", "Arial", password_font_size);
+ login_password_ = TextField::create(
+ "password", "fonts/GoogleSans-Regular.ttf", password_font_size);
  login_password_->setPosition(password_position);
  login_password_->setTouchAreaEnabled(true);
  login_password_->setTouchSize(password_size);
@@ -645,7 +655,8 @@ void MainMenuScene::InitializeAuthenticationLayer() {
  this->addChild(auth_background_, /*layer_index=*/10);
 
  // Creates the layer title label: authentication.
- auto layer_title = Label::createWithSystemFont("authentication", "Arial", 48);
+ auto layer_title = Label::createWithTTF("authentication",
+ "fonts/GoogleSans-Regular.ttf", 48);
  layer_title->setPosition(Vec2(300, 550));
  auth_background_->addChild(layer_title);
 

demos/TicTacToe/game_resources/Classes/tic_tac_toe_layer.cc

@@ -338,14 +338,16 @@ void TicTacToeLayer::InitializeBoard() {
  // TODO(grantpostma@): Modify these numbers to be based on the extern window
  // size & label size dimensions.
  cocos2d::Label* game_uid_label =
- Label::createWithSystemFont(join_game_uid_, "Arial", 30);
+ Label::createWithTTF(join_game_uid_, "fonts/GoogleSans-Regular.ttf", 30);
  game_uid_label->setPosition(Vec2(40, 20));
  board_sprite_->addChild(game_uid_label, /*layer_index=*/1);
- waiting_label_ = Label::createWithSystemFont("waiting", "Arial", 30);
+ waiting_label_ =
+ Label::createWithTTF("waiting", "fonts/GoogleSans-Regular.ttf", 30);
  waiting_label_->setPosition(Vec2(530, 20));
 
  board_sprite_->addChild(waiting_label_, /*layer_index=*/1);
- game_over_label_ = Label::createWithSystemFont("", "Arial", 80);
+ game_over_label_ =
+ Label::createWithTTF("", "fonts/GoogleSans-Regular.ttf", 80);
  game_over_label_->setPosition(Vec2(300, 300));
  board_sprite_->addChild(game_over_label_, /*layer_index=*/1);
 

demos/TicTacToe/game_resources/Resources/fonts/GoogleSans-Regular.ttf

@@ -0,0 +1,71 @@
+Firebase Cocos2d-x TicTacToe Sample 
+==========================
+
+Desktop cocos2d-x sample using Firebase Real-Time Database and Firebase Authentication.
+
+Introduction
+------------
+
+- [Read more about Firebase](https://firebase.google.com/docs)
+
+Prerequisites
+-------------
+- [Cmake](https://cmake.org/download/) (Minimum 3.6)
+
+- [Python 2.7](https://www.python.org/download/releases/2.7/) 
+
+- The latest version [of Cocos2d-x](https://cocos2d-x.org/download) (cocos environment variable must be added to PATH) 
+
+- [Firebase CPP SDK](https://cocos2d-x.org/download) (Must be add to path under FIREBASE_CPP_SDK_DIR) 
+
+- Windows: ([Visual Studio 2019](https://visualstudio.microsoft.com/downloads/))
+
+Getting Started
+---------------
+
+- Clone the firebase cpp quickstart GitHub repo.
+ ```
+ git clone https://github.com/firebase/quickstart-cpp.git
+ ```
+
+### Windows
+- Follow the steps in
+ [Set up your app in Firebase console](https://firebase.google.com/docs/cpp/setup?platform=android#desktop-workflow).
+
+- Place the google-services.json you just acquired in the demos/TicTacToe/google_services/ directory.
+
+- Navigate to the directory that you just cloned, step into demos/TicTacToe/ and run the setup script.
+ ```
+ python setup_demo.py 
+ ```
+
+- To debug with Visual Studio 2019, copy the google-services.json file into the tic_tac_toe_demo/build/ directory. Then open the .sln in that same directory in Visual Studio.
+
+### How To Play
+
+- After you have successfully run the setup_demo.py script, you can then launch the game by running the run_demo.py script. In order to test the multiplayer functionality, open up another terminal and launch a second instant of the game by running the run_demo.py script again. 
+ ```
+ python run_demo.py 
+ ```
+
+- Using the sign-up button or login button will link your record (Wins-Losses-Ties) to your account. The skip login button will not save your record between sessions.
+
+- From the main menu screen, you can either create a game or join using a game code (displayed in the top-left corner of the game board). If you are running this demo yourself, have on instance create the game and join with your second game instance.
+
+- After finishing the game, you will notice the record will update on the main menu to reflect the result of your most recent game.
+
+Support
+-------
+
+https://firebase.google.com/support/
+
+License
+-------
+
+Copyright 2020 Google, Inc.
+
+Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License..