From ab437aba0185b4643c04b9b2b86a5fd5d9e81e55 Mon Sep 17 00:00:00 2001 From: Starystars67 Date: Mon, 8 May 2023 23:12:24 +0100 Subject: [PATCH] unneeded code --- ui/modules/menu/icon-adjust.svg | 3 - ui/modules/menu/icon-autobahn.svg | 7 - ui/modules/menu/icon-bug.svg | 3 - ui/modules/menu/icon-car.svg | 3 - ui/modules/menu/icon-engine.svg | 6 - ui/modules/menu/icon-exit.svg | 61 ------ ui/modules/menu/icon-flag.svg | 3 - ui/modules/menu/icon-fps.svg | 5 - ui/modules/menu/icon-gamemodes.svg | 3 - ui/modules/menu/icon-help.svg | 3 - ui/modules/menu/icon-hud.svg | 3 - ui/modules/menu/icon-map.svg | 3 - ui/modules/menu/icon-pause.svg | 3 - ui/modules/menu/icon-photo.svg | 3 - ui/modules/menu/icon-puzzle.svg | 3 - ui/modules/menu/icon-replay.svg | 3 - ui/modules/menu/icon-weather.svg | 8 - ui/modules/menu/menu.css | 97 --------- ui/modules/menu/menu.html | 3 - ui/modules/menu/menu.js | 330 ----------------------------- 20 files changed, 553 deletions(-) delete mode 100644 ui/modules/menu/icon-adjust.svg delete mode 100644 ui/modules/menu/icon-autobahn.svg delete mode 100644 ui/modules/menu/icon-bug.svg delete mode 100644 ui/modules/menu/icon-car.svg delete mode 100644 ui/modules/menu/icon-engine.svg delete mode 100644 ui/modules/menu/icon-exit.svg delete mode 100644 ui/modules/menu/icon-flag.svg delete mode 100644 ui/modules/menu/icon-fps.svg delete mode 100644 ui/modules/menu/icon-gamemodes.svg delete mode 100644 ui/modules/menu/icon-help.svg delete mode 100644 ui/modules/menu/icon-hud.svg delete mode 100644 ui/modules/menu/icon-map.svg delete mode 100644 ui/modules/menu/icon-pause.svg delete mode 100644 ui/modules/menu/icon-photo.svg delete mode 100644 ui/modules/menu/icon-puzzle.svg delete mode 100644 ui/modules/menu/icon-replay.svg delete mode 100644 ui/modules/menu/icon-weather.svg delete mode 100644 ui/modules/menu/menu.css delete mode 100644 ui/modules/menu/menu.html delete mode 100644 ui/modules/menu/menu.js diff --git a/ui/modules/menu/icon-adjust.svg b/ui/modules/menu/icon-adjust.svg deleted file mode 100644 index 1413a19..0000000 --- a/ui/modules/menu/icon-adjust.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/ui/modules/menu/icon-autobahn.svg b/ui/modules/menu/icon-autobahn.svg deleted file mode 100644 index 057dd81..0000000 --- a/ui/modules/menu/icon-autobahn.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/ui/modules/menu/icon-bug.svg b/ui/modules/menu/icon-bug.svg deleted file mode 100644 index 775f761..0000000 --- a/ui/modules/menu/icon-bug.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/ui/modules/menu/icon-car.svg b/ui/modules/menu/icon-car.svg deleted file mode 100644 index 429f2e6..0000000 --- a/ui/modules/menu/icon-car.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/ui/modules/menu/icon-engine.svg b/ui/modules/menu/icon-engine.svg deleted file mode 100644 index 82c7bee..0000000 --- a/ui/modules/menu/icon-engine.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/ui/modules/menu/icon-exit.svg b/ui/modules/menu/icon-exit.svg deleted file mode 100644 index 1c6feff..0000000 --- a/ui/modules/menu/icon-exit.svg +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - diff --git a/ui/modules/menu/icon-flag.svg b/ui/modules/menu/icon-flag.svg deleted file mode 100644 index 77968f8..0000000 --- a/ui/modules/menu/icon-flag.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/ui/modules/menu/icon-fps.svg b/ui/modules/menu/icon-fps.svg deleted file mode 100644 index 3223c5f..0000000 --- a/ui/modules/menu/icon-fps.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/ui/modules/menu/icon-gamemodes.svg b/ui/modules/menu/icon-gamemodes.svg deleted file mode 100644 index b9c0be7..0000000 --- a/ui/modules/menu/icon-gamemodes.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/ui/modules/menu/icon-help.svg b/ui/modules/menu/icon-help.svg deleted file mode 100644 index 1e269de..0000000 --- a/ui/modules/menu/icon-help.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/ui/modules/menu/icon-hud.svg b/ui/modules/menu/icon-hud.svg deleted file mode 100644 index 880d30f..0000000 --- a/ui/modules/menu/icon-hud.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/ui/modules/menu/icon-map.svg b/ui/modules/menu/icon-map.svg deleted file mode 100644 index fdfa951..0000000 --- a/ui/modules/menu/icon-map.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/ui/modules/menu/icon-pause.svg b/ui/modules/menu/icon-pause.svg deleted file mode 100644 index 1e01be9..0000000 --- a/ui/modules/menu/icon-pause.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/ui/modules/menu/icon-photo.svg b/ui/modules/menu/icon-photo.svg deleted file mode 100644 index 5618241..0000000 --- a/ui/modules/menu/icon-photo.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/ui/modules/menu/icon-puzzle.svg b/ui/modules/menu/icon-puzzle.svg deleted file mode 100644 index 67d4ede..0000000 --- a/ui/modules/menu/icon-puzzle.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/ui/modules/menu/icon-replay.svg b/ui/modules/menu/icon-replay.svg deleted file mode 100644 index 6c9041c..0000000 --- a/ui/modules/menu/icon-replay.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/ui/modules/menu/icon-weather.svg b/ui/modules/menu/icon-weather.svg deleted file mode 100644 index 6ba6be4..0000000 --- a/ui/modules/menu/icon-weather.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/ui/modules/menu/menu.css b/ui/modules/menu/menu.css deleted file mode 100644 index 7453a93..0000000 --- a/ui/modules/menu/menu.css +++ /dev/null @@ -1,97 +0,0 @@ - -/* .vertical-divider { - border-right: 2px solid var(--bng-orange); - margin: 8px 4px 8px 4px; -} */ - -.menuLimiterContainer { - height:100%; -} - -.menuLimiter { - height:100%; - /* TODO: find sensible limits for this */ - max-width:3440px; /* 1080p = 1920x1080 */ - margin: 0 auto; - display: flex; - flex-direction: column; -} - -/* Dashboard Menu */ -#dashmenu { - flex: none; - display: flex; - flex-flow: row; - flex-wrap: nowrap; - justify-content: stretch; - align-items: stretch; - background-color:rgba(0, 0, 0, 0.6); - position: relative; - z-index: var(--zorder_menu_dashmenu); -} - -/* limiters to fit all labels (both must be the same size to center the menu items) */ -#dashmenu::before, #dashmenu::after { - flex: 1 0 150px; - width: 150px; - content: ""; - display: inline-block; -} -.dashBrdButtonDiv::after { - content: ""; - flex: 0 0 2px; - width: 2px; - height: 100%; - margin: 8px -13px 8px 12px; - border-radius: 2px; - background-color: #f60; - z-index: 2; -} - -/* fix for long strings */ -#dashmenu * { - box-sizing: border-box; -} -#dashmenu > * { - display: flex; - flex-wrap: nowrap; -} -#dashmenu > *:not(.dashBrdButtonActive) { - overflow: hidden; -} -#dashmenu > *:not(.dashBrdButtonActive) > .dashBrdText { - flex: 0 1 auto; - overflow: hidden; - text-overflow: ellipsis; -} -/* do not change the order of next two rules */ -#dashmenu > * > *:last-child { - flex: 0 0 auto; -} -#dashmenu > * > *:first-child { - flex: 0 1 auto; -} -#dashmenu > *:not(.dashBrdButtonStart):not(.dashBrdButtonEnd) { - flex: 0 1 auto; - position: relative; - height: 100%; -} - -#dashmenu .dashBrdButton { - display: flex; - flex-wrap: nowrap; - justify-content: center; - align-items: center; - /* width: 100%; */ -} -#dashmenu .dashBrdSvgIcon { - flex: 0 0 auto; -} - -@media (min-width: 1024px) and (max-width: 1600px) { - #dashmenu > *:not(.dashBrdButtonActive):not(.dashBrdButtonStart):not(.dashBrdButtonEnd) { - min-width: 5%; - max-width: 10%; - } -} - diff --git a/ui/modules/menu/menu.html b/ui/modules/menu/menu.html deleted file mode 100644 index 8268954..0000000 --- a/ui/modules/menu/menu.html +++ /dev/null @@ -1,3 +0,0 @@ - - -
diff --git a/ui/modules/menu/menu.js b/ui/modules/menu/menu.js deleted file mode 100644 index 03b2c97..0000000 --- a/ui/modules/menu/menu.js +++ /dev/null @@ -1,330 +0,0 @@ -'use strict' - -angular.module('beamng.stuff') -.controller('MenuController', ['$rootScope', '$scope', 'Utils', '$state', '$timeout', 'mdx', function ($rootScope, $scope, Utils, $state, $timeout, mdx) { - let vm = this - - let availableMenuEntries = [ - { - translateid: 'ui.inputActions.menu.menu_item_back.title', - icon: 'arrow_back', - class: "dashBrdButtonStart dashBrdButtonTopLeft", - soundClass: "bng_back_hover_generic", - targetState: '', - action: () => { - $rootScope.$broadcast('MenuToggle') - }, - onlyIngame: false, - gamepadNavigateable: false, - navigationDisabled: true, - }, - { - translateid: 'ui.dashboard.menu', - iconSVG: '/ui/modules/menu/icon-gamemodes.svg', - targetState: 'menu.mainmenu', - onlyIngame: false, - }, - { - translateid: 'ui.playmodes.career', - iconSVG: '/ui/modules/menu/icon-gamemodes.svg', - targetState: 'menu.careerPause', - onlyIngame: true, - isVisible: () => $scope.inCareer, - }, - { - translateid: 'ui.mainmenu.garage', - iconSVG: '/ui/modules/mainmenu/drive/icons/garage.svg', - targetState: '', - action: () => { - bngApi.engineLua("career_modules_playerDriving.onResetGameplay()"); - }, - onlyIngame: true, - isVisible: () => $scope.inCareer, - blackListStates: ['scenario','mission','garage'], - }, - { - translateid: 'ui.dashboard.bigmap', - //iconSVG: '/ui/modules/menu/icon-map.svg', - icon: 'map', - targetState: 'menu.bigmap', - blackListStates: ['scenario','mission','garage'], - onlyIngame: true, - isVisible: () => !$scope.inCareer || ($scope.inCareer && $state.gamestate.name!=='garage') - }, - { - translateid: 'ui.dashboard.gameContext', - iconSVG: '/ui/modules/menu/icon-flag.svg', - targetState: 'menu.careermission', - isVisible: () => vm.missionEnabled, - blackListStates: ['scenario','garage'], - onlyIngame: true, - }, - { - translateid: 'ui.dashboard.mods', - iconSVG: '/ui/modules/menu/icon-puzzle.svg', - targetState: 'menu.mods.local', - blackListStates: ['scenario','mission','garage'], - substate: 'menu.mods', - onlyIngame: true, - }, - { - translateid: 'ui.dashboard.vehicles', - iconSVG: '/ui/modules/menu/icon-car.svg', - targetState: 'menu.vehicles', - blackListStates: ['scenario','mission','garage','career'], - substate: 'menu.vehicles', - onlyIngame: true, - }, - { - translateid: 'ui.dashboard.vehicleconfig', - iconSVG: '/ui/modules/menu/icon-engine.svg', - targetState: 'menu.vehicleconfig.parts', - blackListStates: ['scenario','mission','garage','career'], - substate: 'menu.vehicleconfig', - onlyIngame: true, - }, - { - translateid: 'ui.dashboard.environment', - iconSVG: '/ui/modules/menu/icon-weather.svg', - targetState: 'menu.environment', - blackListStates: ['scenario','mission','garage'], - onlyIngame: true, - }, - { - translateid: 'ui.dashboard.photomode', - iconSVG: '/ui/modules/menu/icon-photo.svg', - targetState: 'menu.photomode', - onlyIngame: true, - blackListStates: ['garage'], - }, - { - translateid: 'ui.dashboard.appedit', - iconSVG: '/ui/modules/menu/icon-hud.svg', - targetState: 'menu.appedit', - onlyIngame: true, - blackListStates: ['scenario'], - }, - { - translateid: 'ui.dashboard.options', - iconSVG: '/ui/modules/menu/icon-adjust.svg', - targetState: 'menu.options.graphics', - substate: 'menu.options', - onlyIngame: true, - }, - ] - - for(let m of availableMenuEntries) { - if(!m.action && m.targetState) { - // if no action is defined, toggle the states - m.action = () => { - if ($state.current.name !== m.targetState) { - $state.go(m.targetState); - } - else - $scope.$emit("MenuToggle"); - } - } - if(!m.action) { - console.error('state is missing action or targetState') - } - } - - // Mission Menu and Career Stuff - vm.missionEnabled = false - $scope.inCareer = false; - bngApi.engineLua(`{ - gameContext = core_gameContext.getGameContext(), - isCareerActive = career_career.isCareerActive() - }`, data => { - $scope.$evalAsync(() => { - vm.missionEnabled = data.gameContext && data.gameContext.context && data.gameContext.context !== "empty"; - $scope.inCareer = !!data.isCareerActive; - if ($state.current && $state.current.name === "menu") { - if (vm.missionEnabled) - $state.go("menu.careermission"); - else if ($scope.inCareer) - $state.go("menu.careerPause"); - } - updateMenu(); - }) - }); - - $scope.$on("onMissionAvailabilityChanged", (event, res) => { - if(res && res.missionCount !== undefined) { - vm.missionEnabled = res.missionCount > 0 - updateMenu() - if($state.current && $state.current.name === "menu.careermission" && !vm.missionEnabled) { - $state.go("menu"); - } - } - }) - - vm.pause = function() { - bngApi.engineLua(`bullettime.pause(true)`) - } - - $rootScope.$broadcast("TopMenuButtons", (button, index=-1) => { - if (typeof index !== "number" && index < availableMenuEntries.length) - index = -1; - if (index > 0) - availableMenuEntries.splice(index, 0, button); - else - availableMenuEntries.push(button); - updateMenu(); - }); - - function updateMenu() { - let entries = []; - const app = $scope.$parent && $scope.$parent.app ? $scope.$parent.app : {}; - if ($state.current.name !== 'menu.mainmenu' || !app.mainmenu) { - // TODO: revert to normal gamestate when it will be implemented for career (but don't forget about career's garage) - if ($scope.inCareer && ["freeroam", "garage"].includes(app.gameState)) - $scope.gameState = "career"; - else - $scope.gameState = app.gameState; - for(let entry of availableMenuEntries) { - // visibility - if(entry.blackListStates && entry.blackListStates.includes($scope.gameState)) { - continue; - } - if(entry.isVisible && !entry.isVisible()) { - continue; - } - if($scope.$parent && app.mainmenu && entry.onlyIngame) { - //console.log('ignored menu entry in main menu: ', entry) - continue - } - - if (entry.navigationDisabled === undefined) { - entry.navigationDisabled = false - } - - // determine if the thing is 'active' as in 'used / switched on' - entry.active = false - if (entry.isActive) { - entry.active = entry.isActive() - } else { - let isInSubState = false - if(entry.substate) { - isInSubState = $state.current.name.startsWith(entry.substate) - } - entry.active = ($state.includes(entry.targetState) | isInSubState) && entry.targetState != '.' && entry.targetState != '' - } - entries.push(entry) - } - //console.log('updateMenu = ', entries) - } - - if(entries.length > 0) { - entries[entries.length-1].isLastItem = true - } - - $scope.$applyAsync(() => { - for (let i = 0; i < entries.length; i++) - entries[i].id = `top-menu-${i}`; - vm.entries = entries; - }) - } - $scope.$on('$stateChangeSuccess', function (event, toState, toParams, fromState, fromParams) { - updateMenu() - }) - updateMenu() - - - // Angular material theme palette tests - let palettes = ['primary', 'accent', 'warn', 'background'] - let types = ['default', 'hue-1', 'hue-2', 'hue-3'] - let colors = {} - let theme = mdx.mdxThemeColors.theme('default') - for(let pIdx in palettes) { - let p = palettes[pIdx] - for(let tIdx in types) { - let t = types[tIdx] - let paletteName = 'custom' + p.substr(0, 1).toUpperCase() + p.substr(1) - let ref = theme.colors[p]['hues'][t] - if(paletteName in mdx.mdxThemeColors._PALETTES) { - let col = 'rgb(' + (mdx.mdxThemeColors._PALETTES[paletteName][ref].value.toString()) + ')' - let colContrast = 'rgb(' + (mdx.mdxThemeColors._PALETTES[paletteName][ref].contrast.toString()) + ')' - colors[paletteName + "/" + t] = [ref, col, colContrast] - } - } - } - //vm.colorDebug = colors - - // switches to the next or previous visible menu entry (increment +1 or -1 respectively) - vm.selectVisibleMenuEntry = function(increment) { - if ($scope.$parent && $scope.$parent.app && $scope.$parent.app.mainmenu) - return; // tab navigation shouldn't work while in the Main Menu - - // first, find the current active element - let currMenuEntryIndex = 0 - for (let i in vm.entries) { - if (!vm.entries[i].active) continue - currMenuEntryIndex = Number(i) - break - } - - // then find the next suitable one - let newIndex = currMenuEntryIndex - for(let i = 0; i < 5; i++) { - newIndex = newIndex + increment - if (newIndex >= vm.entries.length) newIndex = 0 - if (newIndex < 0) newIndex = vm.entries.length - 1 - if (vm.entries[newIndex].gamepadNavigateable === false || vm.entries[newIndex].targetState === undefined) - continue; - if (!vm.entries[newIndex].targetState && !vm.entries[newIndex].action) - continue; - // found a suitable element ... - break - } - - // navigate left (increment -1) or right (increment +1), wrapping around when reaching the menu borders - //console.log('newIndex = ', newIndex, 'vm.entries = ', vm.entries) - if (vm.entries[newIndex].targetState) { - $state.go(vm.entries[newIndex].targetState) - } else if (vm.entries[newIndex].action && vm.entries[newIndex].id) { - try { - document.getElementById(vm.entries[newIndex].id).focus(); - for (let i = 0; i < vm.entries.length; i++) - vm.entries[i].active = i === newIndex; - vm.entries[newIndex].activeSilent = true; - } catch (err) { } - } - } - - $scope.$on('$tabLeft', () => { vm.selectVisibleMenuEntry(-1) }) - $scope.$on('$tabRight', () => { vm.selectVisibleMenuEntry( 1) }) -}]) - -.directive('dashMenu', ['Utils', '$rootScope', function (Utils, $rootScope, ) { - return { - restrict: 'E', - // controller: 'MenuController', - // controllerAs: 'menuCtrl', - replace: true, - template: ` -
-
-
- - {{entry.icon}} - - {{ entry.translateid | translate}} -
- -
- - {{ 'ui.inputActions.general.pause.title' | translate }} - {{ 'ui.inputActions.general.pause.title' | translate}} -
-
- `, - } -}])