Remove 3d version, since it's broken now.

Lexxie9952 · Mar 17, 2021 · 95e58b9 · 95e58b9
1 parent a9910dc
commit 95e58b9
Show file tree

Hide file tree

Showing 288 changed files with 1 addition and 38,700 deletions.
diff --git a/README.md b/README.md
@@ -48,11 +48,6 @@ Freeciv-Web consists of these components:
 
 * [freeciv-earth](freeciv-earth) is code to generate Freeciv savegames from a map captured from mapbox.
 
-Freeciv WebGL
--------------
-Freeciv WebGL is the 3D version, which uses the Three.js 3D engine. More info about the WebGL 3D version can be found for [developers](https://github.com/freeciv/freeciv-web/tree/develop/freeciv-web/src/main/webapp/javascript/webgl) and [3D artists](https://github.com/freeciv/freeciv-web/wiki/Contributing-Blender-models-for-Freeciv-WebGL).
-Developer: Andreas Røsdal [@andreasrosdal](http://www.github.com/andreasrosdal)  
-
 Running Freeciv-web on your computer
 ------------------------------------
 The recommended and probably easiest way is to use Vagrant on VirtualBox.

diff --git a/blender/CREDITS b/blender/CREDITS
diff --git a/blender/README.md b/blender/README.md
diff --git a/blender/blender_models_version_1/AEGIS Cruiser.blend b/blender/blender_models_version_1/AEGIS Cruiser.blend
diff --git a/blender/blender_models_version_1/AWACS.blend b/blender/blender_models_version_1/AWACS.blend
diff --git a/blender/blender_models_version_1/Airbase.blend b/blender/blender_models_version_1/Airbase.blend
diff --git a/blender/blender_models_version_1/Alpine Troops.blend b/blender/blender_models_version_1/Alpine Troops.blend
diff --git a/blender/blender_models_version_1/Archers.blend b/blender/blender_models_version_1/Archers.blend
diff --git a/blender/blender_models_version_1/Armor.blend b/blender/blender_models_version_1/Armor.blend
diff --git a/blender/blender_models_version_1/Artillery.blend b/blender/blender_models_version_1/Artillery.blend
diff --git a/blender/blender_models_version_1/Barbarian Leader.blend b/blender/blender_models_version_1/Barbarian Leader.blend
diff --git a/blender/blender_models_version_1/Battleship.blend b/blender/blender_models_version_1/Battleship.blend
diff --git a/blender/blender_models_version_1/Bomber.blend b/blender/blender_models_version_1/Bomber.blend
diff --git a/blender/blender_models_version_1/Cannon.blend b/blender/blender_models_version_1/Cannon.blend
diff --git a/blender/blender_models_version_1/Caravan.blend b/blender/blender_models_version_1/Caravan.blend
diff --git a/blender/blender_models_version_1/Caravel.blend b/blender/blender_models_version_1/Caravel.blend
diff --git a/blender/blender_models_version_1/Carrier.blend b/blender/blender_models_version_1/Carrier.blend
diff --git a/blender/blender_models_version_1/Catapult.blend b/blender/blender_models_version_1/Catapult.blend
diff --git a/blender/blender_models_version_1/Cavalry.blend b/blender/blender_models_version_1/Cavalry.blend
diff --git a/blender/blender_models_version_1/Chariot.blend b/blender/blender_models_version_1/Chariot.blend
diff --git a/blender/blender_models_version_1/Cruise Missile.blend b/blender/blender_models_version_1/Cruise Missile.blend
diff --git a/blender/blender_models_version_1/Cruiser.blend b/blender/blender_models_version_1/Cruiser.blend
diff --git a/blender/blender_models_version_1/Destroyer.blend b/blender/blender_models_version_1/Destroyer.blend
diff --git a/blender/blender_models_version_1/Diplomat.blend b/blender/blender_models_version_1/Diplomat.blend
diff --git a/blender/blender_models_version_1/Dragoons.blend b/blender/blender_models_version_1/Dragoons.blend
diff --git a/blender/blender_models_version_1/Engineers.blend b/blender/blender_models_version_1/Engineers.blend
diff --git a/blender/blender_models_version_1/Explorer.blend b/blender/blender_models_version_1/Explorer.blend
diff --git a/blender/blender_models_version_1/Fighter.blend b/blender/blender_models_version_1/Fighter.blend
diff --git a/blender/blender_models_version_1/Fish.blend b/blender/blender_models_version_1/Fish.blend
diff --git a/blender/blender_models_version_1/Fortress.blend b/blender/blender_models_version_1/Fortress.blend
diff --git a/blender/blender_models_version_1/Freight.blend b/blender/blender_models_version_1/Freight.blend
diff --git a/blender/blender_models_version_1/Frigate.blend b/blender/blender_models_version_1/Frigate.blend
diff --git a/blender/blender_models_version_1/Galleon.blend b/blender/blender_models_version_1/Galleon.blend
diff --git a/blender/blender_models_version_1/Helicopter.blend b/blender/blender_models_version_1/Helicopter.blend
diff --git a/blender/blender_models_version_1/Horsemen.blend b/blender/blender_models_version_1/Horsemen.blend
diff --git a/blender/blender_models_version_1/Howitzer.blend b/blender/blender_models_version_1/Howitzer.blend
diff --git a/blender/blender_models_version_1/Hut.blend b/blender/blender_models_version_1/Hut.blend
diff --git a/blender/blender_models_version_1/Ironclad.blend b/blender/blender_models_version_1/Ironclad.blend
diff --git a/blender/blender_models_version_1/Knights.blend b/blender/blender_models_version_1/Knights.blend
diff --git a/blender/blender_models_version_1/Legion.blend b/blender/blender_models_version_1/Legion.blend
diff --git a/blender/blender_models_version_1/Marines.blend b/blender/blender_models_version_1/Marines.blend
diff --git a/blender/blender_models_version_1/Mech. Inf..blend b/blender/blender_models_version_1/Mech. Inf..blend
diff --git a/blender/blender_models_version_1/Migrants.blend b/blender/blender_models_version_1/Migrants.blend
diff --git a/blender/blender_models_version_1/Mine.blend b/blender/blender_models_version_1/Mine.blend
diff --git a/blender/blender_models_version_1/Musketeers.blend b/blender/blender_models_version_1/Musketeers.blend
diff --git a/blender/blender_models_version_1/Nuclear.blend b/blender/blender_models_version_1/Nuclear.blend
diff --git a/blender/blender_models_version_1/Paratroopers.blend b/blender/blender_models_version_1/Paratroopers.blend
diff --git a/blender/blender_models_version_1/Partisan.blend b/blender/blender_models_version_1/Partisan.blend
diff --git a/blender/blender_models_version_1/Phalanx.blend b/blender/blender_models_version_1/Phalanx.blend
diff --git a/blender/blender_models_version_1/Pikemen.blend b/blender/blender_models_version_1/Pikemen.blend
diff --git a/blender/blender_models_version_1/Riflemen.blend b/blender/blender_models_version_1/Riflemen.blend
diff --git a/blender/blender_models_version_1/Ruins.blend b/blender/blender_models_version_1/Ruins.blend
diff --git a/blender/blender_models_version_1/Settlers.blend b/blender/blender_models_version_1/Settlers.blend
diff --git a/blender/blender_models_version_1/Spy.blend b/blender/blender_models_version_1/Spy.blend
diff --git a/blender/blender_models_version_1/Stealth Bomber.blend b/blender/blender_models_version_1/Stealth Bomber.blend
diff --git a/blender/blender_models_version_1/Stealth Fighter.blend b/blender/blender_models_version_1/Stealth Fighter.blend
diff --git a/blender/blender_models_version_1/Submarine.blend b/blender/blender_models_version_1/Submarine.blend
diff --git a/blender/blender_models_version_1/Transport.blend b/blender/blender_models_version_1/Transport.blend
diff --git a/blender/blender_models_version_1/Trireme.blend b/blender/blender_models_version_1/Trireme.blend
diff --git a/blender/blender_models_version_1/Warriors.blend b/blender/blender_models_version_1/Warriors.blend
diff --git a/blender/blender_models_version_1/Whales.blend b/blender/blender_models_version_1/Whales.blend
diff --git a/blender/blender_models_version_1/Workers.blend b/blender/blender_models_version_1/Workers.blend
diff --git a/blender/blender_models_version_1/blender-settlers-example.png b/blender/blender_models_version_1/blender-settlers-example.png
diff --git a/blender/blender_models_version_1/brick1.png b/blender/blender_models_version_1/brick1.png
diff --git a/blender/blender_models_version_1/city_classical_0.blend b/blender/blender_models_version_1/city_classical_0.blend
diff --git a/blender/blender_models_version_1/city_classical_1.blend b/blender/blender_models_version_1/city_classical_1.blend
diff --git a/blender/blender_models_version_1/city_classical_2.blend b/blender/blender_models_version_1/city_classical_2.blend
diff --git a/blender/blender_models_version_1/city_european_0.blend b/blender/blender_models_version_1/city_european_0.blend
diff --git a/blender/blender_models_version_1/city_european_1.blend b/blender/blender_models_version_1/city_european_1.blend
diff --git a/blender/blender_models_version_1/city_european_2.blend b/blender/blender_models_version_1/city_european_2.blend
diff --git a/blender/blender_models_version_1/citywalls.blend b/blender/blender_models_version_1/citywalls.blend
diff --git a/blender/blender_models_version_1/farmland.png b/blender/blender_models_version_1/farmland.png
diff --git a/blender/blender_models_version_2/BaseModel.blend b/blender/blender_models_version_2/BaseModel.blend
diff --git a/blender/blender_models_version_2/Buildings/EuropeanCity.blend b/blender/blender_models_version_2/Buildings/EuropeanCity.blend
diff --git a/blender/blender_models_version_2/Buildings/Export/EuropeanCity_Tier1.glb b/blender/blender_models_version_2/Buildings/Export/EuropeanCity_Tier1.glb
diff --git a/blender/blender_models_version_2/Buildings/Export/EuropeanCity_Tier2.glb b/blender/blender_models_version_2/Buildings/Export/EuropeanCity_Tier2.glb
diff --git a/blender/blender_models_version_2/Buildings/Export/EuropeanCity_Tier3.glb b/blender/blender_models_version_2/Buildings/Export/EuropeanCity_Tier3.glb
diff --git a/blender/blender_models_version_2/Buildings/Export/EuropeanCity_Tier4.glb b/blender/blender_models_version_2/Buildings/Export/EuropeanCity_Tier4.glb
diff --git a/blender/blender_models_version_2/Buildings/Export/EuropeanCity_Tier5.glb b/blender/blender_models_version_2/Buildings/Export/EuropeanCity_Tier5.glb
diff --git a/blender/blender_models_version_2/Buildings/Export/ModernCity_Tier1.glb b/blender/blender_models_version_2/Buildings/Export/ModernCity_Tier1.glb
diff --git a/blender/blender_models_version_2/Buildings/Export/ModernCity_Tier2.glb b/blender/blender_models_version_2/Buildings/Export/ModernCity_Tier2.glb
diff --git a/blender/blender_models_version_2/Buildings/Export/ModernCity_Tier3.glb b/blender/blender_models_version_2/Buildings/Export/ModernCity_Tier3.glb
diff --git a/blender/blender_models_version_2/Buildings/Export/ModernCity_Tier4.glb b/blender/blender_models_version_2/Buildings/Export/ModernCity_Tier4.glb
diff --git a/blender/blender_models_version_2/Buildings/Export/ModernCity_Tier5.glb b/blender/blender_models_version_2/Buildings/Export/ModernCity_Tier5.glb
diff --git a/blender/blender_models_version_2/Buildings/Export/ModernCity_Tier5_pbr.glb b/blender/blender_models_version_2/Buildings/Export/ModernCity_Tier5_pbr.glb
diff --git a/blender/blender_models_version_2/Buildings/ModernCity.blend b/blender/blender_models_version_2/Buildings/ModernCity.blend
diff --git a/blender/blender_models_version_2/Buildings/Renders/CityPlates.psd b/blender/blender_models_version_2/Buildings/Renders/CityPlates.psd
diff --git a/blender/blender_models_version_2/Buildings/Renders/EuropeanCity.jpg b/blender/blender_models_version_2/Buildings/Renders/EuropeanCity.jpg
diff --git a/blender/blender_models_version_2/Buildings/Renders/EuropeanCity.png b/blender/blender_models_version_2/Buildings/Renders/EuropeanCity.png
diff --git a/blender/blender_models_version_2/Buildings/Renders/EuropeanCity1.png b/blender/blender_models_version_2/Buildings/Renders/EuropeanCity1.png
diff --git a/blender/blender_models_version_2/Buildings/Renders/ModernCity.jpg b/blender/blender_models_version_2/Buildings/Renders/ModernCity.jpg
diff --git a/blender/blender_models_version_2/Buildings/Renders/ModernCity.png b/blender/blender_models_version_2/Buildings/Renders/ModernCity.png
diff --git a/blender/blender_models_version_2/Buildings/Renders/ModernCity1.png b/blender/blender_models_version_2/Buildings/Renders/ModernCity1.png
diff --git a/blender/blender_models_version_2/Buildings/Renders/ModernCity2.png b/blender/blender_models_version_2/Buildings/Renders/ModernCity2.png
diff --git a/blender/blender_models_version_2/Buildings/Textures/CityTextures.psd b/blender/blender_models_version_2/Buildings/Textures/CityTextures.psd
diff --git a/blender/blender_models_version_2/Buildings/Textures/EuropeanCity.png b/blender/blender_models_version_2/Buildings/Textures/EuropeanCity.png
diff --git a/blender/blender_models_version_2/Buildings/Textures/ModernCity.png b/blender/blender_models_version_2/Buildings/Textures/ModernCity.png
diff --git a/blender/blender_models_version_2/Characters/Explorer.blend b/blender/blender_models_version_2/Characters/Explorer.blend
diff --git a/blender/blender_models_version_2/Characters/Export/Explorer.glb b/blender/blender_models_version_2/Characters/Export/Explorer.glb
diff --git a/blender/blender_models_version_2/Characters/Export/Settlers.glb b/blender/blender_models_version_2/Characters/Export/Settlers.glb
diff --git a/blender/blender_models_version_2/Characters/Renders/Explorer.png b/blender/blender_models_version_2/Characters/Renders/Explorer.png
diff --git a/blender/blender_models_version_2/Characters/Renders/Settler.png b/blender/blender_models_version_2/Characters/Renders/Settler.png
diff --git a/blender/blender_models_version_2/Characters/Settler.blend b/blender/blender_models_version_2/Characters/Settler.blend
diff --git a/blender/blender_models_version_2/Characters/Textures/Base.psd b/blender/blender_models_version_2/Characters/Textures/Base.psd
diff --git a/blender/blender_models_version_2/Characters/Textures/BaseTexture.png b/blender/blender_models_version_2/Characters/Textures/BaseTexture.png
diff --git a/blender/blender_models_version_2/Characters/Textures/Explorer.png b/blender/blender_models_version_2/Characters/Textures/Explorer.png
diff --git a/blender/blender_models_version_2/Characters/Textures/HorseBase.psd b/blender/blender_models_version_2/Characters/Textures/HorseBase.psd
diff --git a/blender/blender_models_version_2/Characters/Textures/Settler.png b/blender/blender_models_version_2/Characters/Textures/Settler.png
diff --git a/blender/blender_models_version_2/Characters/Textures/SettlerCart.png b/blender/blender_models_version_2/Characters/Textures/SettlerCart.png
diff --git a/blender/blender_models_version_2/CityWallBig.glb b/blender/blender_models_version_2/CityWallBig.glb
diff --git a/blender/blender_models_version_2/CityWallSmall.glb b/blender/blender_models_version_2/CityWallSmall.glb
diff --git a/blender/blender_models_version_2/EuropeanCity_Tier1.glb b/blender/blender_models_version_2/EuropeanCity_Tier1.glb
diff --git a/blender/blender_models_version_2/EuropeanCity_Tier2.glb b/blender/blender_models_version_2/EuropeanCity_Tier2.glb
diff --git a/blender/blender_models_version_2/EuropeanCity_Tier3.glb b/blender/blender_models_version_2/EuropeanCity_Tier3.glb
diff --git a/blender/blender_models_version_2/EuropeanCity_Tier4.glb b/blender/blender_models_version_2/EuropeanCity_Tier4.glb
diff --git a/blender/blender_models_version_2/EuropeanCity_Tier5.glb b/blender/blender_models_version_2/EuropeanCity_Tier5.glb
diff --git a/blender/blender_models_version_2/Explorer.glb b/blender/blender_models_version_2/Explorer.glb
diff --git a/blender/blender_models_version_2/Hut.glb b/blender/blender_models_version_2/Hut.glb
diff --git a/blender/blender_models_version_2/ModernCity_Tier1.glb b/blender/blender_models_version_2/ModernCity_Tier1.glb
diff --git a/blender/blender_models_version_2/ModernCity_Tier2.glb b/blender/blender_models_version_2/ModernCity_Tier2.glb
diff --git a/blender/blender_models_version_2/ModernCity_Tier3.glb b/blender/blender_models_version_2/ModernCity_Tier3.glb
diff --git a/blender/blender_models_version_2/ModernCity_Tier4.glb b/blender/blender_models_version_2/ModernCity_Tier4.glb
diff --git a/blender/blender_models_version_2/ModernCity_Tier5.glb b/blender/blender_models_version_2/ModernCity_Tier5.glb
diff --git a/blender/blender_models_version_2/ModernCity_Tier5_pbr.glb b/blender/blender_models_version_2/ModernCity_Tier5_pbr.glb
diff --git a/blender/blender_models_version_2/Settler.glb b/blender/blender_models_version_2/Settler.glb
diff --git a/blender/blender_models_version_2/Worker.glb b/blender/blender_models_version_2/Worker.glb
diff --git a/blender/blender_models_version_2/Worrior.glb b/blender/blender_models_version_2/Worrior.glb
diff --git a/freeciv-web/pom.xml b/freeciv-web/pom.xml
@@ -362,7 +362,6 @@ Rerun the sync-js-hand.js script.
 									<jsSourceInclude>*.js</jsSourceInclude>
 									<jsSourceInclude>libs/*.js</jsSourceInclude>
 									<jsSourceInclude>2dcanvas/*.js</jsSourceInclude>
-									<jsSourceInclude>webgl/*.js</jsSourceInclude>
 								</jsSourceIncludes>
 								<jsSourceExcludes>
 									<jsSourceExclude>frontpage.js</jsSourceExclude>
@@ -377,25 +376,7 @@ Rerun the sync-js-hand.js script.
 								<goal>minify</goal>
 							</goals>
 						</execution>
-						<!-- Create minified WebGL specific webgl-client.min.js -->
-						<execution>
-							<id>webgl-minify</id>
-							<configuration>
-								<jsSourceDir>javascript/webgl/libs/</jsSourceDir>
-								<jsFinalFile>webgl-client.js</jsFinalFile>
-								<jsSourceIncludes>
-									<jsSourceInclude>*.js</jsSourceInclude>
-								</jsSourceIncludes>
-								<jsSourceExcludes>
-									<jsSourceExclude>three.min.js</jsSourceExclude>
-									<jsSourceExclude>StereoEffect.js</jsSourceExclude>
-								</jsSourceExcludes>
-							</configuration>
-							<goals>
-								<goal>minify</goal>
-							</goals>
-						</execution>
-
+
 						<execution>
 							<id>index-minify</id>
 							<configuration>

diff --git a/freeciv-web/src/main/webapp/WEB-INF/jsp/index.jsp b/freeciv-web/src/main/webapp/WEB-INF/jsp/index.jsp
@@ -144,13 +144,6 @@
 						</c:if>
 						<a id="single-button" href="/webclient/?action=new&type=singleplayer" class="btn"><i class="fa fa-flag"></i> <fmt:message key="index-game-launcher-2d"/></a>
 
-						<c:if test="${default_lang}">
-							<div class="features">
-								Play against the Freeciv AI with 3D WebGL<br>graphics using the Three.js 3D engine
-							</div>
-						</c:if>
-						<a href="/webclient/?action=new&renderer=webgl&type=singleplayer" class="btn" id="webgl_button"><i class="fa fa-cube"></i> <fmt:message key="index-game-launcher-3d"/></a>
-
 
 						<c:if test="${default_lang}">
 							<div class="features">

diff --git a/freeciv-web/src/main/webapp/javascript/webgl/README.md b/freeciv-web/src/main/webapp/javascript/webgl/README.md
diff --git a/freeciv-web/src/main/webapp/javascript/webgl/animation.js b/freeciv-web/src/main/webapp/javascript/webgl/animation.js