aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rwxr-xr-xbuild.lua2
-rw-r--r--media/FemaleTeen_741.mtl66
-rw-r--r--media/Test%20sim/FemaleTeen.omg28
-rw-r--r--media/Test%20sim/Rough_Hir.omg4
-rw-r--r--media/Test%20sim/earth.omg2
-rw-r--r--media/Test%20sim/onefang%27s%20test%20bed.omg6
-rw-r--r--media/Test%20sim/onefang.omg20
-rw-r--r--media/Test%20sim/sonic.omg4
-rw-r--r--media/Test%20sim/sweet_home.omg4
-rw-r--r--media/Test%20sim/terrain.omg2
-rw-r--r--media/animated_logo.gifbin81411 -> 0 bytes
-rw-r--r--media/cube.lua4
-rw-r--r--media/earth.lua4
-rw-r--r--media/images/EarthDiffuse.png (renamed from media/EarthDiffuse.png)bin2123166 -> 2123166 bytes
-rw-r--r--media/images/Full_beard_black_diff.png (renamed from media/textures/Full_beard_black_diff.png)bin583303 -> 583303 bytes
-rw-r--r--media/images/Glasses2.png (renamed from media/textures/Glasses2.png)bin78113 -> 78113 bytes
-rw-r--r--media/images/Moustache_black_diff.png (renamed from media/textures/Moustache_black_diff.png)bin268833 -> 268833 bytes
-rw-r--r--media/images/blue_eye.png (renamed from media/textures/blue_eye.png)bin686720 -> 686720 bytes
-rw-r--r--media/images/brown_eye.png (renamed from media/textures/brown_eye.png)bin685702 -> 685702 bytes
-rw-r--r--media/images/bubble.png (renamed from media/bubble.png)bin4737 -> 4737 bytes
-rw-r--r--media/images/bubble_sh.png (renamed from media/bubble_sh.png)bin1600 -> 1600 bytes
-rw-r--r--media/images/cube-blue.png (renamed from media/cube-blue.png)bin3734 -> 3734 bytes
-rw-r--r--media/images/cube-purple.png (renamed from media/cube-purple.png)bin5835 -> 5835 bytes
-rw-r--r--media/images/diffuse_blonde.png (renamed from media/textures/diffuse_blonde.png)bin4831676 -> 4831676 bytes
-rw-r--r--media/images/eyebrow001.png (renamed from media/textures/eyebrow001.png)bin80589 -> 80589 bytes
-rw-r--r--media/images/eyebrow008.png (renamed from media/textures/eyebrow008.png)bin97733 -> 97733 bytes
-rw-r--r--media/images/eyelashes01.png (renamed from media/textures/eyelashes01.png)bin64463 -> 64463 bytes
-rw-r--r--media/images/eyelashes03.png (renamed from media/textures/eyelashes03.png)bin104494 -> 104494 bytes
-rw-r--r--media/images/logo.png (renamed from media/logo.png)bin81162 -> 81162 bytes
-rw-r--r--media/images/normals.png (renamed from media/textures/normals.png)bin3091840 -> 3091840 bytes
-rw-r--r--media/images/plant_01.jpg (renamed from media/plant_01.jpg)bin165867 -> 165867 bytes
-rw-r--r--media/images/pt.png (renamed from media/pt.png)bin875 -> 875 bytes
-rw-r--r--media/images/rock_01.jpg (renamed from media/rock_01.jpg)bin330094 -> 330094 bytes
-rw-r--r--media/images/rock_02.jpg (renamed from media/rock_02.jpg)bin285555 -> 285555 bytes
-rw-r--r--media/images/short01_black_diffuse.png (renamed from media/textures/short01_black_diffuse.png)bin233989 -> 233989 bytes
-rw-r--r--media/images/short01_normals.png (renamed from media/textures/short01_normals.png)bin440778 -> 440778 bytes
-rw-r--r--media/images/sky_01.jpg (renamed from media/sky_01.jpg)bin134813 -> 134813 bytes
-rw-r--r--media/images/sky_02.jpg (renamed from media/sky_02.jpg)bin31413 -> 31413 bytes
-rw-r--r--media/images/sky_03.jpg (renamed from media/sky_03.jpg)bin73364 -> 73364 bytes
-rw-r--r--media/images/sky_04.jpg (renamed from media/sky_04.jpg)bin25078 -> 25078 bytes
-rw-r--r--media/images/sonic.png (renamed from media/sonic.png)bin309072 -> 309072 bytes
-rw-r--r--media/images/spacer.png (renamed from media/spacer.png)bin83 -> 83 bytes
-rw-r--r--media/images/sweet_home_reversed.png (renamed from media/sweet_home_reversed.png)bin61351 -> 61351 bytes
-rw-r--r--media/images/teeth.png (renamed from media/textures/teeth.png)bin1799930 -> 1799930 bytes
-rw-r--r--media/images/test.png (renamed from media/test.png)bin22869 -> 22869 bytes
-rw-r--r--media/images/toenail_natural_diff.png (renamed from media/textures/toenail_natural_diff.png)bin8403289 -> 8403289 bytes
-rw-r--r--media/images/toenails_diff.png (renamed from media/textures/toenails_diff.png)bin20567 -> 20567 bytes
-rw-r--r--media/images/tongue01_diffuse.png (renamed from media/textures/tongue01_diffuse.png)bin625419 -> 625419 bytes
-rw-r--r--media/images/tshirt_displacement.png (renamed from media/textures/tshirt_displacement.png)bin146143 -> 146143 bytes
-rw-r--r--media/images/tshirt_normal.png (renamed from media/textures/tshirt_normal.png)bin208524 -> 208524 bytes
-rw-r--r--media/images/tshirt_texture_blue.png (renamed from media/textures/tshirt_texture_blue.png)bin970704 -> 970704 bytes
-rw-r--r--media/images/tshirt_texture_white.png (renamed from media/textures/tshirt_texture_white.png)bin551334 -> 551334 bytes
-rw-r--r--media/images/worksuit_diffuse.png (renamed from media/textures/worksuit_diffuse.png)bin3540557 -> 3540557 bytes
-rw-r--r--media/images/worksuit_normals.png (renamed from media/textures/worksuit_normals.png)bin2494904 -> 2494904 bytes
-rw-r--r--media/images/young_lightskinned_female_diffuse.png (renamed from media/textures/young_lightskinned_female_diffuse.png)bin4405289 -> 4405289 bytes
-rw-r--r--media/images/young_lightskinned_female_genuine_genitals_diffuse.png (renamed from media/textures/young_lightskinned_female_genuine_genitals_diffuse.png)bin5113514 -> 5113514 bytes
-rw-r--r--media/logo_small.pngbin5655 -> 0 bytes
-rw-r--r--media/models/FemaleTeen_741.mtl66
-rw-r--r--media/models/FemaleTeen_741.obj (renamed from media/FemaleTeen_741.obj)0
-rw-r--r--media/models/Rough_Hir_raw.mtl (renamed from media/Rough_Hir_raw.mtl)0
-rw-r--r--media/models/Rough_Hir_raw.obj (renamed from media/Rough_Hir_raw.obj)0
-rw-r--r--media/models/Rough_Hir_smooth.mtl (renamed from media/Rough_Hir_smooth.mtl)0
-rw-r--r--media/models/Rough_Hir_smooth.obj (renamed from media/Rough_Hir_smooth.obj)0
-rw-r--r--media/models/onefang_741.mtl (renamed from media/onefang_741.mtl)36
-rw-r--r--media/models/onefang_741.obj (renamed from media/onefang_741.obj)0
-rw-r--r--media/models/sonic.md2 (renamed from media/sonic.md2)bin660576 -> 660576 bytes
-rw-r--r--media/models/sweet_home.obj (renamed from media/sweet_home.obj)0
-rw-r--r--media/normal_lego.pngbin3166 -> 0 bytes
-rw-r--r--media/wood_01.jpgbin96136 -> 0 bytes
-rw-r--r--src/extantz/woMan.c2
-rw-r--r--src/libraries/winFang.c8
71 files changed, 125 insertions, 133 deletions
diff --git a/build.lua b/build.lua
index bc32ad8..07017dc 100755
--- a/build.lua
+++ b/build.lua
@@ -86,7 +86,7 @@ CFLAGS = CFLAGS .. ' ' .. CFLAGOPTS
86LDFLAGS = '-L ' .. baseDir .. '/lib ' .. pkgConfig('libs-only-L', 'luajit') 86LDFLAGS = '-L ' .. baseDir .. '/lib ' .. pkgConfig('libs-only-L', 'luajit')
87libs = '-lLumbrJack -lRunnr -lSledjHamr -lwinFang ' .. pkgConfig('libs', 'elementary') .. ' ' .. pkgConfig('libs', 'luajit') .. ' -lm -Wl,-rpath,' .. baseDir .. '/lib -ldl' 87libs = '-lLumbrJack -lRunnr -lSledjHamr -lwinFang ' .. pkgConfig('libs', 'elementary') .. ' ' .. pkgConfig('libs', 'luajit') .. ' -lm -Wl,-rpath,' .. baseDir .. '/lib -ldl'
88LFLAGS = '-d' 88LFLAGS = '-d'
89EDJE_FLAGS = '-id ' .. baseDir .. '/media -fd ' .. baseDir .. '/media' 89EDJE_FLAGS = '-id ' .. baseDir .. '/media/images -fd ' .. baseDir .. '/media'
90 90
91 91
92if 'nil' == type(args) then 92if 'nil' == type(args) then
diff --git a/media/FemaleTeen_741.mtl b/media/FemaleTeen_741.mtl
deleted file mode 100644
index 17e2ebe..0000000
--- a/media/FemaleTeen_741.mtl
+++ /dev/null
@@ -1,66 +0,0 @@
1# MakeHuman exported MTL
2# www.makehuman.org
3
4
5newmtl young_asian_female
6Kd 1 0.95 0.85
7Ks 0.02745 0.02745 0.02745
8d 0
9map_Kd textures/young_lightskinned_female_diffuse.png
10map_D textures/young_lightskinned_female_diffuse.png
11
12newmtl female01Material
13Kd 1 1 1
14Ks 0.2 0.2 0.2
15d 0
16map_Kd textures/diffuse_blonde.png
17map_D textures/diffuse_blonde.png
18
19newmtl Eye_brown
20Kd 1 1 1
21Ks 1 1 1
22d 0
23map_Kd textures/brown_eye.png
24map_D textures/brown_eye.png
25
26newmtl eyebrow001
27Kd 1 1 1
28Ks 0 0 0
29d 0
30map_Kd textures/eyebrow001.png
31map_D textures/eyebrow001.png
32
33newmtl bodyMaterial
34Kd 1 1 1
35Ks 0 0 0
36d 0
37map_Kd textures/eyelashes03.png
38map_D textures/eyelashes03.png
39
40newmtl teethMaterial
41Kd 0.64 0.64 0.64
42Ks 0.8549 0.8549 0.8549
43d 0
44map_Kd textures/teeth.png
45map_D textures/teeth.png
46
47newmtl tongue01Material
48Kd 1 1 1
49Ks 0.03137 0.03137 0.03137
50d 0
51map_Kd textures/tongue01_diffuse.png
52map_D textures/tongue01_diffuse.png
53
54newmtl TShirtWhite
55Kd 1 1 1
56Ks 0.07059 0.07059 0.07059
57d 0
58map_Kd textures/tshirt_texture_white.png
59map_D textures/tshirt_texture_white.png
60
61newmtl short01blacksatin
62Kd 1 1 1
63Ks 0.5 0.5 0.5
64d 0
65map_Kd textures/short01_black_diffuse.png
66map_D textures/short01_black_diffuse.png
diff --git a/media/Test%20sim/FemaleTeen.omg b/media/Test%20sim/FemaleTeen.omg
index 235916c..cd2e8c3 100644
--- a/media/Test%20sim/FemaleTeen.omg
+++ b/media/Test%20sim/FemaleTeen.omg
@@ -9,23 +9,23 @@ Stuffs =
9 { 9 {
10 Mesh = 10 Mesh =
11 { 11 {
12 fileName = 'FemaleTeen_741.obj', 12 fileName = 'models/FemaleTeen_741.obj',
13 kind = 'mesh', 13 kind = 'mesh',
14 materials = 14 materials =
15 { 15 {
16 [0] = {kind = 'face', texture = 'textures/blue_eye.png'}, 16 [0] = {kind = 'face', texture = 'images/blue_eye.png'},
17 [1] = {kind = 'face', texture = 'textures/diffuse_blonde.png'}, 17 [1] = {kind = 'face', texture = 'images/diffuse_blonde.png'},
18 [2] = {kind = 'face', texture = 'textures/eyebrow001.png'}, 18 [2] = {kind = 'face', texture = 'images/eyebrow001.png'},
19 [3] = {kind = 'face', texture = 'textures/eyelashes03.png'}, 19 [3] = {kind = 'face', texture = 'images/eyelashes03.png'},
20 [4] = {kind = 'normal', texture = 'textures/normals.png'}, 20 [4] = {kind = 'normal', texture = 'images/normals.png'},
21 [5] = {kind = 'face', texture = 'textures/short01_black_diffuse.png'}, 21 [5] = {kind = 'face', texture = 'images/short01_black_diffuse.png'},
22 [6] = {kind = 'normal', texture = 'textures/short01_normals.png'}, 22 [6] = {kind = 'normal', texture = 'images/short01_normals.png'},
23 [7] = {kind = 'face', texture = 'textures/teeth.png'}, 23 [7] = {kind = 'face', texture = 'images/teeth.png'},
24 [8] = {kind = 'face', texture = 'textures/tongue01_diffuse.png'}, 24 [8] = {kind = 'face', texture = 'images/tongue01_diffuse.png'},
25 [9] = {kind = 'face', texture = 'textures/tshirt_displacement.png'}, 25 [9] = {kind = 'face', texture = 'images/tshirt_displacement.png'},
26 [10] = {kind = 'normal', texture = 'textures/tshirt_normal.png'}, 26 [10] = {kind = 'normal', texture = 'images/tshirt_normal.png'},
27 [11] = {kind = 'face', texture = 'textures/tshirt_texture_white.png'}, 27 [11] = {kind = 'face', texture = 'images/tshirt_texture_white.png'},
28 [12] = {kind = 'face', texture = 'textures/young_lightskinned_female_diffuse.png'}, 28 [12] = {kind = 'face', texture = 'images/young_lightskinned_female_diffuse.png'},
29 }, 29 },
30 }, 30 },
31 }, 31 },
diff --git a/media/Test%20sim/Rough_Hir.omg b/media/Test%20sim/Rough_Hir.omg
index 2f7a130..82ec204 100644
--- a/media/Test%20sim/Rough_Hir.omg
+++ b/media/Test%20sim/Rough_Hir.omg
@@ -9,11 +9,11 @@ Stuffs =
9 { 9 {
10 Mesh = 10 Mesh =
11 { 11 {
12 fileName = 'Rough_Hir_smooth.obj', 12 fileName = 'models/Rough_Hir_smooth.obj',
13 kind = 'mesh', 13 kind = 'mesh',
14 materials = 14 materials =
15 { 15 {
16 [0] = {kind = 'face', texture = 'textures/normals.png'}, 16 [0] = {kind = 'face', texture = 'images/normals.png'},
17 }, 17 },
18 }, 18 },
19 }, 19 },
diff --git a/media/Test%20sim/earth.omg b/media/Test%20sim/earth.omg
index 88b8430..f3de804 100644
--- a/media/Test%20sim/earth.omg
+++ b/media/Test%20sim/earth.omg
@@ -13,7 +13,7 @@ Stuffs =
13-- insert prim parameters here 13-- insert prim parameters here
14 materials = 14 materials =
15 { 15 {
16 [0] = {kind = 'face', texture = 'EarthDiffuse.png'}, 16 [0] = {kind = 'face', texture = 'images/EarthDiffuse.png'},
17 }, 17 },
18 }, 18 },
19 }, 19 },
diff --git a/media/Test%20sim/onefang%27s%20test%20bed.omg b/media/Test%20sim/onefang%27s%20test%20bed.omg
index 1e86837..ca95411 100644
--- a/media/Test%20sim/onefang%27s%20test%20bed.omg
+++ b/media/Test%20sim/onefang%27s%20test%20bed.omg
@@ -12,7 +12,7 @@ Stuffs =
12 kind = 'cube', 12 kind = 'cube',
13 materials = 13 materials =
14 { 14 {
15 [0] = {kind = 'normal', texture = 'normal_lego.png'}, 15 [0] = {kind = 'normal', texture = 'images/normal_lego.png'},
16 }, 16 },
17--[[ 17--[[
18 parts = 18 parts =
@@ -24,7 +24,7 @@ Stuffs =
24 rot = { , , , ,}, 24 rot = { , , , ,},
25 materials = 25 materials =
26 { 26 {
27 [0] = {kind = 'face', texture = 'sonic.png'}, 27 [0] = {kind = 'face', texture = 'images/sonic.png'},
28 }, 28 },
29 }, 29 },
30 ['earth'] = 30 ['earth'] =
@@ -34,7 +34,7 @@ Stuffs =
34 rot = { , , , ,}, 34 rot = { , , , ,},
35 materials = 35 materials =
36 { 36 {
37 [0] = {kind = 'face', texture = 'EarthDiffuse.png'}, 37 [0] = {kind = 'face', texture = 'images/EarthDiffuse.png'},
38 }, 38 },
39 }, 39 },
40 }, 40 },
diff --git a/media/Test%20sim/onefang.omg b/media/Test%20sim/onefang.omg
index ee7c9e9..e9a1509 100644
--- a/media/Test%20sim/onefang.omg
+++ b/media/Test%20sim/onefang.omg
@@ -9,19 +9,19 @@ Stuffs =
9 { 9 {
10 Mesh = 10 Mesh =
11 { 11 {
12 fileName = 'onefang_741.obj', 12 fileName = 'models/onefang_741.obj',
13 kind = 'mesh', 13 kind = 'mesh',
14 materials = 14 materials =
15 { 15 {
16 [0] = {kind = 'face', texture = 'map_D textures/Moustache_black_diff.png'}, 16 [0] = {kind = 'face', texture = 'map_D images/Moustache_black_diff.png'},
17 [1] = {kind = 'face', texture = 'map_D textures/brown_eye.png'}, 17 [1] = {kind = 'face', texture = 'map_D images/brown_eye.png'},
18 [2] = {kind = 'face', texture = 'map_D textures/eyebrow008.png'}, 18 [2] = {kind = 'face', texture = 'map_D images/eyebrow008.png'},
19 [3] = {kind = 'face', texture = 'map_D textures/eyelashes01.png'}, 19 [3] = {kind = 'face', texture = 'map_D images/eyelashes01.png'},
20 [4] = {kind = 'face', texture = 'map_D textures/tongue01_diffuse.png'}, 20 [4] = {kind = 'face', texture = 'map_D images/tongue01_diffuse.png'},
21 [5] = {kind = 'face', texture = 'map_D textures/toenail_natural_diff.png'}, 21 [5] = {kind = 'face', texture = 'map_D images/toenail_natural_diff.png'},
22 [6] = {kind = 'face', texture = 'map_D textures/worksuit_diffuse.png'}, 22 [6] = {kind = 'face', texture = 'map_D images/worksuit_diffuse.png'},
23 [7] = {kind = 'face', texture = 'map_D textures/Full_beard_black_diff.png'}, 23 [7] = {kind = 'face', texture = 'map_D images/Full_beard_black_diff.png'},
24 [8] = {kind = 'face', texture = 'map_D textures/Glasses2.png'}, 24 [8] = {kind = 'face', texture = 'map_D images/Glasses2.png'},
25 }, 25 },
26 }, 26 },
27 }, 27 },
diff --git a/media/Test%20sim/sonic.omg b/media/Test%20sim/sonic.omg
index 1b33e4f..c3d1df8 100644
--- a/media/Test%20sim/sonic.omg
+++ b/media/Test%20sim/sonic.omg
@@ -9,11 +9,11 @@ Stuffs =
9 { 9 {
10 Mesh = 10 Mesh =
11 { 11 {
12 fileName = 'sonic.md2', 12 fileName = 'models/sonic.md2',
13 kind = 'mesh', 13 kind = 'mesh',
14 materials = 14 materials =
15 { 15 {
16 [0] = {kind = 'face', texture = 'sonic.png'}, 16 [0] = {kind = 'face', texture = 'images/sonic.png'},
17 }, 17 },
18 }, 18 },
19 }, 19 },
diff --git a/media/Test%20sim/sweet_home.omg b/media/Test%20sim/sweet_home.omg
index 65ffa24..9f4e583 100644
--- a/media/Test%20sim/sweet_home.omg
+++ b/media/Test%20sim/sweet_home.omg
@@ -9,11 +9,11 @@ Stuffs =
9 { 9 {
10 Mesh = 10 Mesh =
11 { 11 {
12 fileName = 'sweet_home.obj', 12 fileName = 'models/sweet_home.obj',
13 kind = 'mesh', 13 kind = 'mesh',
14 materials = 14 materials =
15 { 15 {
16 [0] = {kind = 'face', texture = 'sweet_home_reversed.png'}, 16 [0] = {kind = 'face', texture = 'images/sweet_home_reversed.png'},
17 }, 17 },
18 }, 18 },
19 }, 19 },
diff --git a/media/Test%20sim/terrain.omg b/media/Test%20sim/terrain.omg
index b4edf81..bc3ef3e 100644
--- a/media/Test%20sim/terrain.omg
+++ b/media/Test%20sim/terrain.omg
@@ -13,7 +13,7 @@ Stuffs =
13-- insert prim parameters here 13-- insert prim parameters here
14 materials = 14 materials =
15 { 15 {
16 [0] = {kind = 'face', texture = 'EarthDiffuse.png'}, 16 [0] = {kind = 'face', texture = 'images/EarthDiffuse.png'},
17 }, 17 },
18 }, 18 },
19 }, 19 },
diff --git a/media/animated_logo.gif b/media/animated_logo.gif
deleted file mode 100644
index ef201af..0000000
--- a/media/animated_logo.gif
+++ /dev/null
Binary files differ
diff --git a/media/cube.lua b/media/cube.lua
deleted file mode 100644
index dca9b0b..0000000
--- a/media/cube.lua
+++ /dev/null
@@ -1,4 +0,0 @@
1Shape =
2{
3 kind = 'cube'
4}
diff --git a/media/earth.lua b/media/earth.lua
deleted file mode 100644
index 8ddf610..0000000
--- a/media/earth.lua
+++ /dev/null
@@ -1,4 +0,0 @@
1Shape =
2{
3 kind = 'sphere'
4}
diff --git a/media/EarthDiffuse.png b/media/images/EarthDiffuse.png
index 3bcf58b..3bcf58b 100644
--- a/media/EarthDiffuse.png
+++ b/media/images/EarthDiffuse.png
Binary files differ
diff --git a/media/textures/Full_beard_black_diff.png b/media/images/Full_beard_black_diff.png
index b5b1aac..b5b1aac 100644
--- a/media/textures/Full_beard_black_diff.png
+++ b/media/images/Full_beard_black_diff.png
Binary files differ
diff --git a/media/textures/Glasses2.png b/media/images/Glasses2.png
index a2c1be0..a2c1be0 100644
--- a/media/textures/Glasses2.png
+++ b/media/images/Glasses2.png
Binary files differ
diff --git a/media/textures/Moustache_black_diff.png b/media/images/Moustache_black_diff.png
index f38910a..f38910a 100644
--- a/media/textures/Moustache_black_diff.png
+++ b/media/images/Moustache_black_diff.png
Binary files differ
diff --git a/media/textures/blue_eye.png b/media/images/blue_eye.png
index 2b8c06a..2b8c06a 100644
--- a/media/textures/blue_eye.png
+++ b/media/images/blue_eye.png
Binary files differ
diff --git a/media/textures/brown_eye.png b/media/images/brown_eye.png
index 3244499..3244499 100644
--- a/media/textures/brown_eye.png
+++ b/media/images/brown_eye.png
Binary files differ
diff --git a/media/bubble.png b/media/images/bubble.png
index 8fc50f9..8fc50f9 100644
--- a/media/bubble.png
+++ b/media/images/bubble.png
Binary files differ
diff --git a/media/bubble_sh.png b/media/images/bubble_sh.png
index b66c1e6..b66c1e6 100644
--- a/media/bubble_sh.png
+++ b/media/images/bubble_sh.png
Binary files differ
diff --git a/media/cube-blue.png b/media/images/cube-blue.png
index e848d2b..e848d2b 100644
--- a/media/cube-blue.png
+++ b/media/images/cube-blue.png
Binary files differ
diff --git a/media/cube-purple.png b/media/images/cube-purple.png
index 096cdbb..096cdbb 100644
--- a/media/cube-purple.png
+++ b/media/images/cube-purple.png
Binary files differ
diff --git a/media/textures/diffuse_blonde.png b/media/images/diffuse_blonde.png
index e75f740..e75f740 100644
--- a/media/textures/diffuse_blonde.png
+++ b/media/images/diffuse_blonde.png
Binary files differ
diff --git a/media/textures/eyebrow001.png b/media/images/eyebrow001.png
index 25410f9..25410f9 100644
--- a/media/textures/eyebrow001.png
+++ b/media/images/eyebrow001.png
Binary files differ
diff --git a/media/textures/eyebrow008.png b/media/images/eyebrow008.png
index b6993bb..b6993bb 100644
--- a/media/textures/eyebrow008.png
+++ b/media/images/eyebrow008.png
Binary files differ
diff --git a/media/textures/eyelashes01.png b/media/images/eyelashes01.png
index 76bd0db..76bd0db 100644
--- a/media/textures/eyelashes01.png
+++ b/media/images/eyelashes01.png
Binary files differ
diff --git a/media/textures/eyelashes03.png b/media/images/eyelashes03.png
index ab849b2..ab849b2 100644
--- a/media/textures/eyelashes03.png
+++ b/media/images/eyelashes03.png
Binary files differ
diff --git a/media/logo.png b/media/images/logo.png
index 7dbae67..7dbae67 100644
--- a/media/logo.png
+++ b/media/images/logo.png
Binary files differ
diff --git a/media/textures/normals.png b/media/images/normals.png
index cbf429a..cbf429a 100644
--- a/media/textures/normals.png
+++ b/media/images/normals.png
Binary files differ
diff --git a/media/plant_01.jpg b/media/images/plant_01.jpg
index f1714dd..f1714dd 100644
--- a/media/plant_01.jpg
+++ b/media/images/plant_01.jpg
Binary files differ
diff --git a/media/pt.png b/media/images/pt.png
index 612d117..612d117 100644
--- a/media/pt.png
+++ b/media/images/pt.png
Binary files differ
diff --git a/media/rock_01.jpg b/media/images/rock_01.jpg
index c50ccb3..c50ccb3 100644
--- a/media/rock_01.jpg
+++ b/media/images/rock_01.jpg
Binary files differ
diff --git a/media/rock_02.jpg b/media/images/rock_02.jpg
index 04aea8a..04aea8a 100644
--- a/media/rock_02.jpg
+++ b/media/images/rock_02.jpg
Binary files differ
diff --git a/media/textures/short01_black_diffuse.png b/media/images/short01_black_diffuse.png
index 43d0d18..43d0d18 100644
--- a/media/textures/short01_black_diffuse.png
+++ b/media/images/short01_black_diffuse.png
Binary files differ
diff --git a/media/textures/short01_normals.png b/media/images/short01_normals.png
index 5cf9765..5cf9765 100644
--- a/media/textures/short01_normals.png
+++ b/media/images/short01_normals.png
Binary files differ
diff --git a/media/sky_01.jpg b/media/images/sky_01.jpg
index 22f3050..22f3050 100644
--- a/media/sky_01.jpg
+++ b/media/images/sky_01.jpg
Binary files differ
diff --git a/media/sky_02.jpg b/media/images/sky_02.jpg
index d0d7448..d0d7448 100644
--- a/media/sky_02.jpg
+++ b/media/images/sky_02.jpg
Binary files differ
diff --git a/media/sky_03.jpg b/media/images/sky_03.jpg
index cbad02a..cbad02a 100644
--- a/media/sky_03.jpg
+++ b/media/images/sky_03.jpg
Binary files differ
diff --git a/media/sky_04.jpg b/media/images/sky_04.jpg
index c5cbc18..c5cbc18 100644
--- a/media/sky_04.jpg
+++ b/media/images/sky_04.jpg
Binary files differ
diff --git a/media/sonic.png b/media/images/sonic.png
index 01cb2ed..01cb2ed 100644
--- a/media/sonic.png
+++ b/media/images/sonic.png
Binary files differ
diff --git a/media/spacer.png b/media/images/spacer.png
index bf91fa5..bf91fa5 100644
--- a/media/spacer.png
+++ b/media/images/spacer.png
Binary files differ
diff --git a/media/sweet_home_reversed.png b/media/images/sweet_home_reversed.png
index d535c13..d535c13 100644
--- a/media/sweet_home_reversed.png
+++ b/media/images/sweet_home_reversed.png
Binary files differ
diff --git a/media/textures/teeth.png b/media/images/teeth.png
index 338b9e2..338b9e2 100644
--- a/media/textures/teeth.png
+++ b/media/images/teeth.png
Binary files differ
diff --git a/media/test.png b/media/images/test.png
index fb620d7..fb620d7 100644
--- a/media/test.png
+++ b/media/images/test.png
Binary files differ
diff --git a/media/textures/toenail_natural_diff.png b/media/images/toenail_natural_diff.png
index 5274716..5274716 100644
--- a/media/textures/toenail_natural_diff.png
+++ b/media/images/toenail_natural_diff.png
Binary files differ
diff --git a/media/textures/toenails_diff.png b/media/images/toenails_diff.png
index 3b46274..3b46274 100644
--- a/media/textures/toenails_diff.png
+++ b/media/images/toenails_diff.png
Binary files differ
diff --git a/media/textures/tongue01_diffuse.png b/media/images/tongue01_diffuse.png
index a61ec57..a61ec57 100644
--- a/media/textures/tongue01_diffuse.png
+++ b/media/images/tongue01_diffuse.png
Binary files differ
diff --git a/media/textures/tshirt_displacement.png b/media/images/tshirt_displacement.png
index cac3b35..cac3b35 100644
--- a/media/textures/tshirt_displacement.png
+++ b/media/images/tshirt_displacement.png
Binary files differ
diff --git a/media/textures/tshirt_normal.png b/media/images/tshirt_normal.png
index 7293538..7293538 100644
--- a/media/textures/tshirt_normal.png
+++ b/media/images/tshirt_normal.png
Binary files differ
diff --git a/media/textures/tshirt_texture_blue.png b/media/images/tshirt_texture_blue.png
index 09be2ac..09be2ac 100644
--- a/media/textures/tshirt_texture_blue.png
+++ b/media/images/tshirt_texture_blue.png
Binary files differ
diff --git a/media/textures/tshirt_texture_white.png b/media/images/tshirt_texture_white.png
index a486db7..a486db7 100644
--- a/media/textures/tshirt_texture_white.png
+++ b/media/images/tshirt_texture_white.png
Binary files differ
diff --git a/media/textures/worksuit_diffuse.png b/media/images/worksuit_diffuse.png
index 0b33cd4..0b33cd4 100644
--- a/media/textures/worksuit_diffuse.png
+++ b/media/images/worksuit_diffuse.png
Binary files differ
diff --git a/media/textures/worksuit_normals.png b/media/images/worksuit_normals.png
index 8238bdd..8238bdd 100644
--- a/media/textures/worksuit_normals.png
+++ b/media/images/worksuit_normals.png
Binary files differ
diff --git a/media/textures/young_lightskinned_female_diffuse.png b/media/images/young_lightskinned_female_diffuse.png
index 8e58341..8e58341 100644
--- a/media/textures/young_lightskinned_female_diffuse.png
+++ b/media/images/young_lightskinned_female_diffuse.png
Binary files differ
diff --git a/media/textures/young_lightskinned_female_genuine_genitals_diffuse.png b/media/images/young_lightskinned_female_genuine_genitals_diffuse.png
index 66c92af..66c92af 100644
--- a/media/textures/young_lightskinned_female_genuine_genitals_diffuse.png
+++ b/media/images/young_lightskinned_female_genuine_genitals_diffuse.png
Binary files differ
diff --git a/media/logo_small.png b/media/logo_small.png
deleted file mode 100644
index c7dc665..0000000
--- a/media/logo_small.png
+++ /dev/null
Binary files differ
diff --git a/media/models/FemaleTeen_741.mtl b/media/models/FemaleTeen_741.mtl
new file mode 100644
index 0000000..0263a3e
--- /dev/null
+++ b/media/models/FemaleTeen_741.mtl
@@ -0,0 +1,66 @@
1# MakeHuman exported MTL
2# www.makehuman.org
3
4
5newmtl young_asian_female
6Kd 1 0.95 0.85
7Ks 0.02745 0.02745 0.02745
8d 0
9map_Kd images/young_lightskinned_female_diffuse.png
10map_D images/young_lightskinned_female_diffuse.png
11
12newmtl female01Material
13Kd 1 1 1
14Ks 0.2 0.2 0.2
15d 0
16map_Kd images/diffuse_blonde.png
17map_D images/diffuse_blonde.png
18
19newmtl Eye_brown
20Kd 1 1 1
21Ks 1 1 1
22d 0
23map_Kd images/brown_eye.png
24map_D images/brown_eye.png
25
26newmtl eyebrow001
27Kd 1 1 1
28Ks 0 0 0
29d 0
30map_Kd images/eyebrow001.png
31map_D images/eyebrow001.png
32
33newmtl bodyMaterial
34Kd 1 1 1
35Ks 0 0 0
36d 0
37map_Kd images/eyelashes03.png
38map_D images/eyelashes03.png
39
40newmtl teethMaterial
41Kd 0.64 0.64 0.64
42Ks 0.8549 0.8549 0.8549
43d 0
44map_Kd images/teeth.png
45map_D images/teeth.png
46
47newmtl tongue01Material
48Kd 1 1 1
49Ks 0.03137 0.03137 0.03137
50d 0
51map_Kd images/tongue01_diffuse.png
52map_D images/tongue01_diffuse.png
53
54newmtl TShirtWhite
55Kd 1 1 1
56Ks 0.07059 0.07059 0.07059
57d 0
58map_Kd images/tshirt_texture_white.png
59map_D images/tshirt_texture_white.png
60
61newmtl short01blacksatin
62Kd 1 1 1
63Ks 0.5 0.5 0.5
64d 0
65map_Kd images/short01_black_diffuse.png
66map_D images/short01_black_diffuse.png
diff --git a/media/FemaleTeen_741.obj b/media/models/FemaleTeen_741.obj
index 6947af2..6947af2 100644
--- a/media/FemaleTeen_741.obj
+++ b/media/models/FemaleTeen_741.obj
diff --git a/media/Rough_Hir_raw.mtl b/media/models/Rough_Hir_raw.mtl
index 6f4844e..6f4844e 100644
--- a/media/Rough_Hir_raw.mtl
+++ b/media/models/Rough_Hir_raw.mtl
diff --git a/media/Rough_Hir_raw.obj b/media/models/Rough_Hir_raw.obj
index 28d18c3..28d18c3 100644
--- a/media/Rough_Hir_raw.obj
+++ b/media/models/Rough_Hir_raw.obj
diff --git a/media/Rough_Hir_smooth.mtl b/media/models/Rough_Hir_smooth.mtl
index 6f4844e..6f4844e 100644
--- a/media/Rough_Hir_smooth.mtl
+++ b/media/models/Rough_Hir_smooth.mtl
diff --git a/media/Rough_Hir_smooth.obj b/media/models/Rough_Hir_smooth.obj
index 1391975..1391975 100644
--- a/media/Rough_Hir_smooth.obj
+++ b/media/models/Rough_Hir_smooth.obj
diff --git a/media/onefang_741.mtl b/media/models/onefang_741.mtl
index 36734b2..aa6b2d8 100644
--- a/media/onefang_741.mtl
+++ b/media/models/onefang_741.mtl
@@ -11,61 +11,61 @@ newmtl materialMaterial
11Kd 1 1 1 11Kd 1 1 1
12Ks 0.0002166 0.0002166 0.0002166 12Ks 0.0002166 0.0002166 0.0002166
13d 0 13d 0
14map_Kd textures/Moustache_black_diff.png 14map_Kd images/Moustache_black_diff.png
15map_D textures/Moustache_black_diff.png 15map_D images/Moustache_black_diff.png
16 16
17newmtl Eye_brown 17newmtl Eye_brown
18Kd 1 1 1 18Kd 1 1 1
19Ks 1 1 1 19Ks 1 1 1
20d 0 20d 0
21map_Kd textures/brown_eye.png 21map_Kd images/brown_eye.png
22map_D textures/brown_eye.png 22map_D images/brown_eye.png
23 23
24newmtl eyebrow008 24newmtl eyebrow008
25Kd 1 1 1 25Kd 1 1 1
26Ks 0 0 0 26Ks 0 0 0
27d 0 27d 0
28map_Kd textures/eyebrow008.png 28map_Kd images/eyebrow008.png
29map_D textures/eyebrow008.png 29map_D images/eyebrow008.png
30 30
31newmtl bodyMaterial 31newmtl bodyMaterial
32Kd 1 1 1 32Kd 1 1 1
33Ks 0 0 0 33Ks 0 0 0
34d 0 34d 0
35map_Kd textures/eyelashes01.png 35map_Kd images/eyelashes01.png
36map_D textures/eyelashes01.png 36map_D images/eyelashes01.png
37 37
38newmtl tongue01Material 38newmtl tongue01Material
39Kd 1 1 1 39Kd 1 1 1
40Ks 0.03137 0.03137 0.03137 40Ks 0.03137 0.03137 0.03137
41d 0 41d 0
42map_Kd textures/tongue01_diffuse.png 42map_Kd images/tongue01_diffuse.png
43map_D textures/tongue01_diffuse.png 43map_D images/tongue01_diffuse.png
44 44
45newmtl fingernails_female_naturalMaterial 45newmtl fingernails_female_naturalMaterial
46Kd 0.64 0.64 0.64 46Kd 0.64 0.64 0.64
47Ks 0.2 0.2 0.2 47Ks 0.2 0.2 0.2
48d 0 48d 0
49map_Kd textures/toenail_natural_diff.png 49map_Kd images/toenail_natural_diff.png
50map_D textures/toenail_natural_diff.png 50map_D images/toenail_natural_diff.png
51 51
52newmtl worksuit 52newmtl worksuit
53Kd 1 1 1 53Kd 1 1 1
54Ks 0.03137 0.03137 0.03137 54Ks 0.03137 0.03137 0.03137
55d 0 55d 0
56map_Kd textures/worksuit_diffuse.png 56map_Kd images/worksuit_diffuse.png
57map_D textures/worksuit_diffuse.png 57map_D images/worksuit_diffuse.png
58 58
59newmtl full_beardMaterial 59newmtl full_beardMaterial
60Kd 0.8 0.8 0.8 60Kd 0.8 0.8 0.8
61Ks 0.001376 0.001376 0.001376 61Ks 0.001376 0.001376 0.001376
62d 0 62d 0
63map_Kd textures/Full_beard_black_diff.png 63map_Kd images/Full_beard_black_diff.png
64map_D textures/Full_beard_black_diff.png 64map_D images/Full_beard_black_diff.png
65 65
66newmtl lambert8sg_23Material 66newmtl lambert8sg_23Material
67Kd 0 0 0 67Kd 0 0 0
68Ks 0.4602 0.4602 0.4602 68Ks 0.4602 0.4602 0.4602
69d 0 69d 0
70map_Kd textures/Glasses2.png 70map_Kd images/Glasses2.png
71map_D textures/Glasses2.png 71map_D images/Glasses2.png
diff --git a/media/onefang_741.obj b/media/models/onefang_741.obj
index 20ef975..20ef975 100644
--- a/media/onefang_741.obj
+++ b/media/models/onefang_741.obj
diff --git a/media/sonic.md2 b/media/models/sonic.md2
index 228edb9..228edb9 100644
--- a/media/sonic.md2
+++ b/media/models/sonic.md2
Binary files differ
diff --git a/media/sweet_home.obj b/media/models/sweet_home.obj
index 1a52b93..1a52b93 100644
--- a/media/sweet_home.obj
+++ b/media/models/sweet_home.obj
diff --git a/media/normal_lego.png b/media/normal_lego.png
deleted file mode 100644
index 6a74ad9..0000000
--- a/media/normal_lego.png
+++ /dev/null
Binary files differ
diff --git a/media/wood_01.jpg b/media/wood_01.jpg
deleted file mode 100644
index 89f1006..0000000
--- a/media/wood_01.jpg
+++ /dev/null
Binary files differ
diff --git a/src/extantz/woMan.c b/src/extantz/woMan.c
index a7bb4de..caa4db7 100644
--- a/src/extantz/woMan.c
+++ b/src/extantz/woMan.c
@@ -249,7 +249,7 @@ winFang *woMan_add(globals *ourGlobals)
249 evas_object_size_hint_align_set(nf, EVAS_HINT_FILL, EVAS_HINT_FILL); 249 evas_object_size_hint_align_set(nf, EVAS_HINT_FILL, EVAS_HINT_FILL);
250 evas_object_show(nf); 250 evas_object_show(nf);
251 251
252 sprintf(buf, "%s/%s", prefix_data_get(), img3); 252 sprintf(buf, "%s/images/%s", prefix_data_get(), img3);
253 tab = viewerList; tab_it = elm_naviframe_item_push(nf, NULL, NULL, NULL, tab, NULL); elm_naviframe_item_title_enabled_set(tab_it, EINA_FALSE, EINA_TRUE); elm_toolbar_item_append(tb, NoIcon, "Viewers", _promote, tab_it); 253 tab = viewerList; tab_it = elm_naviframe_item_push(nf, NULL, NULL, NULL, tab, NULL); elm_naviframe_item_title_enabled_set(tab_it, EINA_FALSE, EINA_TRUE); elm_toolbar_item_append(tb, NoIcon, "Viewers", _promote, tab_it);
254 // TODO - This strdup leaks, but this is just temporary test code anyway, it will go away. 254 // TODO - This strdup leaks, but this is just temporary test code anyway, it will go away.
255 tab = _content_image_new(me->win, strdup(buf)); tab_it = elm_naviframe_item_push(nf, NULL, NULL, NULL, tab, NULL); elm_naviframe_item_title_enabled_set(tab_it, EINA_FALSE, EINA_TRUE); elm_toolbar_item_append(tb, NoIcon, "Landmarks", _promote, tab_it); 255 tab = _content_image_new(me->win, strdup(buf)); tab_it = elm_naviframe_item_push(nf, NULL, NULL, NULL, tab, NULL); elm_naviframe_item_title_enabled_set(tab_it, EINA_FALSE, EINA_TRUE); elm_toolbar_item_append(tb, NoIcon, "Landmarks", _promote, tab_it);
diff --git a/src/libraries/winFang.c b/src/libraries/winFang.c
index 4e4e51c..94eb1bd 100644
--- a/src/libraries/winFang.c
+++ b/src/libraries/winFang.c
@@ -229,9 +229,9 @@ winFang *winFangAdd(winFang *parent, int x, int y, int w, int h, char *title, ch
229 229
230 // Sort out the background. 230 // Sort out the background.
231 if (result->parent) 231 if (result->parent)
232 snprintf(buf, sizeof(buf), "%s/sky_04.jpg", prefix_data_get()); 232 snprintf(buf, sizeof(buf), "%s/images/sky_04.jpg", prefix_data_get());
233 else 233 else
234 snprintf(buf, sizeof(buf), "%s/sky_03.jpg", prefix_data_get()); 234 snprintf(buf, sizeof(buf), "%s/images/sky_03.jpg", prefix_data_get());
235 result->bg = eo_add(ELM_BG_CLASS, obj, 235 result->bg = eo_add(ELM_BG_CLASS, obj,
236 evas_obj_size_hint_weight_set(eoid, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), 236 evas_obj_size_hint_weight_set(eoid, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND),
237 efl_file_set(eoid, buf, NULL), 237 efl_file_set(eoid, buf, NULL),
@@ -252,7 +252,7 @@ winFang *winFangAdd(winFang *parent, int x, int y, int w, int h, char *title, ch
252 252
253 // Evil hacks for no icons, until toolbars get fixed. 253 // Evil hacks for no icons, until toolbars get fixed.
254 if (0 == NoIcon[0]) 254 if (0 == NoIcon[0])
255 snprintf(NoIcon, sizeof(NoIcon), "%s/spacer.png", prefix_data_get()); 255 snprintf(NoIcon, sizeof(NoIcon), "%s/images/spacer.png", prefix_data_get());
256/* This aint doing shit. B-( 256/* This aint doing shit. B-(
257 obj = elm_icon_add(obj); 257 obj = elm_icon_add(obj);
258 elm_icon_order_lookup_set(obj, ELM_ICON_LOOKUP_THEME_FDO); 258 elm_icon_order_lookup_set(obj, ELM_ICON_LOOKUP_THEME_FDO);
@@ -286,7 +286,7 @@ winFang *winFangAdd(winFang *parent, int x, int y, int w, int h, char *title, ch
286 evas_object_event_callback_add(obj, EVAS_CALLBACK_MOUSE_DOWN, _onBgClick, result); 286 evas_object_event_callback_add(obj, EVAS_CALLBACK_MOUSE_DOWN, _onBgClick, result);
287 287
288 // Create corner handles. 288 // Create corner handles.
289 snprintf(buf, sizeof(buf), "%s/pt.png", prefix_data_get()); 289 snprintf(buf, sizeof(buf), "%s/images/pt.png", prefix_data_get());
290 for (i = 0; i < 4; i++) 290 for (i = 0; i < 4; i++)
291 { 291 {
292 int cx = result->x, cy = result->y; 292 int cx = result->x, cy = result->y;