build fix - (work-in-progress, the game is pretty much broken)

mrDIMAS · May 4, 2022 · 3bf435f · 3bf435f
1 parent 3c87142
commit 3bf435f
Show file tree

Hide file tree

Showing 137 changed files with 1,034 additions and 797 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,4 +5,4 @@
 *.lock
 save.bin
 save.txt
-rg3d.log
+fyrox.log
diff --git a/Cargo.toml b/Cargo.toml
@@ -9,8 +9,5 @@ license = "MIT"
 opt-level = 3
 
 [dependencies]
-rg3d = { path = "../rg3d" }
+fyrox = { path = "../Fyrox" }
 crossbeam = "0.8.0"
-
-[features]
-enable_profiler = ["rg3d/enable_profiler"]
diff --git a/README.md b/README.md
@@ -1,22 +1,22 @@
 # What is this?
 
-Single player 3d shooter written in Rust and based on [rg3d engine](https://github.com/mrDIMAS/rg3d)
+Single player 3d shooter written in Rust and based on [fyrox engine](https://github.com/mrDIMAS/fyrox)
 
 ## How to build
 
-Cargo.toml contains hardcoded relative path to engine `rg3d = { path = "../rg3d" }`, so you have to change this or put engine folder near the game folder to get game compile, because it always uses latest rg3d which could be not published on crates.io.
+Cargo.toml contains hardcoded relative path to engine `fyrox = { path = "../fyrox" }`, so you have to change this or put engine folder near the game folder to get game compile, because it always uses latest fyrox which could be not published on crates.io.
 
 In other words you can do something like this:
 ```
-git clone https://github.com/mrDIMAS/rg3d
+git clone https://github.com/mrDIMAS/fyrox
 git clone https://github.com/mrDIMAS/rusty-shooter
 cd rusty-shooter
 cargo run --release
 ```
 
 Or if you're updating to the latest version, do this:
 ```
-cd rg3d
+cd fyrox
 git pull
 cd ../rusty-shooter
 git pull

diff --git a/data/textures/blocks10.tga → data/levels/blocks10.tga b/data/textures/blocks10.tga → data/levels/blocks10.tga
diff --git a/data/textures/blocks11b.tga → data/levels/blocks11b.tga b/data/textures/blocks11b.tga → data/levels/blocks11b.tga
diff --git a/data/textures/blocks11b_normal.tga → data/levels/blocks11b_normal.tga b/data/textures/blocks11b_normal.tga → data/levels/blocks11b_normal.tga
diff --git a/data/textures/blocks15.tga → data/levels/blocks15.tga b/data/textures/blocks15.tga → data/levels/blocks15.tga
diff --git a/data/textures/blocks15_normal.tga → data/levels/blocks15_normal.tga b/data/textures/blocks15_normal.tga → data/levels/blocks15_normal.tga
diff --git a/data/textures/blocks17floor.tga → data/levels/blocks17floor.tga b/data/textures/blocks17floor.tga → data/levels/blocks17floor.tga
diff --git a/data/textures/blocks17floor2.tga → data/levels/blocks17floor2.tga b/data/textures/blocks17floor2.tga → data/levels/blocks17floor2.tga
diff --git a/data/textures/blocks9.tga → data/levels/blocks9.tga b/data/textures/blocks9.tga → data/levels/blocks9.tga
diff --git a/data/textures/blocks9_normal.tga → data/levels/blocks9_normal.tga b/data/textures/blocks9_normal.tga → data/levels/blocks9_normal.tga
diff --git a/data/textures/brick.tga → data/levels/brick.tga b/data/textures/brick.tga → data/levels/brick.tga
diff --git a/data/textures/brick2.tga → data/levels/brick2.tga b/data/textures/brick2.tga → data/levels/brick2.tga
diff --git a/data/textures/brick2_normal.tga → data/levels/brick2_normal.tga b/data/textures/brick2_normal.tga → data/levels/brick2_normal.tga
diff --git a/data/textures/brick3.tga → data/levels/brick3.tga b/data/textures/brick3.tga → data/levels/brick3.tga
diff --git a/data/textures/brick3_normal.tga → data/levels/brick3_normal.tga b/data/textures/brick3_normal.tga → data/levels/brick3_normal.tga
diff --git a/data/textures/brick4.tga → data/levels/brick4.tga b/data/textures/brick4.tga → data/levels/brick4.tga
diff --git a/data/textures/brick_normal.tga → data/levels/brick_normal.tga b/data/textures/brick_normal.tga → data/levels/brick_normal.tga
diff --git a/data/models/dm6.fbx → data/levels/dm6.fbx b/data/models/dm6.fbx → data/levels/dm6.fbx
diff --git a/data/levels/dm6.rgs b/data/levels/dm6.rgs
diff --git a/data/textures/largeblockfloor3.tga → data/levels/largeblockfloor3.tga b/data/textures/largeblockfloor3.tga → data/levels/largeblockfloor3.tga
diff --git a/data/textures/largeblockfloor3_normal.tga → data/levels/largeblockfloor3_normal.tga b/data/textures/largeblockfloor3_normal.tga → data/levels/largeblockfloor3_normal.tga
diff --git a/data/textures/largeblockfloor4.tga → data/levels/largeblockfloor4.tga b/data/textures/largeblockfloor4.tga → data/levels/largeblockfloor4.tga
diff --git a/data/textures/largeblockfloor4_normal.tga → data/levels/largeblockfloor4_normal.tga b/data/textures/largeblockfloor4_normal.tga → data/levels/largeblockfloor4_normal.tga
diff --git a/data/textures/mesh.png → data/levels/mesh.png b/data/textures/mesh.png → data/levels/mesh.png
diff --git a/data/textures/mesh.tga → data/levels/mesh.tga b/data/textures/mesh.tga → data/levels/mesh.tga
diff --git a/data/textures/mesh_normal.png → data/levels/mesh_normal.png b/data/textures/mesh_normal.png → data/levels/mesh_normal.png
diff --git a/data/textures/metal.tga → data/levels/metal.tga b/data/textures/metal.tga → data/levels/metal.tga
diff --git a/data/textures/metal1_1.tga → data/levels/metal1_1.tga b/data/textures/metal1_1.tga → data/levels/metal1_1.tga
diff --git a/data/textures/metal2.tga → data/levels/metal2.tga b/data/textures/metal2.tga → data/levels/metal2.tga
diff --git a/data/textures/metal2_normal.tga → data/levels/metal2_normal.tga b/data/textures/metal2_normal.tga → data/levels/metal2_normal.tga
diff --git a/data/textures/metal3.tga → data/levels/metal3.tga b/data/textures/metal3.tga → data/levels/metal3.tga
diff --git a/data/textures/metal3_3.tga → data/levels/metal3_3.tga b/data/textures/metal3_3.tga → data/levels/metal3_3.tga
diff --git a/data/textures/metal4.tga → data/levels/metal4.tga b/data/textures/metal4.tga → data/levels/metal4.tga
diff --git a/data/textures/metal4_normal.tga → data/levels/metal4_normal.tga b/data/textures/metal4_normal.tga → data/levels/metal4_normal.tga
diff --git a/data/textures/metal5.tga → data/levels/metal5.tga b/data/textures/metal5.tga → data/levels/metal5.tga
diff --git a/data/textures/metal8.jpg → data/levels/metal8.jpg b/data/textures/metal8.jpg → data/levels/metal8.jpg
diff --git a/data/textures/metal8_normal.jpg → data/levels/metal8_normal.jpg b/data/textures/metal8_normal.jpg → data/levels/metal8_normal.jpg
diff --git a/data/textures/metal_bare.jpg → data/levels/metal_bare.jpg b/data/textures/metal_bare.jpg → data/levels/metal_bare.jpg
diff --git a/data/textures/metal_bare_normal.jpg → data/levels/metal_bare_normal.jpg b/data/textures/metal_bare_normal.jpg → data/levels/metal_bare_normal.jpg
diff --git a/data/textures/metal_bare_specular.jpg → data/levels/metal_bare_specular.jpg b/data/textures/metal_bare_specular.jpg → data/levels/metal_bare_specular.jpg
diff --git a/data/textures/metal_bare_white.jpg → data/levels/metal_bare_white.jpg b/data/textures/metal_bare_white.jpg → data/levels/metal_bare_white.jpg
diff --git a/data/textures/metal_bare_white_normal.jpg → data/levels/metal_bare_white_normal.jpg b/data/textures/metal_bare_white_normal.jpg → data/levels/metal_bare_white_normal.jpg
diff --git a/data/textures/metal_bare_white_specular.jpg → data/levels/metal_bare_white_specular.jpg b/data/textures/metal_bare_white_specular.jpg → data/levels/metal_bare_white_specular.jpg
diff --git a/data/textures/metal_red.jpg → data/levels/metal_red.jpg b/data/textures/metal_red.jpg → data/levels/metal_red.jpg
diff --git a/data/textures/metal_red_normal.jpg → data/levels/metal_red_normal.jpg b/data/textures/metal_red_normal.jpg → data/levels/metal_red_normal.jpg
diff --git a/data/textures/metal_rusted.jpg → data/levels/metal_rusted.jpg b/data/textures/metal_rusted.jpg → data/levels/metal_rusted.jpg
diff --git a/data/textures/metal_rusted_normal.jpg → data/levels/metal_rusted_normal.jpg b/data/textures/metal_rusted_normal.jpg → data/levels/metal_rusted_normal.jpg
diff --git a/data/levels/starship.rgs b/data/levels/starship.rgs
diff --git a/data/levels/starship2.rgs b/data/levels/starship2.rgs
diff --git a/data/textures/Ak47_Body.png → data/models/Ak47_Body.png b/data/textures/Ak47_Body.png → data/models/Ak47_Body.png
diff --git a/data/textures/Ak47_Body_normal.png → data/models/Ak47_Body_normal.png b/data/textures/Ak47_Body_normal.png → data/models/Ak47_Body_normal.png
diff --git a/data/textures/Ak47_Magazine.png → data/models/Ak47_Magazine.png b/data/textures/Ak47_Magazine.png → data/models/Ak47_Magazine.png
diff --git a/data/textures/Ak47_Magazine_normal.png → data/models/Ak47_Magazine_normal.png b/data/textures/Ak47_Magazine_normal.png → data/models/Ak47_Magazine_normal.png
diff --git a/data/textures/M4_Body.png → data/models/M4_Body.png b/data/textures/M4_Body.png → data/models/M4_Body.png
diff --git a/data/textures/M4_Body_normal.png → data/models/M4_Body_normal.png b/data/textures/M4_Body_normal.png → data/models/M4_Body_normal.png
diff --git a/data/textures/M4_Magazine.png → data/models/M4_Magazine.png b/data/textures/M4_Magazine.png → data/models/M4_Magazine.png
diff --git a/data/textures/M4_Magazine_normal.png → data/models/M4_Magazine_normal.png b/data/textures/M4_Magazine_normal.png → data/models/M4_Magazine_normal.png
diff --git a/data/textures/M4_Sight.png → data/models/M4_Sight.png b/data/textures/M4_Sight.png → data/models/M4_Sight.png
diff --git a/data/textures/M4_Sight_normal.png → data/models/M4_Sight_normal.png b/data/textures/M4_Sight_normal.png → data/models/M4_Sight_normal.png
diff --git a/data/textures/MAW_diffuse.png → data/models/MAW_diffuse.png b/data/textures/MAW_diffuse.png → data/models/MAW_diffuse.png
diff --git a/data/textures/MAW_glow.png → data/models/MAW_glow.png b/data/textures/MAW_glow.png → data/models/MAW_glow.png
diff --git a/data/textures/MAW_normal.png → data/models/MAW_normal.png b/data/textures/MAW_normal.png → data/models/MAW_normal.png
diff --git a/data/textures/MAW_specular.png → data/models/MAW_specular.png b/data/textures/MAW_specular.png → data/models/MAW_specular.png
diff --git a/data/textures/Mutant_diffuse.png → data/models/Mutant_diffuse.png b/data/textures/Mutant_diffuse.png → data/models/Mutant_diffuse.png
diff --git a/data/textures/Mutant_normal.png → data/models/Mutant_normal.png b/data/textures/Mutant_normal.png → data/models/Mutant_normal.png
diff --git a/data/textures/barell.tga → data/models/barell.tga b/data/textures/barell.tga → data/models/barell.tga
diff --git a/data/textures/barrel.jpg → data/models/barrel.jpg b/data/textures/barrel.jpg → data/models/barrel.jpg
diff --git a/data/textures/barrel_normal.jpg → data/models/barrel_normal.jpg b/data/textures/barrel_normal.jpg → data/models/barrel_normal.jpg
diff --git a/data/textures/blackplastic.jpg → data/models/blackplastic.jpg b/data/textures/blackplastic.jpg → data/models/blackplastic.jpg
diff --git a/data/textures/blackplastic_normal.jpg → data/models/blackplastic_normal.jpg b/data/textures/blackplastic_normal.jpg → data/models/blackplastic_normal.jpg
diff --git a/data/textures/box.jpg → data/models/box.jpg b/data/textures/box.jpg → data/models/box.jpg
diff --git a/data/textures/box.tga → data/models/box.tga b/data/textures/box.tga → data/models/box.tga
diff --git a/data/textures/box_normal.jpg → data/models/box_normal.jpg b/data/textures/box_normal.jpg → data/models/box_normal.jpg
diff --git a/data/textures/camouflage.jpg → data/models/camouflage.jpg b/data/textures/camouflage.jpg → data/models/camouflage.jpg
diff --git a/data/textures/clang_floor.tga → data/models/clang_floor.tga b/data/textures/clang_floor.tga → data/models/clang_floor.tga
diff --git a/data/textures/clang_floor2.tga → data/models/clang_floor2.tga b/data/textures/clang_floor2.tga → data/models/clang_floor2.tga
diff --git a/data/textures/clang_floor3b.tga → data/models/clang_floor3b.tga b/data/textures/clang_floor3b.tga → data/models/clang_floor3b.tga
diff --git a/data/textures/clouds.tga → data/models/clouds.tga b/data/textures/clouds.tga → data/models/clouds.tga
diff --git a/data/textures/column.tga → data/models/column.tga b/data/textures/column.tga → data/models/column.tga
diff --git a/data/textures/concrete.tga → data/models/concrete.tga b/data/textures/concrete.tga → data/models/concrete.tga
diff --git a/data/textures/concrete2.tga → data/models/concrete2.tga b/data/textures/concrete2.tga → data/models/concrete2.tga
diff --git a/data/textures/concrete_normal.tga → data/models/concrete_normal.tga b/data/textures/concrete_normal.tga → data/models/concrete_normal.tga
diff --git a/data/textures/concretefloor1.tga → data/models/concretefloor1.tga b/data/textures/concretefloor1.tga → data/models/concretefloor1.tga
diff --git a/data/textures/cube.tga → data/models/cube.tga b/data/textures/cube.tga → data/models/cube.tga
diff --git a/data/textures/fire.tga → data/models/fire.tga b/data/textures/fire.tga → data/models/fire.tga
diff --git a/data/textures/flare.tga → data/models/flare.tga b/data/textures/flare.tga → data/models/flare.tga
diff --git a/data/textures/floor.tga → data/models/floor.tga b/data/textures/floor.tga → data/models/floor.tga
diff --git a/data/textures/floor_metal.jpg → data/models/floor_metal.jpg b/data/textures/floor_metal.jpg → data/models/floor_metal.jpg
diff --git a/data/textures/floor_metal_normal.jpg → data/models/floor_metal_normal.jpg b/data/textures/floor_metal_normal.jpg → data/models/floor_metal_normal.jpg
diff --git a/data/textures/floor_metal_specular.jpg → data/models/floor_metal_specular.jpg b/data/textures/floor_metal_specular.jpg → data/models/floor_metal_specular.jpg
diff --git a/data/textures/grass.tga → data/models/grass.tga b/data/textures/grass.tga → data/models/grass.tga
diff --git a/data/textures/grenade.tga → data/models/grenade.tga b/data/textures/grenade.tga → data/models/grenade.tga
diff --git a/data/textures/grenade_specular.tga → data/models/grenade_specular.tga b/data/textures/grenade_specular.tga → data/models/grenade_specular.tga
diff --git a/data/textures/lamp.tga → data/models/lamp.tga b/data/textures/lamp.tga → data/models/lamp.tga
diff --git a/data/models/map.FBX b/data/models/map.FBX
@@ -30,14 +30,14 @@ FBXHeaderExtension:  {
             Comment: ""
         }
         Properties70:  {
-            P: "DocumentUrl", "KString", "Url", "", "C:\rg3d\data\models\map.FBX"
-            P: "SrcDocumentUrl", "KString", "Url", "", "C:\rg3d\data\models\map.FBX"
+            P: "DocumentUrl", "KString", "Url", "", "C:\fyrox\data\models\map.FBX"
+            P: "SrcDocumentUrl", "KString", "Url", "", "C:\fyrox\data\models\map.FBX"
             P: "Original", "Compound", "", ""
             P: "Original|ApplicationVendor", "KString", "", "", "Autodesk"
             P: "Original|ApplicationName", "KString", "", "", "3ds Max"
             P: "Original|ApplicationVersion", "KString", "", "", "2012"
             P: "Original|DateTime_GMT", "DateTime", "", "", "16/06/2019 13:49:16.493"
-            P: "Original|FileName", "KString", "", "", "C:\rg3d\data\models\map.FBX"
+            P: "Original|FileName", "KString", "", "", "C:\fyrox\data\models\map.FBX"
             P: "LastSaved", "Compound", "", ""
             P: "LastSaved|ApplicationVendor", "KString", "", "", "Autodesk"
             P: "LastSaved|ApplicationName", "KString", "", "", "3ds Max"

diff --git a/data/textures/medkit_ao.png → data/models/medkit_ao.png b/data/textures/medkit_ao.png → data/models/medkit_ao.png
diff --git a/data/textures/medkit_diffuse.png → data/models/medkit_diffuse.png b/data/textures/medkit_diffuse.png → data/models/medkit_diffuse.png
diff --git a/data/textures/medkit_metallic.png → data/models/medkit_metallic.png b/data/textures/medkit_metallic.png → data/models/medkit_metallic.png
diff --git a/data/textures/medkit_normal.png → data/models/medkit_normal.png b/data/textures/medkit_normal.png → data/models/medkit_normal.png
diff --git a/data/textures/medkit_roughness.png → data/models/medkit_roughness.png b/data/textures/medkit_roughness.png → data/models/medkit_roughness.png
diff --git a/data/textures/parasiteZombie_diffuse.png → data/models/parasiteZombie_diffuse.png b/data/textures/parasiteZombie_diffuse.png → data/models/parasiteZombie_diffuse.png
diff --git a/data/textures/parasiteZombie_normal.png → data/models/parasiteZombie_normal.png b/data/textures/parasiteZombie_normal.png → data/models/parasiteZombie_normal.png
diff --git a/data/textures/parasiteZombie_specular.png → data/models/parasiteZombie_specular.png b/data/textures/parasiteZombie_specular.png → data/models/parasiteZombie_specular.png
diff --git a/data/textures/plasma_gun.png → data/models/plasma_gun.png b/data/textures/plasma_gun.png → data/models/plasma_gun.png
diff --git a/data/textures/plasma_gun_ao.png → data/models/plasma_gun_ao.png b/data/textures/plasma_gun_ao.png → data/models/plasma_gun_ao.png
diff --git a/data/textures/plasma_gun_emissive.png → data/models/plasma_gun_emissive.png b/data/textures/plasma_gun_emissive.png → data/models/plasma_gun_emissive.png
diff --git a/data/textures/plasma_gun_metallic.png → data/models/plasma_gun_metallic.png b/data/textures/plasma_gun_metallic.png → data/models/plasma_gun_metallic.png
diff --git a/data/textures/plasma_gun_normal.png → data/models/plasma_gun_normal.png b/data/textures/plasma_gun_normal.png → data/models/plasma_gun_normal.png
diff --git a/data/textures/plasma_gun_roughness.png → data/models/plasma_gun_roughness.png b/data/textures/plasma_gun_roughness.png → data/models/plasma_gun_roughness.png
diff --git a/data/textures/rpg7_diffuse.png → data/models/rpg7_diffuse.png b/data/textures/rpg7_diffuse.png → data/models/rpg7_diffuse.png
diff --git a/data/textures/rpg7_normal.png → data/models/rpg7_normal.png b/data/textures/rpg7_normal.png → data/models/rpg7_normal.png
diff --git a/data/textures/white.jpg → data/models/white.jpg b/data/textures/white.jpg → data/models/white.jpg
diff --git a/data/textures/white_normal.jpg → data/models/white_normal.jpg b/data/textures/white_normal.jpg → data/models/white_normal.jpg
diff --git a/data/textures/yellow.jpg → data/models/yellow.jpg b/data/textures/yellow.jpg → data/models/yellow.jpg
diff --git a/profiling.log b/profiling.log
@@ -0,0 +1 @@
+Performance profiling results are not available, because feature 'enable_profiler' wasn't defined!
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Performance profiling results are not available, because feature 'enable_profiler' wasn't defined!