asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Style: Apply clang-format to @reduz's changes

Browse source 
[ci skip]
This commit is contained in:
Rémi Verschelde 2017-09-13 09:13:23 +02:00
parent a4005221f5
commit e73e00d369
7 changed files with 36 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
editor/import/resource_importer_texture.cpp
View file

@ -30,10 +30,11 @@
#include "resource_importer_texture.h" #include "resource_importer_texture.h"
#include "editor/editor_file_system.h" #include "editor/editor_file_system.h"
#include "editor/editor_node.h"
#include "io/config_file.h" #include "io/config_file.h"
#include "io/image_loader.h" #include "io/image_loader.h"
#include "scene/resources/texture.h" #include "scene/resources/texture.h"
#include "editor/editor_node.h"
void ResourceImporterTexture::_texture_reimport_srgb(const Ref<StreamTexture> &p_tex) { void ResourceImporterTexture::_texture_reimport_srgb(const Ref<StreamTexture> &p_tex) {
singleton->mutex->lock(); singleton->mutex->lock();

4
main/main.cpp
View file

@ -58,9 +58,9 @@
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
#include "editor/doc/doc_data.h" #include "editor/doc/doc_data.h"
#include "editor/doc/doc_data_class_path.gen.h"
#include "editor/editor_node.h" #include "editor/editor_node.h"
#include "editor/project_manager.h" #include "editor/project_manager.h"
#include "editor/doc/doc_data_class_path.gen.h"
#endif #endif
#include "io/file_access_network.h" #include "io/file_access_network.h"
@ -75,7 +75,6 @@
#include "translation.h" #include "translation.h"
#include "version.h" #include "version.h"
static ProjectSettings *globals = NULL; static ProjectSettings *globals = NULL;
static Engine *engine = NULL; static Engine *engine = NULL;
static InputMap *input_map = NULL; static InputMap *input_map = NULL;
@ -1155,7 +1154,6 @@ bool Main::start() {
DocData doc; DocData doc;
doc.generate(doc_base); doc.generate(doc_base);
DocData docsrc; DocData docsrc;
Map<String, String> doc_data_classes; Map<String, String> doc_data_classes;
Set<String> checked_paths; Set<String> checked_paths;

4
platform/windows/os_windows.cpp
View file

@ -893,7 +893,6 @@ typedef enum _SHC_PROCESS_DPI_AWARENESS {
SHC_PROCESS_PER_MONITOR_DPI_AWARE = 2 SHC_PROCESS_PER_MONITOR_DPI_AWARE = 2
} SHC_PROCESS_DPI_AWARENESS; } SHC_PROCESS_DPI_AWARENESS;
void OS_Windows::initialize(const VideoMode &p_desired, int p_video_driver, int p_audio_driver) { void OS_Windows::initialize(const VideoMode &p_desired, int p_video_driver, int p_audio_driver) {
main_loop = NULL; main_loop = NULL;
@ -902,7 +901,7 @@ void OS_Windows::initialize(const VideoMode &p_desired, int p_video_driver, int
WNDCLASSEXW wc; WNDCLASSEXW wc;
if (is_hidpi_allowed()) { if (is_hidpi_allowed()) {
HMODULE Shcore = LoadLibraryW(L"Shcore.dll");; HMODULE Shcore = LoadLibraryW(L"Shcore.dll");
if (Shcore != NULL) { if (Shcore != NULL) {
typedef HRESULT(WINAPI * SetProcessDpiAwareness_t)(SHC_PROCESS_DPI_AWARENESS); typedef HRESULT(WINAPI * SetProcessDpiAwareness_t)(SHC_PROCESS_DPI_AWARENESS);
@ -915,7 +914,6 @@ void OS_Windows::initialize(const VideoMode &p_desired, int p_video_driver, int
} }
} }
video_mode = p_desired; video_mode = p_desired;
//printf("**************** desired %s, mode %s\n", p_desired.fullscreen?"true":"false", video_mode.fullscreen?"true":"false"); //printf("**************** desired %s, mode %s\n", p_desired.fullscreen?"true":"false", video_mode.fullscreen?"true":"false");
RECT WindowRect; RECT WindowRect;