From 583157d4ef18b891ae52fc104450b32a01f414ac Mon Sep 17 00:00:00 2001 From: Philip Rideout Date: Thu, 2 Apr 2020 04:47:27 -0700 Subject: [PATCH] Remove vk_ prefix from desktop samples. --- samples/CMakeLists.txt | 19 +++--- samples/{vk_animation.cpp => animation.cpp} | 0 .../{vk_depthtesting.cpp => depthtesting.cpp} | 0 samples/{vk_hellopbr.cpp => hellopbr.cpp} | 0 ...vk_hellotriangle.cpp => hellotriangle.cpp} | 0 samples/{vk_shadowtest.cpp => shadowtest.cpp} | 0 .../{vk_strobecolor.cpp => strobecolor.cpp} | 0 .../{vk_texturedquad.cpp => texturedquad.cpp} | 0 samples/{vk_vbotest.cpp => vbotest.cpp} | 0 samples/{vk_viewtest.cpp => viewtest.cpp} | 0 samples/vk_imgui.cpp | 59 ------------------- 11 files changed, 9 insertions(+), 69 deletions(-) rename samples/{vk_animation.cpp => animation.cpp} (100%) rename samples/{vk_depthtesting.cpp => depthtesting.cpp} (100%) rename samples/{vk_hellopbr.cpp => hellopbr.cpp} (100%) rename samples/{vk_hellotriangle.cpp => hellotriangle.cpp} (100%) rename samples/{vk_shadowtest.cpp => shadowtest.cpp} (100%) rename samples/{vk_strobecolor.cpp => strobecolor.cpp} (100%) rename samples/{vk_texturedquad.cpp => texturedquad.cpp} (100%) rename samples/{vk_vbotest.cpp => vbotest.cpp} (100%) rename samples/{vk_viewtest.cpp => viewtest.cpp} (100%) delete mode 100644 samples/vk_imgui.cpp diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt index d4c2edbe30..542c805162 100644 --- a/samples/CMakeLists.txt +++ b/samples/CMakeLists.txt @@ -334,16 +334,15 @@ endif() # ================================================================================================== if (FILAMENT_SUPPORTS_VULKAN) - add_assimp_demo(vk_shadowtest) - add_filamesh_demo(vk_animation) - add_filamesh_demo(vk_depthtesting) - add_filamesh_demo(vk_hellopbr) - add_filamesh_demo(vk_hellotriangle) - add_filamesh_demo(vk_imgui) - add_filamesh_demo(vk_strobecolor) - add_filamesh_demo(vk_texturedquad) - add_filamesh_demo(vk_vbotest) - add_filamesh_demo(vk_viewtest) + add_assimp_demo(shadowtest) + add_filamesh_demo(animation) + add_filamesh_demo(depthtesting) + add_filamesh_demo(hellopbr) + add_filamesh_demo(hellotriangle) + add_filamesh_demo(strobecolor) + add_filamesh_demo(texturedquad) + add_filamesh_demo(vbotest) + add_filamesh_demo(viewtest) endif() # ================================================================================================== diff --git a/samples/vk_animation.cpp b/samples/animation.cpp similarity index 100% rename from samples/vk_animation.cpp rename to samples/animation.cpp diff --git a/samples/vk_depthtesting.cpp b/samples/depthtesting.cpp similarity index 100% rename from samples/vk_depthtesting.cpp rename to samples/depthtesting.cpp diff --git a/samples/vk_hellopbr.cpp b/samples/hellopbr.cpp similarity index 100% rename from samples/vk_hellopbr.cpp rename to samples/hellopbr.cpp diff --git a/samples/vk_hellotriangle.cpp b/samples/hellotriangle.cpp similarity index 100% rename from samples/vk_hellotriangle.cpp rename to samples/hellotriangle.cpp diff --git a/samples/vk_shadowtest.cpp b/samples/shadowtest.cpp similarity index 100% rename from samples/vk_shadowtest.cpp rename to samples/shadowtest.cpp diff --git a/samples/vk_strobecolor.cpp b/samples/strobecolor.cpp similarity index 100% rename from samples/vk_strobecolor.cpp rename to samples/strobecolor.cpp diff --git a/samples/vk_texturedquad.cpp b/samples/texturedquad.cpp similarity index 100% rename from samples/vk_texturedquad.cpp rename to samples/texturedquad.cpp diff --git a/samples/vk_vbotest.cpp b/samples/vbotest.cpp similarity index 100% rename from samples/vk_vbotest.cpp rename to samples/vbotest.cpp diff --git a/samples/vk_viewtest.cpp b/samples/viewtest.cpp similarity index 100% rename from samples/vk_viewtest.cpp rename to samples/viewtest.cpp diff --git a/samples/vk_imgui.cpp b/samples/vk_imgui.cpp deleted file mode 100644 index 4fb48c170a..0000000000 --- a/samples/vk_imgui.cpp +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed 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. - */ - -#include - -#include -#include -#include - -#include "app/Config.h" -#include "app/FilamentApp.h" - -int main(int argc, char** argv) { - bool showDemo = false; - bool showMetrics = false; - auto imgui = [&showDemo, &showMetrics] (filament::Engine*, filament::View*) { - // In ImGui, the window title is a unique identifier, so don't call this "ImGui Demo" to - // avoid colliding with ImGui::ShowDemoWindow(). - ImGui::Begin("ImGui", nullptr, ImGuiWindowFlags_MenuBar); - if (ImGui::BeginMenuBar()) { - if (ImGui::BeginMenu("File")) { - if (ImGui::MenuItem("Close")) { - FilamentApp::get().close(); - } - ImGui::EndMenu(); - } - ImGui::EndMenuBar(); - } - ImGui::Checkbox("Widgets", &showDemo); - ImGui::Checkbox("Metrics", &showMetrics); - if (showDemo) { - ImGui::ShowDemoWindow(&showDemo); - } - if (showMetrics) { - ImGui::ShowMetricsWindow(&showMetrics); - } - ImGui::End(); - }; - Config config; - config.backend = filament::Engine::Backend::VULKAN; - config.title = "ImGui Demo"; - auto nop = [](filament::Engine*, filament::View*, filament::Scene*) {}; - FilamentApp::get().run(config, nop, nop, imgui); - - return 0; -}