diff --git a/Content.vcxitems b/Content.vcxitems
index 75b7452fd..49ed0d9e3 100644
--- a/Content.vcxitems
+++ b/Content.vcxitems
@@ -14,6 +14,26 @@
+
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+
true
true
@@ -546,9 +566,6 @@
-
-
-
@@ -645,6 +662,7 @@
+
diff --git a/Content.vcxitems.filters b/Content.vcxitems.filters
index 4baf7563f..102922b05 100644
--- a/Content.vcxitems.filters
+++ b/Content.vcxitems.filters
@@ -1,9 +1,6 @@
-
- {341af3e7-9353-4ed5-9a03-c6dc8d522336}
-
{1e52ef96-0bb7-4391-a08b-70de0073ef4b}
@@ -22,6 +19,9 @@
{2ba616fc-e2c9-4af4-9099-948f45e2dd80}
+
+ {c66293fd-fe0c-444e-9502-f0864bfbf736}
+
@@ -183,17 +183,14 @@
models
+
+ Documentation
+
+
+ Documentation
+
-
- images
-
-
- images
-
-
- images
-
models\Sponza\textures
@@ -482,6 +479,9 @@
models
+
+ scripts
+
diff --git a/Editor/Editor.cpp b/Editor/Editor.cpp
index ec5935227..8b7440bc8 100644
--- a/Editor/Editor.cpp
+++ b/Editor/Editor.cpp
@@ -398,20 +398,6 @@ void EditorComponent::Load()
string rootdir = wiHelper::ExpandPath(wiHelper::GetOriginalWorkingDirectory());
wstring wstr;
- // images:
- wiHelper::StringConvert(rootdir + "images\\", wstr);
- create_task(StorageFolder::GetFolderFromPathAsync(ref new String(wstr.c_str()))).then([=](StorageFolder^ src) {
- if (src)
- {
- create_task(destfolder->CreateFolderAsync("images", CreationCollisionOption::OpenIfExists)).then([=](StorageFolder^ dst) {
- if (dst)
- {
- copy_folder(src, dst);
- }
- });
- }
- });
-
// scripts:
wiHelper::StringConvert(rootdir + "scripts\\", wstr);
create_task(StorageFolder::GetFolderFromPathAsync(ref new String(wstr.c_str()))).then([=](StorageFolder^ src) {
@@ -440,6 +426,20 @@ void EditorComponent::Load()
}
});
+ // Documentation:
+ wiHelper::StringConvert(rootdir + "Documentation\\", wstr);
+ create_task(StorageFolder::GetFolderFromPathAsync(ref new String(wstr.c_str()))).then([=](StorageFolder^ src) {
+ if (src)
+ {
+ create_task(destfolder->CreateFolderAsync("Documentation", CreationCollisionOption::OpenIfExists)).then([=](StorageFolder^ dst) {
+ if (dst)
+ {
+ copy_folder(src, dst);
+ }
+ });
+ }
+ });
+
});
#endif // PLATFORM_UWP
@@ -1441,7 +1441,7 @@ void EditorComponent::Update(float dt)
if (wiInput::Down(wiInput::MOUSE_BUTTON_LEFT))
{
// if water, then put a water ripple onto it:
- wiRenderer::PutWaterRipple(wiHelper::GetOriginalWorkingDirectory() + "../images/waterripple.png", hovered.position);
+ wiRenderer::PutWaterRipple(wiHelper::GetOriginalWorkingDirectory() + "images/ripple.png", hovered.position);
}
}
else if (translator.selected.empty() && wiInput::Press(wiInput::MOUSE_BUTTON_LEFT))
diff --git a/Editor/Editor_SOURCE.vcxitems b/Editor/Editor_SOURCE.vcxitems
index 8b075e6bf..27208bf8c 100644
--- a/Editor/Editor_SOURCE.vcxitems
+++ b/Editor/Editor_SOURCE.vcxitems
@@ -152,6 +152,7 @@
true
true
+
true
true
diff --git a/Editor/Editor_SOURCE.vcxitems.filters b/Editor/Editor_SOURCE.vcxitems.filters
index b4f253910..11cdf1fe7 100644
--- a/Editor/Editor_SOURCE.vcxitems.filters
+++ b/Editor/Editor_SOURCE.vcxitems.filters
@@ -111,5 +111,8 @@
images
+
+ images
+
\ No newline at end of file
diff --git a/images/waterripple.png b/Editor/images/ripple.png
similarity index 100%
rename from images/waterripple.png
rename to Editor/images/ripple.png
diff --git a/scripts/character_controller_tps.lua b/scripts/character_controller_tps.lua
index 594de53b0..0e72a2e45 100644
--- a/scripts/character_controller_tps.lua
+++ b/scripts/character_controller_tps.lua
@@ -284,7 +284,7 @@ Character = {
local waterRay = Ray(head_transform.GetPosition(),Vector(0,-1,0))
local w,wp,wn = Pick(waterRay,PICK_WATER)
if(w ~= INVALID_ENTITY and self.velocity.Length() > 2) then
- PutWaterRipple("../images/waterripple.png",wp)
+ PutWaterRipple("../models/ripple.png",wp)
end
end,
diff --git a/scripts/fighting_game.lua b/scripts/fighting_game.lua
index 14536dd9e..a5c4cbbdc 100644
--- a/scripts/fighting_game.lua
+++ b/scripts/fighting_game.lua
@@ -1307,7 +1307,7 @@ local function Character(face, skin_color, shirt_color, hair_color, shoe_color)
-- HP bar, etc. sprites:
local renderPath = main.GetActivePath()
- self.sprite_hpbar_background = Sprite("../images/hp_bar.png")
+ self.sprite_hpbar_background = Sprite("hp_bar.png")
local fx = self.sprite_hpbar_background.GetParams()
fx.SetStencilRefMode(STENCILREFMODE_USER) -- we set the stencil ref in user space
fx.SetStencil(STENCILMODE_NOT, stencilref_cutout)
@@ -1323,7 +1323,7 @@ local function Character(face, skin_color, shirt_color, hair_color, shoe_color)
self.sprite_hpbar_background.SetParams(fx)
renderPath.AddSprite(self.sprite_hpbar_background)
- self.sprite_hpbar_hp = Sprite("../images/hp_bar.png")
+ self.sprite_hpbar_hp = Sprite("hp_bar.png")
fx = self.sprite_hpbar_hp.GetParams()
fx.SetStencilRefMode(STENCILREFMODE_USER) -- we set the stencil ref in user space
fx.SetStencil(STENCILMODE_NOT, stencilref_cutout)
@@ -1339,7 +1339,7 @@ local function Character(face, skin_color, shirt_color, hair_color, shoe_color)
self.sprite_hpbar_hp.SetParams(fx)
renderPath.AddSprite(self.sprite_hpbar_hp)
- self.sprite_hpbar_pattern = Sprite("../images/hp_bar.png", "../images/hp_bar.png")
+ self.sprite_hpbar_pattern = Sprite("hp_bar.png", "hp_bar.png")
fx = self.sprite_hpbar_pattern.GetParams()
fx.SetStencilRefMode(STENCILREFMODE_USER) -- we set the stencil ref in user space
fx.SetStencil(STENCILMODE_NOT, stencilref_cutout)
@@ -1361,7 +1361,7 @@ local function Character(face, skin_color, shirt_color, hair_color, shoe_color)
self.sprite_hpbar_pattern.SetAnim(pattern_anim)
renderPath.AddSprite(self.sprite_hpbar_pattern)
- self.sprite_hpbar_pattern2 = Sprite("../images/hp_bar.png", "../images/hp_bar.png")
+ self.sprite_hpbar_pattern2 = Sprite("hp_bar.png", "hp_bar.png")
fx = self.sprite_hpbar_pattern2.GetParams()
fx.SetStencilRefMode(STENCILREFMODE_USER) -- we set the stencil ref in user space
fx.SetStencil(STENCILMODE_NOT, stencilref_cutout)
@@ -1383,7 +1383,7 @@ local function Character(face, skin_color, shirt_color, hair_color, shoe_color)
self.sprite_hpbar_pattern2.SetAnim(pattern_anim)
renderPath.AddSprite(self.sprite_hpbar_pattern2)
- self.sprite_hpbar_border = Sprite("../images/hp_bar.png")
+ self.sprite_hpbar_border = Sprite("hp_bar.png")
fx = self.sprite_hpbar_border.GetParams()
fx.SetStencilRefMode(STENCILREFMODE_USER) -- we set the stencil ref in user space
fx.SetStencil(STENCILMODE_NOT, stencilref_cutout)
@@ -1399,7 +1399,7 @@ local function Character(face, skin_color, shirt_color, hair_color, shoe_color)
renderPath.AddSprite(self.sprite_hpbar_border)
if(self.face > 0) then
- self.sprite_timer = Sprite("../images/hp_bar.png")
+ self.sprite_timer = Sprite("hp_bar.png")
fx = self.sprite_timer.GetParams()
fx.SetStencilRefMode(STENCILREFMODE_USER) -- we set the stencil ref in user space
fx.SetStencil(STENCILMODE_NOT, stencilref_cutout)
diff --git a/images/hp_bar.png b/scripts/hp_bar.png
similarity index 100%
rename from images/hp_bar.png
rename to scripts/hp_bar.png