diff --git a/aufgabe5/public/assets/css/style.css b/aufgabe5/public/assets/css/style.css index 11c0bf4..e69de29 100755 --- a/aufgabe5/public/assets/css/style.css +++ b/aufgabe5/public/assets/css/style.css @@ -1,9 +0,0 @@ -#canvas-wrap { - position:relative -} - -#overlay { - position:absolute; - top:20px; - left:30px; -} \ No newline at end of file diff --git a/aufgabe5/public/assets/js/webgl.js b/aufgabe5/public/assets/js/webgl.js index 3b8502c..c4eab00 100644 --- a/aufgabe5/public/assets/js/webgl.js +++ b/aufgabe5/public/assets/js/webgl.js @@ -41,16 +41,16 @@ var light; function setup_flags() { flags = [ - { id: "birth_rate_per_1000", name: "Birth Rate / 100", enabled: true, color: 0xff0000 }, - { id: "cell_phones_per_100", name: "Cell Phones / 100", enabled: false, color: 0x0ff000 }, - { id: "children_per_woman", name: "Children / Woman", enabled: false, color: 0x00ff00 }, - { id: "electricity_consumption_per_capita", name: "Electricity Consumption / Capita", enabled: false, color: 0x000ff0 }, - { id: "gdp_per_capita", name: "GDP / Capita", enabled: false, color: 0x0000ff }, - { id: "gdp_per_capita_growth", name: "GDP / Capita Growth", enabled: false, color: 0xf0000f }, - { id: "inflation_annual", name: "Inflation Annual", enabled: false, color: 0xf000f0 }, - { id: "internet_user_per_100", name: "Internet User / 100", enabled: false, color: 0x00f00f }, - { id: "life_expectancy", name: "Life Expectancy", enabled: false, color: 0xf00f00 }, - { id: "military_expenditure_percent_of_gdp", name: "Military Expenditure % of GDP", enabled: false, color: 0x0f00f0 }, + { id: "birth_rate_per_1000", name: "Birth Rate / 100", enabled: true, color: 0xff0000, scale: 0.1 }, + { id: "cell_phones_per_100", name: "Cell Phones / 100", enabled: false, color: 0xFFAA00, scale: 0.05 }, + { id: "children_per_woman", name: "Children / Woman", enabled: false, color: 0xAAFF00, scale: 1.0 }, + { id: "electricity_consumption_per_capita", name: "Electricity Consumption / Capita", enabled: false, color: 0x005AFF, scale: 0.00004 }, + { id: "gdp_per_capita", name: "GDP / Capita", enabled: false, color: 0xFFFF00, scale: 0.0001 }, + { id: "gdp_per_capita_growth", name: "GDP / Capita Growth", enabled: false, color: 0xE700FF, scale: 0.5 }, + { id: "inflation_annual", name: "Inflation Annual", enabled: false, color: 0x00F9FF, scale: 0.2 }, + { id: "internet_user_per_100", name: "Internet User / 100", enabled: false, color: 0xFF009A, scale: 0.05 }, + { id: "life_expectancy", name: "Life Expectancy", enabled: false, color: 0x00FF10, scale: 0.05 }, + { id: "military_expenditure_percent_of_gdp", name: "Military Expenditure % of GDP", enabled: false, color: 0x0027FF, scale: 1.0 }, ]; } @@ -62,6 +62,8 @@ function setup_checkboxes() { checkboxes += ""; checkboxes += " - - - - @@ -25,9 +21,9 @@ +
- -
+