From commit-messages at dark.worldforge.org Thu May 1 13:43:47 2008 From: commit-messages at dark.worldforge.org (commit-messages at dark.worldforge.org) Date: Thu, 1 May 2008 22:43:47 +0200 Subject: [WF-CVS] [WF media] r2510 - trunk/3d_objects/clothes/footwear/textures/leather_boots Message-ID: <200805012043.m41KhlCc021457@rzcomm22.rz.tu-bs.de> Author: erik Date: Thu May 1 23:04:30 2008 New Revision: 2510 Log: use proper size (power of two) Modified: trunk/3d_objects/clothes/footwear/textures/leather_boots/leather_boots.png Modified: trunk/3d_objects/clothes/footwear/textures/leather_boots/leather_boots.png ============================================================================== Binary files. No diff available. From commit-messages at dark.worldforge.org Thu May 1 13:45:42 2008 From: commit-messages at dark.worldforge.org (commit-messages at dark.worldforge.org) Date: Thu, 1 May 2008 22:45:42 +0200 Subject: [WF-CVS] [WF media] r2511 - trunk/3d_objects/clothes/footwear/textures/metal_shoes Message-ID: <200805012045.m41KjgxH021669@rzcomm22.rz.tu-bs.de> Author: erik Date: Thu May 1 23:05:10 2008 New Revision: 2511 Log: use proper size (power of two) Modified: trunk/3d_objects/clothes/footwear/textures/metal_shoes/metal_shoes.png Modified: trunk/3d_objects/clothes/footwear/textures/metal_shoes/metal_shoes.png ============================================================================== Binary files trunk/3d_objects/clothes/footwear/textures/metal_shoes/metal_shoes.png (original) and trunk/3d_objects/clothes/footwear/textures/metal_shoes/metal_shoes.png Thu May 1 23:05:10 2008 differ From commit-messages at dark.worldforge.org Thu May 1 13:45:47 2008 From: commit-messages at dark.worldforge.org (commit-messages at dark.worldforge.org) Date: Thu, 1 May 2008 22:45:47 +0200 Subject: [WF-CVS] [WF media] r2512 - trunk/3d_objects/plants/fruit/textures/mushrooms Message-ID: <200805012045.m41KjlCu021675@rzcomm22.rz.tu-bs.de> Author: erik Date: Thu May 1 23:06:34 2008 New Revision: 2512 Log: use proper size (power of two) Modified: trunk/3d_objects/plants/fruit/textures/mushrooms/mushroom_texture_blue_sa.png Modified: trunk/3d_objects/plants/fruit/textures/mushrooms/mushroom_texture_blue_sa.png ============================================================================== Binary files. No diff available. From commitmsg at worldforge.de Thu May 1 15:33:27 2008 From: commitmsg at worldforge.de (commitmsg at worldforge.de) Date: Fri, 2 May 2008 00:33:27 +0200 (CEST) Subject: [WF-CVS] [WF-git] The Ember WorldForge client. branch, master, updated. df84319ec050b8631191126a6f0cc2227ad498c6 Message-ID: <20080501223339.D5B5228FB8002@worldforge.de> The branch, master has been updated via df84319ec050b8631191126a6f0cc2227ad498c6 (commit) via 2a0a404542a2bee1398026fe6363b8dca328cf75 (commit) via db88bc8660a14ba2b1d2063785e5a41c7a13aa16 (commit) via 3feda0185dff0500e5b8ae05791efe9741694ef9 (commit) via 79b673e64635ad74a20e4c717985c88978d661f6 (commit) via b271e394063ca22f85d309c026470fca96077f11 (commit) via 36e5457f2ce6ed61db229a3e163ac677259b3fbe (commit) via 184d3f2100da6c0623c49d861488680ecc459aeb (commit) from 3ef07e9073bace13181df603c91279c7cabcee7d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit df84319ec050b8631191126a6f0cc2227ad498c6 Author: Erik Hjortsberg Date: Fri May 2 00:30:42 2008 +0200 remove old media commit 2a0a404542a2bee1398026fe6363b8dca328cf75 Author: Erik Hjortsberg Date: Fri May 2 00:29:57 2008 +0200 Various updates, mainly to avoid overwriting files that haven't changed. commit db88bc8660a14ba2b1d2063785e5a41c7a13aa16 Author: Erik Hjortsberg Date: Fri May 2 00:29:34 2008 +0200 Don't ignore the make dist media shell script since it's not autogenerated anymore. commit 3feda0185dff0500e5b8ae05791efe9741694ef9 Author: Erik Hjortsberg Date: Thu May 1 23:35:28 2008 +0200 Update with new media. commit 79b673e64635ad74a20e4c717985c88978d661f6 Author: Erik Hjortsberg Date: Thu May 1 23:34:47 2008 +0200 Update after media changes, use new nice meshes and materials. commit b271e394063ca22f85d309c026470fca96077f11 Author: Erik Hjortsberg Date: Thu May 1 23:33:10 2008 +0200 Bump version and remove make_dist_media.sh.in from the prebuild step. commit 36e5457f2ce6ed61db229a3e163ac677259b3fbe Author: Erik Hjortsberg Date: Thu May 1 23:32:22 2008 +0200 No need to use automake for this, use it as a script where it is instead. commit 184d3f2100da6c0623c49d861488680ecc459aeb Author: Erik Hjortsberg Date: Thu May 1 16:59:58 2008 +0200 Added an atlas composer class which is useful for generating atlas type definitions from Models. This should help us with getting more of the media into the server as types. ----------------------------------------------------------------------- Summary of changes: .gitignore | 1 - configure.ac | 3 +- make_dist_media.sh.in => make_dist_media.sh | 85 +++++++++++------ media/materials/scripts/buildings.material | 93 ++++++++---------- media/materials/scripts/creatures.material | 58 ++++++++---- media/materials/scripts/malebuilder.material | 27 ----- media/materials/scripts/vegetation.material | 44 ++++++++- src/components/ogre/model/Makefile.am | 13 +-- .../ogre/model/ModelDefinitionAtlasComposer.cpp | 80 ++++++++++++++++ .../ModelDefinitionAtlasComposer.h} | 23 +++-- src/components/ogre/modeldefinitions/boat.modeldef | 2 +- .../ogre/modeldefinitions/chicken.modeldef | 100 +++++++++++++++++++ .../ogre/modeldefinitions/creatures.modeldef.xml | 79 +--------------- .../ogre/modeldefinitions/drystan_archer.modeldef | 22 ---- .../ogre/modeldefinitions/environment.modeldef.xml | 49 +--------- .../ogre/modeldefinitions/kobold.modeldef | 101 ++++++++++++++++++++ .../modeldefinitions/modelmappings.modelmap.xml | 74 ++++++++++++-- .../ogre/modeldefinitions/spider.modeldef | 54 +++++++++++ 18 files changed, 598 insertions(+), 310 deletions(-) rename make_dist_media.sh.in => make_dist_media.sh (69%) create mode 100644 src/components/ogre/model/ModelDefinitionAtlasComposer.cpp copy src/components/ogre/{scripting/LuaHelper.h => model/ModelDefinitionAtlasComposer.h} (65%) create mode 100644 src/components/ogre/modeldefinitions/chicken.modeldef create mode 100644 src/components/ogre/modeldefinitions/kobold.modeldef create mode 100644 src/components/ogre/modeldefinitions/spider.modeldef Changeset truncated at 500 lines: diff --git a/.gitignore b/.gitignore index bfbbedd..6710dc2 100644 --- a/.gitignore +++ b/.gitignore @@ -16,7 +16,6 @@ ember ember-media.spec ember.dox ember.spec -make_dist_media.sh mkinstalldirs Makefile optimized diff --git a/configure.ac b/configure.ac index 2cf6940..a5ff805 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ ## Process this file with autoconf to produce a configure script. -AC_INIT(Ember, 0.5.2, clients at worldforge.org) +AC_INIT(Ember, 0.5.3, clients at worldforge.org) AC_CONFIG_SRCDIR(src) @@ -464,7 +464,6 @@ AC_CONFIG_FILES([Makefile ember.spec ember-media.spec autopackage/default.apspec - make_dist_media.sh src/extensions/Makefile src/components/ogre/scripting/Makefile src/components/ogre/scripting/bindings/Makefile diff --git a/make_dist_media.sh.in b/make_dist_media.sh similarity index 69% rename from make_dist_media.sh.in rename to make_dist_media.sh index 25a7963..d56f741 100644 --- a/make_dist_media.sh.in +++ b/make_dist_media.sh @@ -33,33 +33,56 @@ grep -orIE --no-filename "normalmaptexture=\"3d[^\"]*\"" ${original_media}/model sort --unique common_textures.list > common_textures_cleaned.list #first copy all textures -cd ${original_media}/common ; tar cf - `cat ${shared_dir}/common_textures_cleaned.list ` | ( cd ${shared_dir}/common; tar xvf -) +# cd ${original_media}/common ; tar cf - `cat ${shared_dir}/common_textures_cleaned.list ` | ( cd ${shared_dir}/common; tar xvf -) #then convert them to a little lower smaller echo "Converting images" for filename in `cat ${shared_dir}/common_textures_cleaned.list ` do - #'512x512>' will only convert if the image is larger in any dimension - # -quality 95 is suitable for photos - # -depth 8 guarantees that the pixeldepth is 8: we don't have any floating point textures yet - convert ${shared_dir}/common/$filename -quality 95 -depth 8 -resize "${textureSize}x${textureSize}>" ${shared_dir}/common/$filename - echo "Converted $filename to max ${textureSize}x${textureSize}" + origfile="${original_media}/common/${filename}" + newfile="${shared_dir}/common/${filename}" + if [ ! -e $origfile ] + then + echo "File $origfile does not exist!" + else + #only convert if the original image is newer + if [ $origfile -nt $newfile ] + then + mkdir -p `dirname ${newfile}` + #'512x512>' will only convert if the image is larger in any dimension + # -quality 95 is suitable for photos + # -depth 8 guarantees that the pixeldepth is 8: we don't have any floating point textures yet + #echo "convert $origfile -quality 95 -depth 8 -resize $newfile" + + convert $origfile -quality 95 -depth 8 -resize "${textureSize}x${textureSize}>" $newfile + echo "Converted $filename to max ${textureSize}x${textureSize}" + fi + fi + done #copy all meshes in use echo "Copying meshes" cd ${shared_dir} -grep -orIE --no-filename "mesh=\"3d[^\"]*\"" ${original_media}/modeldefinitions/*.modeldef | sed -e 's/mesh=\"//g' | sed -e 's/\"//g' > common_meshes.list -grep -orIE --no-filename "mesh=\"junk[^\"]*\"" ${original_media}/modeldefinitions/*.modeldef | sed -e 's/mesh=\"//g' | sed -e 's/\"//g' >> common_meshes.list -grep -orIE --no-filename "mesh=\"3d[^\"]*\"" ${original_media}/modeldefinitions/*.modeldef.xml | sed -e 's/mesh=\"//g' | sed -e 's/\"//g' >> common_meshes.list -grep -orIE --no-filename "mesh=\"junk[^\"]*\"" ${original_media}/modeldefinitions/*.modeldef.xml | sed -e 's/mesh=\"//g' | sed -e 's/\"//g' >> common_meshes.list -cd ${original_media}/common ; tar cf - `cat ${shared_dir}/common_meshes.list ` | ( cd ${shared_dir}/common; tar xvf -) +grep -orIE --no-filename "mesh=\"3d[^\"]*\"" ${original_media}/modeldefinitions/*.modeldef | sed -e 's/mesh=\"//g' | sed -e 's/\"//g' > ${shared_dir}/common_meshes.list +grep -orIE --no-filename "mesh=\"junk[^\"]*\"" ${original_media}/modeldefinitions/*.modeldef | sed -e 's/mesh=\"//g' | sed -e 's/\"//g' >> ${shared_dir}/common_meshes.list +grep -orIE --no-filename "mesh=\"3d[^\"]*\"" ${original_media}/modeldefinitions/*.modeldef.xml | sed -e 's/mesh=\"//g' | sed -e 's/\"//g' >> ${shared_dir}/common_meshes.list +grep -orIE --no-filename "mesh=\"junk[^\"]*\"" ${original_media}/modeldefinitions/*.modeldef.xml | sed -e 's/mesh=\"//g' | sed -e 's/\"//g' >> ${shared_dir}/common_meshes.list +cd ${original_media}/common ; tar cf - `cat ${shared_dir}/common_meshes.list ` | ( cd ${shared_dir}/common; tar --keep-newer-files -xvf -) 2> /dev/null +# exit mkdir -p ${shared_dir}/models -cd ${original_media}/models ; tar cf - `find -L . -iname \*.mesh` | ( cd ${shared_dir}/models; tar xvf -) -#it's harder to find out what skeletons are used, so we'll just copy them all +cd ${original_media}/models ; tar cf - `find -L . -iname \*.mesh` | ( cd ${shared_dir}/models; tar --keep-newer-files -xvf -) 2> /dev/null + + echo "Copying skeletons" -cd ${original_media} ; tar cf - `find -L . -iname \*.skeleton` | ( cd ${shared_dir}; tar xvf -) +#use meshmagick to figure out the needed skeletons +for filename in `find ${shared_dir}/common -name "*.mesh"` +do + meshmagick info 3d_skeletons/avian/models/chicken/chicken.mesh | grep -oE "skeletonfile.*.skeleton" | sed -e 's/skeletonfile //' >> ${shared_dir}/common_skeletons.list +done +cd ${original_media}/common ; tar cf - `cat ${shared_dir}/common_skeletons.list ` | ( cd ${shared_dir}/common; tar --keep-newer-files -xvf -) 2> /dev/null + # echo "Copying sounds" # mkdir -p ${shared_dir}/sounds @@ -68,7 +91,7 @@ cd ${original_media} ; tar cf - `find -L . -iname \*.skeleton` | ( cd ${shared_d echo "Copying packs" cd ${shared_dir} grep -rIE --no-filename "^Zip\[shared\]=.*" ${current}/src/components/ogre/resources.cfg | sed -e 's/Zip\[shared\]=//g' > shared_packs.list -cd ${original_media} ; tar cf - `cat ${shared_dir}/shared_packs.list ` | ( cd ${shared_dir}/; tar xvf -) +cd ${original_media} ; tar cf - `cat ${shared_dir}/shared_packs.list ` | ( cd ${shared_dir}/; tar --keep-newer-files -xvf -) 2> /dev/null @@ -97,33 +120,33 @@ cp -a ${original_media}/common/themes/ember/gui/status ${shared_dir}/gui/status echo "Copying definitions" mkdir -p ${user_dir}/modeldefinitions -cd ${original_media}/modeldefinitions ; tar cf - `find . -iname \*.modeldef` | ( cd ${user_dir}/modeldefinitions; tar xvf -) -cd ${original_media}/modeldefinitions ; tar cf - `find . -iname \*.modeldef.xml` | ( cd ${user_dir}/modeldefinitions; tar xvf -) -cd ${original_media}/modeldefinitions ; tar cf - `find . -iname \*.modelmap` | ( cd ${user_dir}/modeldefinitions; tar xvf -) -cd ${original_media}/modeldefinitions ; tar cf - `find . -iname \*.modelmap.xml` | ( cd ${user_dir}/modeldefinitions; tar xvf -) -cd ${original_media}/modeldefinitions ; tar cf - `find . -iname \*.terrain` | ( cd ${user_dir}/modeldefinitions; tar xvf -) +cd ${original_media}/modeldefinitions ; tar cf - `find . -iname \*.modeldef` | ( cd ${user_dir}/modeldefinitions; tar --keep-newer-files -xvf -) 2> /dev/null +cd ${original_media}/modeldefinitions ; tar cf - `find . -iname \*.modeldef.xml` | ( cd ${user_dir}/modeldefinitions; tar --keep-newer-files -xvf -) 2> /dev/null +cd ${original_media}/modeldefinitions ; tar cf - `find . -iname \*.modelmap` | ( cd ${user_dir}/modeldefinitions; tar --keep-newer-files -xvf -) 2> /dev/null +cd ${original_media}/modeldefinitions ; tar cf - `find . -iname \*.modelmap.xml` | ( cd ${user_dir}/modeldefinitions; tar --keep-newer-files -xvf -) 2> /dev/null +cd ${original_media}/modeldefinitions ; tar cf - `find . -iname \*.terrain` | ( cd ${user_dir}/modeldefinitions; tar --keep-newer-files -xvf -) 2> /dev/null echo "Copying materials" mkdir -p ${user_dir}/materials -cd ${original_media}/materials ; tar cf - `find . -iname \*.png` | ( cd ${user_dir}/materials; tar xvf -) -cd ${original_media}/materials ; tar cf - `find . -iname \*.jpg` | ( cd ${user_dir}/materials; tar xvf -) -cd ${original_media}/materials ; tar cf - `find . -iname \*.cg` | ( cd ${user_dir}/materials; tar xvf -) -cd ${original_media}/materials ; tar cf - `find . -iname \*.program` | ( cd ${user_dir}/materials; tar xvf -) -cd ${original_media}/materials ; tar cf - `find . -iname \*.asm` | ( cd ${user_dir}/materials; tar xvf -) -cd ${original_media}/materials ; tar cf - `find . -iname \*.ps` | ( cd ${user_dir}/materials; tar xvf -) -cd ${original_media}/materials ; tar cf - `find . -iname \*.material` | ( cd ${user_dir}/materials; tar xvf -) -cd ${original_media}/materials ; tar cf - `find . -iname \*.overlay` | ( cd ${user_dir}/materials; tar xvf -) +cd ${original_media}/materials ; tar cf - `find . -iname \*.png` | ( cd ${user_dir}/materials; tar --keep-newer-files -xvf -) 2> /dev/null +cd ${original_media}/materials ; tar cf - `find . -iname \*.jpg` | ( cd ${user_dir}/materials; tar --keep-newer-files -xvf -) 2> /dev/null +cd ${original_media}/materials ; tar cf - `find . -iname \*.cg` | ( cd ${user_dir}/materials; tar --keep-newer-files -xvf -) 2> /dev/null +cd ${original_media}/materials ; tar cf - `find . -iname \*.program` | ( cd ${user_dir}/materials; tar --keep-newer-files -xvf -) 2> /dev/null +cd ${original_media}/materials ; tar cf - `find . -iname \*.asm` | ( cd ${user_dir}/materials; tar --keep-newer-files -xvf -) 2> /dev/null +cd ${original_media}/materials ; tar cf - `find . -iname \*.ps` | ( cd ${user_dir}/materials; tar --keep-newer-files -xvf -) 2> /dev/null +cd ${original_media}/materials ; tar cf - `find . -iname \*.material` | ( cd ${user_dir}/materials; tar --keep-newer-files -xvf -) 2> /dev/null +cd ${original_media}/materials ; tar cf - `find . -iname \*.overlay` | ( cd ${user_dir}/materials; tar --keep-newer-files -xvf -) 2> /dev/null #cd ${original_media}/models ; tar cf - `find . -iname \*.mesh` | ( cd ${user_dir}/models; tar xvf -) #cd ${original_media}/models ; tar cf - `find . -iname \*.skeleton` | ( cd ${user_dir}/models; tar xvf -) mkdir -p ${user_dir}/particle -cd ${original_media}/particle ; tar cf - `find . -iname \*.particle` | ( cd ${user_dir}/particle; tar xvf -) +cd ${original_media}/particle ; tar cf - `find . -iname \*.particle` | ( cd ${user_dir}/particle; tar --keep-newer-files -xvf -) 2> /dev/null echo "Copying packs" cd ${user_dir} grep -rIE --no-filename "^Zip\[user\]=.*" ${current}/src/components/ogre/resources.cfg | sed -e 's/Zip\[user\]=//g' > user_packs.list -cd ${original_media} ; tar cf - `cat ${user_dir}/user_packs.list ` | ( cd ${user_dir}/; tar xvf -) +cd ${original_media} ; tar cf - `cat ${user_dir}/user_packs.list ` | ( cd ${user_dir}/; tar --keep-newer-files -xvf -) 2> /dev/null @@ -136,8 +159,10 @@ echo "Cleanup" rm -f ${shared_dir}/common_textures.list rm -f ${shared_dir}/common_textures_cleaned.list rm -f ${shared_dir}/common_meshes.list +rm -f ${shared_dir}/common_skeletons.list rm -f ${shared_dir}/shared_packs.list rm -f ${user_dir}/user_packs.list +echo "Done!" diff --git a/media/materials/scripts/buildings.material b/media/materials/scripts/buildings.material index f5775ac..2cc1d07 100644 --- a/media/materials/scripts/buildings.material +++ b/media/materials/scripts/buildings.material @@ -1,24 +1,17 @@ //--------------- rough timber ------------- -material /global/items/building_element/rough_timber/rough_timber_beam : /base/normalmap/specular +material /global/items/building_element/beam_end : /base/normalmap/specular { - set_texture_alias DiffuseMap 3d_objects/items/building_element/textures/rough_timber/rough_timber_beamD.png - set_texture_alias NormalHeightMap 3d_objects/items/building_element/textures/rough_timber/rough_timber_beamN.png - set_texture_alias SpecularMap 3d_objects/items/building_element/textures/rough_timber/rough_timber_beamS.png + set_texture_alias DiffuseMap 3d_objects/items/building_element/textures/beam_end/D.png + set_texture_alias NormalHeightMap 3d_objects/items/building_element/textures/beam_end/N.png + set_texture_alias SpecularMap 3d_objects/items/building_element/textures/beam_end/S.png } -material /global/items/building_element/rough_timber/rough_timber_beam_end : /base/normalmap/specular +material /global/items/building_element/beam_timber : /base/normalmap/specular { - set_texture_alias DiffuseMap 3d_objects/items/building_element/textures/rough_timber/rough_timber_beam_endD.png - set_texture_alias NormalHeightMap 3d_objects/items/building_element/textures/rough_timber/rough_timber_beam_endN.png - set_texture_alias SpecularMap 3d_objects/items/building_element/textures/rough_timber/rough_timber_beam_endS.png -} - -material /global/items/building_element/rough_timber/beam_end : /base/normalmap/specular -{ - set_texture_alias DiffuseMap 3d_objects/items/building_element/textures/rough_timber/beam_endD.png - set_texture_alias NormalHeightMap 3d_objects/items/building_element/textures/rough_timber/beam_endN.png - set_texture_alias SpecularMap 3d_objects/items/building_element/textures/rough_timber/beam_endS.png + set_texture_alias DiffuseMap 3d_objects/items/building_element/textures/beam_timber/D.png + set_texture_alias NormalHeightMap 3d_objects/items/building_element/textures/beam_timber/N.png + set_texture_alias SpecularMap 3d_objects/items/building_element/textures/beam_timber/S.png } material /global/items/building_element/rough_timber/rough_timber_wall : /base/normalmap/specular @@ -96,18 +89,19 @@ material /global/items/building_element/rough_timber/normal_slope_wall : /base/n //--------------- rough stone ------------- -material /global/items/building_element/rough_stone/big_arc : /base/normalmap/specular +material /global/items/building_element/moraf_big_arc : /base/normalmap/specular { - set_texture_alias DiffuseMap 3d_objects/items/building_element/textures/rough_stone/big_arcD.png - set_texture_alias NormalHeightMap 3d_objects/items/building_element/textures/rough_stone/big_arcN.png - set_texture_alias SpecularMap 3d_objects/items/building_element/textures/rough_stone/big_arcS.png + set_texture_alias DiffuseMap 3d_objects/items/building_element/textures/moraf_big_arc/D.png + set_texture_alias NormalHeightMap 3d_objects/items/building_element/textures/moraf_big_arc/N.png + set_texture_alias SpecularMap 3d_objects/items/building_element/textures/moraf_big_arc/S.png } -material /global/items/building_element/rough_stone/ceiling : /base/normalmap/specular + +material /global/items/building_element/moraf_ceiling : /base/normalmap/specular { - set_texture_alias DiffuseMap 3d_objects/items/building_element/textures/rough_stone/ceilingD.png - set_texture_alias NormalHeightMap 3d_objects/items/building_element/textures/rough_stone/ceilingN.png - set_texture_alias SpecularMap 3d_objects/items/building_element/textures/rough_stone/ceilingS.png + set_texture_alias DiffuseMap 3d_objects/items/building_element/textures/moraf_ceiling/D.png + set_texture_alias NormalHeightMap 3d_objects/items/building_element/textures/moraf_ceiling/N.png + set_texture_alias SpecularMap 3d_objects/items/building_element/textures/moraf_ceiling/S.png } material /global/items/building_element/rough_stone/door_element : /base/simple @@ -115,11 +109,11 @@ material /global/items/building_element/rough_stone/door_element : /base/simple set_texture_alias DiffuseMap 3d_objects/items/building_element/textures/rough_stone/door_elementD.png } -material /global/items/building_element/rough_stone/floor : /base/normalmap/specular +material /global/items/building_element/moraf_floor : /base/normalmap/specular { - set_texture_alias DiffuseMap 3d_objects/items/building_element/textures/rough_stone/floorD.png - set_texture_alias NormalHeightMap 3d_objects/items/building_element/textures/rough_stone/floorN.png - set_texture_alias SpecularMap 3d_objects/items/building_element/textures/rough_stone/floorS.png + set_texture_alias DiffuseMap 3d_objects/items/building_element/textures/moraf_floor/D.png + set_texture_alias NormalHeightMap 3d_objects/items/building_element/textures/moraf_floor/N.png + set_texture_alias SpecularMap 3d_objects/items/building_element/textures/moraf_floor/S.png } material /global/items/building_element/rough_stone/floor_east_west_side : /base/normalmap/specular @@ -198,18 +192,18 @@ material /global/items/building_element/rough_stone/wall_bottom : /base/normalma set_texture_alias SpecularMap 3d_objects/items/building_element/textures/rough_stone/wall_bottomS.png } -material /global/items/building_element/rough_stone/wall : /base/normalmap/specular +material /global/items/building_element/moraf_normal_wall : /base/normalmap/specular { - set_texture_alias DiffuseMap 3d_objects/items/building_element/textures/rough_stone/wallD.png - set_texture_alias NormalHeightMap 3d_objects/items/building_element/textures/rough_stone/wallN.png - set_texture_alias SpecularMap 3d_objects/items/building_element/textures/rough_stone/wallS.png + set_texture_alias DiffuseMap 3d_objects/items/building_element/textures/moraf_normal_wall/D.png + set_texture_alias NormalHeightMap 3d_objects/items/building_element/textures/moraf_normal_wall/N.png + set_texture_alias SpecularMap 3d_objects/items/building_element/textures/moraf_normal_wall/S.png } -material /global/items/building_element/rough_stone/wall_side : /base/normalmap/specular +material /global/items/building_element/moraf_wall_side : /base/normalmap/specular { - set_texture_alias DiffuseMap 3d_objects/items/building_element/textures/rough_stone/wall_sideD.png - set_texture_alias NormalHeightMap 3d_objects/items/building_element/textures/rough_stone/wall_sideN.png - set_texture_alias SpecularMap 3d_objects/items/building_element/textures/rough_stone/wall_sideS.png + set_texture_alias DiffuseMap 3d_objects/items/building_element/textures/moraf_wall_side/D.png + set_texture_alias NormalHeightMap 3d_objects/items/building_element/textures/moraf_wall_side/N.png + set_texture_alias SpecularMap 3d_objects/items/building_element/textures/moraf_wall_side/S.png } material /global/items/building_element/rough_stone/wall_top : /base/normalmap/specular @@ -371,25 +365,11 @@ material /global/items/building_element/chopping_block : /base/normalmap/specula set_texture_alias SpecularMap 3d_objects/items/building_element/textures/chopping_block/chopping_blockS.png } -material /global/items/ossyja/rough_post : /base/normalmap/specular -{ - set_texture_alias DiffuseMap 3d_objects/items/building_element/textures/ossyja/rough_postD.png - set_texture_alias NormalHeightMap 3d_objects/items/building_element/textures/ossyja/rough_postN.png - set_texture_alias SpecularMap 3d_objects/items/building_element/textures/ossyja/rough_postS.png -} - -material /global/items/ossyja/old_wood_planks : /base/normalmap/specular +material /global/items/building_element/ossyja_post : /base/normalmap/specular { - set_texture_alias DiffuseMap 3d_objects/items/building_element/textures/ossyja/old_wood_planksD.png - set_texture_alias NormalHeightMap 3d_objects/items/building_element/textures/ossyja/old_wood_planksN.png - set_texture_alias SpecularMap 3d_objects/items/building_element/textures/ossyja/old_wood_planksS.png -} - -material /global/items/ossyja/foundation_brick : /base/normalmap/specular -{ - set_texture_alias DiffuseMap 3d_objects/items/building_element/textures/ossyja/foundation_brickD.png - set_texture_alias NormalHeightMap 3d_objects/items/building_element/textures/ossyja/foundation_brickN.png - set_texture_alias SpecularMap 3d_objects/items/building_element/textures/ossyja/foundation_brickS.png + set_texture_alias DiffuseMap 3d_objects/items/building_element/textures/ossyja_post/D.png + set_texture_alias NormalHeightMap 3d_objects/items/building_element/textures/ossyja_post/N.png + set_texture_alias SpecularMap 3d_objects/items/building_element/textures/ossyja_post/S.png } material /global/items/ossyja/floor_plank : /base/normalmap @@ -398,6 +378,13 @@ material /global/items/ossyja/floor_plank : /base/normalmap set_texture_alias NormalHeightMap 3d_objects/items/building_element/textures/ossyja/floor_plankN.png } +material /global/items/building_element/ossyja_planks : /base/normalmap/specular +{ + set_texture_alias DiffuseMap 3d_objects/items/building_element/textures/ossyja_planks/D.png + set_texture_alias NormalHeightMap 3d_objects/items/building_element/textures/ossyja_planks/N.png + set_texture_alias SpecularMap 3d_objects/items/building_element/textures/ossyja_planks/S.png +} + material /global/items/building_element/foundation_brick : /base/normalmap/specular { set_texture_alias DiffuseMap 3d_objects/items/building_element/textures/foundation_brick/D.png diff --git a/media/materials/scripts/creatures.material b/media/materials/scripts/creatures.material index 1a73d6b..cce0ce0 100755 --- a/media/materials/scripts/creatures.material +++ b/media/materials/scripts/creatures.material @@ -43,10 +43,22 @@ material /global/creature/tubular/fish/scaly_brown_white : /base/simple/nonculle { set_texture_alias DiffuseMap 3d_objects/creatures/tubular/textures/scaly_brown_white/tubular.png } -material /global/creature/chicken : /base/simple/nonculled + +material /global/avian/redchicken : /base/simple/nonculled { - set_texture_alias DiffuseMap 3d_objects/creatures/avian/textures/redchicken/chickentex_1024.png + set_texture_alias DiffuseMap 3d_skeletons/avian/textures/redchicken/D.png } + +material /global/avian/buzzard : /base/simple/nonculled +{ + set_texture_alias DiffuseMap 3d_skeletons/avian/textures/buzzard/D.png +} + +material /global/avian/greychicken : /base/simple/nonculled +{ + set_texture_alias DiffuseMap 3d_skeletons/avian/textures/greychicken/D.png +} + material /global/creature/deer : /base/simple { set_texture_alias DiffuseMap 3d_objects/creatures/quadruped_v2/textures/deer/quadruped_v2.png @@ -57,16 +69,22 @@ material /global/creature/dog : /base/simple set_texture_alias DiffuseMap 3d_objects/creatures/quadruped/textures/white_fur/quadruped.png } -material /global/creature/insect/emerald : /base/simple +material /global/creature/insect/emerald : /base/normalmap/specular { - set_texture_alias DiffuseMap 3d_objects/creatures/insect/textures/emerald/insect.png + set_texture_alias DiffuseMap 3d_skeletons/insects/textures/emerald/D.png + set_texture_alias NormalHeightMap 3d_skeletons/insects/textures/emerald/N.png + set_texture_alias SpecularMap 3d_skeletons/insects/textures/emerald/S.png } -material /global/creature/insect/carrion : /base/simple +material /global/creature/insect/carrion : /base/normalmap/specular { - set_texture_alias DiffuseMap 3d_objects/creatures/insect/textures/carrion/insect.png + set_texture_alias DiffuseMap 3d_skeletons/insects/textures/carrion/D.png + set_texture_alias NormalHeightMap 3d_skeletons/insects/textures/carrion/N.png + set_texture_alias SpecularMap 3d_skeletons/insects/textures/carrion/S.png } + + material /global/bipeds/races/skeleton/body/white : /base/simple { set_texture_alias DiffuseMap 3d_skeletons/bipeds/races/skeleton/body/textures/white/D.png @@ -90,6 +108,8 @@ material /global/creatures/humanoid/humanoid : /base/simple set_texture_alias DiffuseMap 3d_objects/creatures/humanoid/textures/humanoid/humanoid_body.png } + + material /global/bipeds/races/goblin/male/body : /base/simple { set_texture_alias DiffuseMap 3d_skeletons/bipeds/races/goblin/male/body/D.png @@ -100,29 +120,29 @@ material /global/bipeds/races/goblin/male/head : /base/simple set_texture_alias DiffuseMap 3d_skeletons/bipeds/races/goblin/male/head/D.png } -material /global/creature/humanoid/kobold : /base/simple + +material /global/bipeds/races/kobold/male/body/green : /base/simple { - set_texture_alias DiffuseMap 3d_objects/creatures/humanoid/textures/kobold/low/kobold.png + set_texture_alias DiffuseMap 3d_skeletons/bipeds/races/kobold/male/body/textures/green/goblin.png } - -material /global/bipeds/male/male : /base/simple +material /global/creature/humanoid/kobold : /base/simple { - set_texture_alias DiffuseMap 3d_skeletons/bipeds/textures/male/maleD.png + set_texture_alias DiffuseMap 3d_objects/creatures/humanoid/textures/kobold/low/kobold.png } -material /global/bipeds/male_body : /base/normalmap/specular +material /global/bipeds/races/kobold/male/body/brown : /base/normalmap/specular { - set_texture_alias DiffuseMap 3d_skeletons/bipeds/textures/male_body/male_bodyD.png - set_texture_alias NormalHeightMap 3d_skeletons/bipeds/textures/male_body/male_bodyN.png - set_texture_alias SpecularMap 3d_skeletons/bipeds/textures/male_body/male_bodyS.png + set_texture_alias DiffuseMap 3d_skeletons/bipeds/races/kobold/male/body/textures/brown/D.png + set_texture_alias NormalHeightMap 3d_skeletons/bipeds/races/kobold/male/body/textures/brown/N.png + set_texture_alias SpecularMap 3d_skeletons/bipeds/races/kobold/male/body/textures/brown/S.png } -material /global/bipeds/male_head : /base/normalmap/specular +material /global/bipeds/races/kobold/male/accessories/belt : /base/normalmap/specular { - set_texture_alias DiffuseMap 3d_skeletons/bipeds/textures/male_head/male_headD.png - set_texture_alias NormalHeightMap 3d_skeletons/bipeds/textures/male_head/male_headN.png - set_texture_alias SpecularMap 3d_skeletons/bipeds/textures/male_head/male_headS.png + set_texture_alias DiffuseMap 3d_skeletons/bipeds/races/kobold/male/accessories/belt/D.png + set_texture_alias NormalHeightMap 3d_skeletons/bipeds/races/kobold/male/accessories/belt/N.png + set_texture_alias SpecularMap 3d_skeletons/bipeds/races/kobold/male/accessories/belt/S.png } diff --git a/media/materials/scripts/malebuilder.material b/media/materials/scripts/malebuilder.material index f32dc54..e69de29 100755 --- a/media/materials/scripts/malebuilder.material +++ b/media/materials/scripts/malebuilder.material @@ -1,27 +0,0 @@ -material /global/body_parts/eyes/blue_eye_01 : /base/simple -{ - set_texture_alias DiffuseMap 3d_objects/body_parts/eyes/textures/blue_eye_01/eye.png -} - -material /global/body_parts/hair/plain : /base/simple -{ - set_texture_alias DiffuseMap 3d_objects/body_parts/hair/textures/plain/hair.png -} - -material /global/body_parts/humanoid_head/young_one : /base/simple -{ - set_texture_alias DiffuseMap 3d_objects/body_parts/humanoid_head/textures/young_one/head.png -} - -material /global/body_parts/humanoid_head/worksman : /base/simple -{ - set_texture_alias DiffuseMap 3d_objects/body_parts/humanoid_head/textures/worksman/head.png -} - -material /global/body_parts/humanoid_body/male_pink : /base/simple -{ - set_texture_alias DiffuseMap 3d_objects/body_parts/humanoid_body/textures/male_pink/humanoid_body.png -} - - - diff --git a/media/materials/scripts/vegetation.material b/media/materials/scripts/vegetation.material index cf2a399..f8bb4a8 100755 --- a/media/materials/scripts/vegetation.material +++ b/media/materials/scripts/vegetation.material @@ -323,9 +323,9 @@ material /global/plants/trees/foliage/oak_summer : /base/normalmap/specular/non material /global/plants/trees/gnarly : /base/normalmap/specular/nonculled/alpharejected { - set_texture_alias DiffuseMap 3d_objects/plants/trees/textures/gnarly/treeD.png - set_texture_alias NormalHeightMap 3d_objects/plants/trees/textures/gnarly/treeN.png - set_texture_alias SpecularMap 3d_objects/plants/trees/textures/gnarly/treeS.png + set_texture_alias DiffuseMap 3d_objects/plants/trees/textures/gnarly/D.png + set_texture_alias NormalHeightMap 3d_objects/plants/trees/textures/gnarly/N.png + set_texture_alias SpecularMap 3d_objects/plants/trees/textures/gnarly/S.png } material /global/environment/ground/leaf_covered/ground : /base/normalmap @@ -357,6 +357,44 @@ material /global/plants/grass/bittergrass/single : /base/simple/nonculled/alphab } } +material /global/plants/grass/bittergrass_brown : /base/simple/nonculled/alphablended +{ + set_texture_alias DiffuseMap 3d_objects/plants/grass/textures/bittergrass_brown/D.png + technique + { + pass + { + alpha_rejection greater_equal 128 + //depth_write off -- The Ember WorldForge client. From commitmsg at worldforge.de Thu May 1 16:56:31 2008 From: commitmsg at worldforge.de (commitmsg at worldforge.de) Date: Fri, 2 May 2008 01:56:31 +0200 (CEST) Subject: [WF-CVS] [WF-git] The Ember WorldForge client. branch, master, updated. 510ef281f7582e513d04a01ed9dc740ccca60cd0 Message-ID: <20080501235637.D35B528FB8002@worldforge.de> The branch, master has been updated via 510ef281f7582e513d04a01ed9dc740ccca60cd0 (commit) via fd8a93a0a0e604767777ea9bc60f3ccc92022a21 (commit) from df84319ec050b8631191126a6f0cc2227ad498c6 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 510ef281f7582e513d04a01ed9dc740ccca60cd0 Author: Erik Hjortsberg Date: Fri May 2 01:56:02 2008 +0200 Added a button for exporting the model as an atlas type. commit fd8a93a0a0e604767777ea9bc60f3ccc92022a21 Author: Erik Hjortsberg Date: Fri May 2 01:55:21 2008 +0200 Expand on methods to export the model as atlas to files. ----------------------------------------------------------------------- Summary of changes: .../ogre/model/ModelDefinitionAtlasComposer.cpp | 66 ++++- .../ogre/model/ModelDefinitionAtlasComposer.h | 4 +- .../ogre/scripting/bindings/lua/EmberOgre.pkg | 1 + .../bindings/lua/ModelDefinitionAtlasComposer.pkg} | 9 +- .../ogre/scripting/bindings/lua/lua_EmberOgre.cpp | 314 ++++++++++++++++++-- .../ogre/scripting/bindings/lua/required.h | 1 + src/components/ogre/widgets/ModelEdit.layout | 6 + src/components/ogre/widgets/ModelEdit.lua | 8 + 8 files changed, 373 insertions(+), 36 deletions(-) copy src/components/ogre/{model/ModelDefinitionAtlasComposer.h => scripting/bindings/lua/ModelDefinitionAtlasComposer.pkg} (71%) Changeset truncated at 500 lines: diff --git a/src/components/ogre/model/ModelDefinitionAtlasComposer.cpp b/src/components/ogre/model/ModelDefinitionAtlasComposer.cpp index f5d855b..aa34936 100644 --- a/src/components/ogre/model/ModelDefinitionAtlasComposer.cpp +++ b/src/components/ogre/model/ModelDefinitionAtlasComposer.cpp @@ -28,10 +28,32 @@ #include "Model.h" #include +#include +#include +#include +#include +#include #include #include #include #include "../MathConverter.h" +#include "services/config/ConfigService.h" + +#include "framework/osdir.h" + +#ifdef WIN32 + #include + #define snprintf _snprintf + #include // for _access, Win32 version of stat() + #include // for _mkdir +// #include + + #include + #include + #include +#else + #include +#endif using namespace Atlas::Message; @@ -48,9 +70,12 @@ ModelDefinitionAtlasComposer::~ModelDefinitionAtlasComposer() { } -Atlas::Message::Element ModelDefinitionAtlasComposer::compose(Model* model, const std::string& typeName, const std::string& parentTypeName, float scale) +Atlas::Message::MapType ModelDefinitionAtlasComposer::compose(Model* model, const std::string& typeName, const std::string& parentTypeName, float scale) { MapType mainMap; + if (!model) { + return mainMap; + } MapType attributesMap; MapType bboxMap; @@ -74,6 +99,45 @@ Atlas::Message::Element ModelDefinitionAtlasComposer::compose(Model* model, cons return mainMap; } +void ModelDefinitionAtlasComposer::composeToStream(std::iostream& outstream, Model* model, const std::string& typeName, const std::string& parentTypeName, float scale) +{ + Atlas::Message::QueuedDecoder decoder; + //std::fstream file; + + Atlas::Codecs::XML codec(outstream, decoder); + Atlas::Formatter formatter(outstream, codec); + Atlas::Message::Encoder encoder(formatter); + formatter.streamBegin(); + encoder.streamMessageElement(compose(model, typeName, parentTypeName, scale)); + + formatter.streamEnd(); +} + +void ModelDefinitionAtlasComposer::composeToFile(Model* model, const std::string& typeName, const std::string& parentTypeName, float scale) +{ + if (model) { + ///make sure the directory exists + std::string dir(Ember::EmberServices::getSingletonPtr()->getConfigService()->getHomeDirectory() + "/typeexport/"); + + if (!oslink::directory(dir).isExisting()) { + S_LOG_INFO("Creating directory " << dir); +#ifdef __WIN32__ + mkdir(dir.c_str()); +#else + mkdir(dir.c_str(), S_IRWXU); +#endif + } + + const std::string fileName(dir + typeName + ".atlas"); + std::fstream exportFile(fileName.c_str(), std::fstream::out); + + S_LOG_INFO("Creating atlas type " << fileName); + composeToStream(exportFile, model, typeName, parentTypeName, scale); +// Ember::ConsoleBackend::getSingletonPtr()->pushMessage(std::string("Creating atlas type ") + fileName); + } + +} + } diff --git a/src/components/ogre/model/ModelDefinitionAtlasComposer.h b/src/components/ogre/model/ModelDefinitionAtlasComposer.h index b683a2c..0abfed0 100644 --- a/src/components/ogre/model/ModelDefinitionAtlasComposer.h +++ b/src/components/ogre/model/ModelDefinitionAtlasComposer.h @@ -40,7 +40,9 @@ public: virtual ~ModelDefinitionAtlasComposer(); - Atlas::Message::Element compose(Model* model, const std::string& typeName, const std::string& parentTypeName, float scale); + Atlas::Message::MapType compose(Model* model, const std::string& typeName, const std::string& parentTypeName, float scale); + void composeToStream(std::iostream& outstream, Model* model, const std::string& typeName, const std::string& parentTypeName, float scale); + void composeToFile(Model* model, const std::string& typeName, const std::string& parentTypeName, float scale); }; diff --git a/src/components/ogre/scripting/bindings/lua/EmberOgre.pkg b/src/components/ogre/scripting/bindings/lua/EmberOgre.pkg index bb30a1c..965bbe5 100644 --- a/src/components/ogre/scripting/bindings/lua/EmberOgre.pkg +++ b/src/components/ogre/scripting/bindings/lua/EmberOgre.pkg @@ -61,6 +61,7 @@ $pfile "IWorldPickListener.pkg" $pfile "EntityWorldPickListener.pkg" $pfile "ModelDefinitionManager.pkg" +$pfile "ModelDefinitionAtlasComposer.pkg" $pfile "EntityMoveManager.pkg" diff --git a/src/components/ogre/model/ModelDefinitionAtlasComposer.h b/src/components/ogre/scripting/bindings/lua/ModelDefinitionAtlasComposer.pkg similarity index 71% copy from src/components/ogre/model/ModelDefinitionAtlasComposer.h copy to src/components/ogre/scripting/bindings/lua/ModelDefinitionAtlasComposer.pkg index b683a2c..32bdbcb 100644 --- a/src/components/ogre/model/ModelDefinitionAtlasComposer.h +++ b/src/components/ogre/scripting/bindings/lua/ModelDefinitionAtlasComposer.pkg @@ -20,10 +20,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.// // -#ifndef EMBEROGRE_MODELMODELDEFINITIONATLASCOMPOSER_H -#define EMBEROGRE_MODELMODELDEFINITIONATLASCOMPOSER_H -#include namespace EmberOgre { @@ -40,7 +37,9 @@ public: virtual ~ModelDefinitionAtlasComposer(); - Atlas::Message::Element compose(Model* model, const std::string& typeName, const std::string& parentTypeName, float scale); + Atlas::Message::MapType compose(EmberOgre::Model::Model* model, const std::string& typeName, const std::string& parentTypeName, float scale); + void composeToStream(std::iostream& outstream, EmberOgre::Model::Model* model, const std::string& typeName, const std::string& parentTypeName, float scale); + void composeToFile(EmberOgre::Model::Model* model, const std::string& typeName, const std::string& parentTypeName, float scale); }; @@ -48,4 +47,4 @@ public: } -#endif + diff --git a/src/components/ogre/scripting/bindings/lua/lua_EmberOgre.cpp b/src/components/ogre/scripting/bindings/lua/lua_EmberOgre.cpp index ccbfc74..5e12bdd 100644 --- a/src/components/ogre/scripting/bindings/lua/lua_EmberOgre.cpp +++ b/src/components/ogre/scripting/bindings/lua/lua_EmberOgre.cpp @@ -1,6 +1,6 @@ /* ** Lua binding: EmberOgre -** Generated automatically by tolua++-1.0.92 on Sun Apr 27 17:12:50 2008. +** Generated automatically by tolua++-1.0.92 on Fri May 2 01:28:28 2008. */ #ifndef __cplusplus @@ -57,16 +57,16 @@ static int tolua_collect_Carpenter__AttachPair (lua_State* tolua_S) return 0; } -static int tolua_collect_Carpenter__BuildingBlockSpec (lua_State* tolua_S) +static int tolua_collect_EmberOgre__AttributeObserver (lua_State* tolua_S) { - Carpenter::BuildingBlockSpec* self = (Carpenter::BuildingBlockSpec*) tolua_tousertype(tolua_S,1,0); + EmberOgre::AttributeObserver* self = (EmberOgre::AttributeObserver*) tolua_tousertype(tolua_S,1,0); delete self; return 0; } -static int tolua_collect_EmberOgre__AttributeObserver (lua_State* tolua_S) +static int tolua_collect_Carpenter__BuildingBlockSpec (lua_State* tolua_S) { - EmberOgre::AttributeObserver* self = (EmberOgre::AttributeObserver*) tolua_tousertype(tolua_S,1,0); + Carpenter::BuildingBlockSpec* self = (Carpenter::BuildingBlockSpec*) tolua_tousertype(tolua_S,1,0); delete self; return 0; } @@ -78,6 +78,20 @@ static int tolua_collect_EmberOgre__Gui__StackableContainer (lua_State* tolua_S) return 0; } +static int tolua_collect_EmberOgre__AttachPointNode (lua_State* tolua_S) +{ + EmberOgre::AttachPointNode* self = (EmberOgre::AttachPointNode*) tolua_tousertype(tolua_S,1,0); + delete self; + return 0; +} + +static int tolua_collect_EmberOgre__Gui__QuaternionAdapter (lua_State* tolua_S) +{ + EmberOgre::Gui::QuaternionAdapter* self = (EmberOgre::Gui::QuaternionAdapter*) tolua_tousertype(tolua_S,1,0); + delete self; + return 0; +} + static int tolua_collect_EmberOgre__Gui__Icons__IconManager (lua_State* tolua_S) { EmberOgre::Gui::Icons::IconManager* self = (EmberOgre::Gui::Icons::IconManager*) tolua_tousertype(tolua_S,1,0); @@ -99,23 +113,23 @@ static int tolua_collect_std__vector_EmberOgre__ModelBlock__ (lua_State* tolua_S return 0; } -static int tolua_collect_EmberOgre__AttachPointNode (lua_State* tolua_S) +static int tolua_collect_EmberOgre__Gui__Vector3Adapter (lua_State* tolua_S) { - EmberOgre::AttachPointNode* self = (EmberOgre::AttachPointNode*) tolua_tousertype(tolua_S,1,0); + EmberOgre::Gui::Vector3Adapter* self = (EmberOgre::Gui::Vector3Adapter*) tolua_tousertype(tolua_S,1,0); delete self; return 0; } -static int tolua_collect_EmberOgre__Gui__QuaternionAdapter (lua_State* tolua_S) +static int tolua_collect_std__vector_Eris__Task__ (lua_State* tolua_S) { - EmberOgre::Gui::QuaternionAdapter* self = (EmberOgre::Gui::QuaternionAdapter*) tolua_tousertype(tolua_S,1,0); + std::vector* self = (std::vector*) tolua_tousertype(tolua_S,1,0); delete self; return 0; } -static int tolua_collect_EmberOgre__Gui__Vector3Adapter (lua_State* tolua_S) +static int tolua_collect_std__vector_EmberOgre__Model__SubModelDefinition__ (lua_State* tolua_S) { - EmberOgre::Gui::Vector3Adapter* self = (EmberOgre::Gui::Vector3Adapter*) tolua_tousertype(tolua_S,1,0); + std::vector* self = (std::vector*) tolua_tousertype(tolua_S,1,0); delete self; return 0; } @@ -127,9 +141,9 @@ static int tolua_collect_std__vector_std__string_ (lua_State* tolua_S) return 0; } -static int tolua_collect_std__vector_Eris__Task__ (lua_State* tolua_S) +static int tolua_collect_EmberOgre__ModelBlock (lua_State* tolua_S) { - std::vector* self = (std::vector*) tolua_tousertype(tolua_S,1,0); + EmberOgre::ModelBlock* self = (EmberOgre::ModelBlock*) tolua_tousertype(tolua_S,1,0); delete self; return 0; } @@ -141,9 +155,9 @@ static int tolua_collect_EmberOgre__Gui__EntityEditor (lua_State* tolua_S) return 0; } -static int tolua_collect_std__vector_EmberOgre__Model__SubModelDefinition__ (lua_State* tolua_S) +static int tolua_collect_EmberOgre__TerrainPosition (lua_State* tolua_S) { - std::vector* self = (std::vector*) tolua_tousertype(tolua_S,1,0); + EmberOgre::TerrainPosition* self = (EmberOgre::TerrainPosition*) tolua_tousertype(tolua_S,1,0); delete self; return 0; } @@ -267,9 +281,9 @@ static int tolua_collect_EmberOgre__Construction (lua_State* tolua_S) return 0; } -static int tolua_collect_EmberOgre__TerrainPosition (lua_State* tolua_S) +static int tolua_collect_Atlas__Message__MapType (lua_State* tolua_S) { - EmberOgre::TerrainPosition* self = (EmberOgre::TerrainPosition*) tolua_tousertype(tolua_S,1,0); + Atlas::Message::MapType* self = (Atlas::Message::MapType*) tolua_tousertype(tolua_S,1,0); delete self; return 0; } @@ -295,9 +309,9 @@ static int tolua_collect_Ogre__TexturePtr (lua_State* tolua_S) return 0; } -static int tolua_collect_EmberOgre__ModelBlock (lua_State* tolua_S) +static int tolua_collect_EmberOgre__Model__ModelDefinitionAtlasComposer (lua_State* tolua_S) { - EmberOgre::ModelBlock* self = (EmberOgre::ModelBlock*) tolua_tousertype(tolua_S,1,0); + EmberOgre::Model::ModelDefinitionAtlasComposer* self = (EmberOgre::Model::ModelDefinitionAtlasComposer*) tolua_tousertype(tolua_S,1,0); delete self; return 0; } @@ -452,6 +466,7 @@ static void tolua_reg_types (lua_State* tolua_S) tolua_usertype(tolua_S,"std::vector"); tolua_usertype(tolua_S,"WFMath::Point<3>"); tolua_usertype(tolua_S,"WFMath::AxisBox<3>"); + tolua_usertype(tolua_S,"std::iostream"); tolua_usertype(tolua_S,"EmberOgre::Gui::IconBar"); tolua_usertype(tolua_S,"sigc::signal"); tolua_usertype(tolua_S,"Ogre::AxisAlignedBox"); @@ -489,18 +504,20 @@ static void tolua_reg_types (lua_State* tolua_S) tolua_usertype(tolua_S,"EmberOgre::Gui::Icons::Icon"); tolua_usertype(tolua_S,"Ogre::Radian"); tolua_usertype(tolua_S,"CEGUI::Editbox"); - tolua_usertype(tolua_S,"const"); tolua_usertype(tolua_S,"Carpenter::AttachPair"); - tolua_usertype(tolua_S,"EmberOgre::Model::PartDefinition"); + tolua_usertype(tolua_S,"const"); tolua_usertype(tolua_S,"sigc::signal"); tolua_usertype(tolua_S,"sigc::signal"); - tolua_usertype(tolua_S,"std::vector"); + tolua_usertype(tolua_S,"EmberOgre::Model::PartDefinition"); tolua_usertype(tolua_S,"Ogre::BillboardSet"); tolua_usertype(tolua_S,"sigc::signal"); + tolua_usertype(tolua_S,"std::vector"); tolua_usertype(tolua_S,"Ogre::RenderWindow"); - tolua_usertype(tolua_S,"EmberOgre::AvatarCamera"); tolua_usertype(tolua_S,"EmberOgre::Model::ActionDefinition"); tolua_usertype(tolua_S,"sigc::signal"); + tolua_usertype(tolua_S,"EmberOgre::AvatarCamera"); + tolua_usertype(tolua_S,"EmberOgre::GUIManager"); + tolua_usertype(tolua_S,"EmberOgre::OgreInfo"); tolua_usertype(tolua_S,"CEGUI::ListboxItem"); tolua_usertype(tolua_S,"CEGUI::Imageset"); tolua_usertype(tolua_S,"EmberOgre::AvatarController"); @@ -514,18 +531,18 @@ static void tolua_reg_types (lua_State* tolua_S) tolua_usertype(tolua_S,"std::vector"); tolua_usertype(tolua_S,"EmberOgre::Environment::ISky"); tolua_usertype(tolua_S,"EmberOgre::Gui::IconBase"); - tolua_usertype(tolua_S,"EmberOgre::GUIManager"); - tolua_usertype(tolua_S,"EmberOgre::OgreInfo"); tolua_usertype(tolua_S,"EmberOgre::Terrain::Map"); tolua_usertype(tolua_S,"EmberOgre::Gui::QuaternionAdapter"); tolua_usertype(tolua_S,"EmberOgre::Gui::Widget"); - tolua_usertype(tolua_S,"std::map"); - tolua_usertype(tolua_S,"sigc::signal"); tolua_usertype(tolua_S,"EmberOgre::AvatarMovementState"); tolua_usertype(tolua_S,"std::vector"); + tolua_usertype(tolua_S,"std::map"); + tolua_usertype(tolua_S,"sigc::signal"); tolua_usertype(tolua_S,"std::vector"); - tolua_usertype(tolua_S,"EmberOgre::Model::SubEntityDefinition"); tolua_usertype(tolua_S,"CEGUI::DragContainer"); + tolua_usertype(tolua_S,"Atlas::Message::MapType"); + tolua_usertype(tolua_S,"EmberOgre::Model::SubEntityDefinition"); + tolua_usertype(tolua_S,"EmberOgre::Environment::IWater"); tolua_usertype(tolua_S,"Ogre;;ResourceManager"); tolua_usertype(tolua_S,"EmberOgre::Model::ModelDefinitionManager"); tolua_usertype(tolua_S,"sigc::signal"); @@ -583,7 +600,7 @@ static void tolua_reg_types (lua_State* tolua_S) tolua_usertype(tolua_S,"Ogre::Quaternion"); tolua_usertype(tolua_S,"EmberOgre::EntityMoveManager"); tolua_usertype(tolua_S,"Eris::TypeInfo"); - tolua_usertype(tolua_S,"EmberOgre::Environment::IWater"); + tolua_usertype(tolua_S,"EmberOgre::Model::ModelDefinitionAtlasComposer"); tolua_usertype(tolua_S,"Eris::Task"); tolua_usertype(tolua_S,"EmberOgre::Gui::AssetsManager"); tolua_usertype(tolua_S,"Ogre::TexturePtr"); @@ -17346,6 +17363,225 @@ static int tolua_EmberOgre_EmberOgre_Model_ModelDefinitionManager_setShowModels0 } #endif //#ifndef TOLUA_DISABLE +/* method: new of class EmberOgre::Model::ModelDefinitionAtlasComposer */ +#ifndef TOLUA_DISABLE_tolua_EmberOgre_EmberOgre_Model_ModelDefinitionAtlasComposer_new00 +static int tolua_EmberOgre_EmberOgre_Model_ModelDefinitionAtlasComposer_new00(lua_State* tolua_S) +{ +#ifndef TOLUA_RELEASE + tolua_Error tolua_err; + if ( + !tolua_isusertable(tolua_S,1,"EmberOgre::Model::ModelDefinitionAtlasComposer",0,&tolua_err) || + !tolua_isnoobj(tolua_S,2,&tolua_err) + ) + goto tolua_lerror; + else +#endif + { + { + EmberOgre::Model::ModelDefinitionAtlasComposer* tolua_ret = (EmberOgre::Model::ModelDefinitionAtlasComposer*) new EmberOgre::Model::ModelDefinitionAtlasComposer(); + tolua_pushusertype(tolua_S,(void*)tolua_ret,"EmberOgre::Model::ModelDefinitionAtlasComposer"); + } + } + return 1; +#ifndef TOLUA_RELEASE + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'new'.",&tolua_err); + return 0; +#endif +} +#endif //#ifndef TOLUA_DISABLE + +/* method: new_local of class EmberOgre::Model::ModelDefinitionAtlasComposer */ +#ifndef TOLUA_DISABLE_tolua_EmberOgre_EmberOgre_Model_ModelDefinitionAtlasComposer_new00_local +static int tolua_EmberOgre_EmberOgre_Model_ModelDefinitionAtlasComposer_new00_local(lua_State* tolua_S) +{ +#ifndef TOLUA_RELEASE + tolua_Error tolua_err; + if ( + !tolua_isusertable(tolua_S,1,"EmberOgre::Model::ModelDefinitionAtlasComposer",0,&tolua_err) || + !tolua_isnoobj(tolua_S,2,&tolua_err) + ) + goto tolua_lerror; + else +#endif + { + { + EmberOgre::Model::ModelDefinitionAtlasComposer* tolua_ret = (EmberOgre::Model::ModelDefinitionAtlasComposer*) new EmberOgre::Model::ModelDefinitionAtlasComposer(); + tolua_pushusertype_and_takeownership(tolua_S,(void *)tolua_ret,"EmberOgre::Model::ModelDefinitionAtlasComposer"); + } + } + return 1; +#ifndef TOLUA_RELEASE + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'new'.",&tolua_err); + return 0; +#endif +} +#endif //#ifndef TOLUA_DISABLE + +/* method: delete of class EmberOgre::Model::ModelDefinitionAtlasComposer */ +#ifndef TOLUA_DISABLE_tolua_EmberOgre_EmberOgre_Model_ModelDefinitionAtlasComposer_delete00 +static int tolua_EmberOgre_EmberOgre_Model_ModelDefinitionAtlasComposer_delete00(lua_State* tolua_S) +{ +#ifndef TOLUA_RELEASE + tolua_Error tolua_err; + if ( + !tolua_isusertype(tolua_S,1,"EmberOgre::Model::ModelDefinitionAtlasComposer",0,&tolua_err) || + !tolua_isnoobj(tolua_S,2,&tolua_err) + ) + goto tolua_lerror; + else +#endif + { + EmberOgre::Model::ModelDefinitionAtlasComposer* self = (EmberOgre::Model::ModelDefinitionAtlasComposer*) tolua_tousertype(tolua_S,1,0); +#ifndef TOLUA_RELEASE + if (!self) tolua_error(tolua_S,"invalid 'self' in function 'delete'",NULL); +#endif + delete self; + } + return 0; +#ifndef TOLUA_RELEASE + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'delete'.",&tolua_err); + return 0; +#endif +} +#endif //#ifndef TOLUA_DISABLE + +/* method: compose of class EmberOgre::Model::ModelDefinitionAtlasComposer */ +#ifndef TOLUA_DISABLE_tolua_EmberOgre_EmberOgre_Model_ModelDefinitionAtlasComposer_compose00 +static int tolua_EmberOgre_EmberOgre_Model_ModelDefinitionAtlasComposer_compose00(lua_State* tolua_S) +{ +#ifndef TOLUA_RELEASE + tolua_Error tolua_err; + if ( + !tolua_isusertype(tolua_S,1,"EmberOgre::Model::ModelDefinitionAtlasComposer",0,&tolua_err) || + !tolua_isusertype(tolua_S,2,"EmberOgre::Model::Model",0,&tolua_err) || + !tolua_iscppstring(tolua_S,3,0,&tolua_err) || + !tolua_iscppstring(tolua_S,4,0,&tolua_err) || + !tolua_isnumber(tolua_S,5,0,&tolua_err) || + !tolua_isnoobj(tolua_S,6,&tolua_err) + ) + goto tolua_lerror; + else +#endif + { + EmberOgre::Model::ModelDefinitionAtlasComposer* self = (EmberOgre::Model::ModelDefinitionAtlasComposer*) tolua_tousertype(tolua_S,1,0); + EmberOgre::Model::Model* model = ((EmberOgre::Model::Model*) tolua_tousertype(tolua_S,2,0)); + const std::string typeName = ((const std::string) tolua_tocppstring(tolua_S,3,0)); + const std::string parentTypeName = ((const std::string) tolua_tocppstring(tolua_S,4,0)); + float scale = ((float) tolua_tonumber(tolua_S,5,0)); +#ifndef TOLUA_RELEASE + if (!self) tolua_error(tolua_S,"invalid 'self' in function 'compose'",NULL); +#endif + { + Atlas::Message::MapType tolua_ret = (Atlas::Message::MapType) self->compose(model,typeName,parentTypeName,scale); + { +#ifdef __cplusplus + void* tolua_obj = new Atlas::Message::MapType(tolua_ret); + tolua_pushusertype_and_takeownership(tolua_S,tolua_obj,"Atlas::Message::MapType"); +#else + void* tolua_obj = tolua_copy(tolua_S,(void*)&tolua_ret,sizeof(Atlas::Message::MapType)); + tolua_pushusertype_and_takeownership(tolua_S,tolua_obj,"Atlas::Message::MapType"); +#endif + } + tolua_pushcppstring(tolua_S,(const char*)typeName); + tolua_pushcppstring(tolua_S,(const char*)parentTypeName); + } + } + return 3; +#ifndef TOLUA_RELEASE + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'compose'.",&tolua_err); + return 0; +#endif +} +#endif //#ifndef TOLUA_DISABLE + +/* method: composeToStream of class EmberOgre::Model::ModelDefinitionAtlasComposer */ +#ifndef TOLUA_DISABLE_tolua_EmberOgre_EmberOgre_Model_ModelDefinitionAtlasComposer_composeToStream00 +static int tolua_EmberOgre_EmberOgre_Model_ModelDefinitionAtlasComposer_composeToStream00(lua_State* tolua_S) +{ -- The Ember WorldForge client. From commit-messages at dark.worldforge.org Fri May 2 16:10:39 2008 From: commit-messages at dark.worldforge.org (commit-messages at dark.worldforge.org) Date: Sat, 3 May 2008 01:10:39 +0200 Subject: [WF-CVS] [WF media] r2513 - in trunk/3d_objects/plants: fruit/models/mushrooms fruit/textures/mushrooms mushrooms mushrooms/amanita mushrooms/blue_moon mushrooms/galerina mushrooms/silkfoot Message-ID: <200805022310.m42NAdex020227@rzcomm22.rz.tu-bs.de> Author: xrenmilay Date: Sat May 3 01:26:16 2008 New Revision: 2513 Log: removed old mushrooms directories added new mushroom directory added mew mushrooms Added: trunk/3d_objects/plants/mushrooms/ trunk/3d_objects/plants/mushrooms/amanita/ trunk/3d_objects/plants/mushrooms/amanita/D.png (contents, props changed) trunk/3d_objects/plants/mushrooms/amanita/N.png (contents, props changed) trunk/3d_objects/plants/mushrooms/amanita/S.png (contents, props changed) trunk/3d_objects/plants/mushrooms/amanita/mushroom.material trunk/3d_objects/plants/mushrooms/amanita/mushroom_A.mesh (contents, props changed) trunk/3d_objects/plants/mushrooms/amanita/mushroom_B.mesh (contents, props changed) trunk/3d_objects/plants/mushrooms/blue_moon/ trunk/3d_objects/plants/mushrooms/blue_moon/D.png (contents, props changed) trunk/3d_objects/plants/mushrooms/blue_moon/N.png (contents, props changed) trunk/3d_objects/plants/mushrooms/blue_moon/S.png (contents, props changed) trunk/3d_objects/plants/mushrooms/blue_moon/mushroom.material trunk/3d_objects/plants/mushrooms/blue_moon/mushroom_A.mesh (contents, props changed) trunk/3d_objects/plants/mushrooms/blue_moon/mushroom_B.mesh (contents, props changed) trunk/3d_objects/plants/mushrooms/galerina/ trunk/3d_objects/plants/mushrooms/galerina/D.png (contents, props changed) trunk/3d_objects/plants/mushrooms/galerina/N.png (contents, props changed) trunk/3d_objects/plants/mushrooms/galerina/S.png (contents, props changed) trunk/3d_objects/plants/mushrooms/galerina/mushroom.material trunk/3d_objects/plants/mushrooms/galerina/mushroom_A.mesh (contents, props changed) trunk/3d_objects/plants/mushrooms/galerina/mushroom_B.mesh (contents, props changed) trunk/3d_objects/plants/mushrooms/silkfoot/ trunk/3d_objects/plants/mushrooms/silkfoot/D.png (contents, props changed) trunk/3d_objects/plants/mushrooms/silkfoot/N.png (contents, props changed) trunk/3d_objects/plants/mushrooms/silkfoot/S.png (contents, props changed) trunk/3d_objects/plants/mushrooms/silkfoot/mushroom.material trunk/3d_objects/plants/mushrooms/silkfoot/mushroom_A.mesh (contents, props changed) trunk/3d_objects/plants/mushrooms/silkfoot/mushroom_B.mesh (contents, props changed) trunk/3d_objects/plants/mushrooms/silkfoot/silkfoot.mesh (contents, props changed) Removed: trunk/3d_objects/plants/fruit/models/mushrooms/ trunk/3d_objects/plants/fruit/textures/mushrooms/ Added: trunk/3d_objects/plants/mushrooms/amanita/D.png ============================================================================== Binary file. No diff available. Added: trunk/3d_objects/plants/mushrooms/amanita/N.png ============================================================================== Binary file. No diff available. Added: trunk/3d_objects/plants/mushrooms/amanita/S.png ============================================================================== Binary file. No diff available. Added: trunk/3d_objects/plants/mushrooms/amanita/mushroom.material ============================================================================== --- (empty file) +++ trunk/3d_objects/plants/mushrooms/amanita/mushroom.material Sat May 3 01:26:16 2008 @@ -0,0 +1,17 @@ + +material /global/plants/mushroom +{ + receive_shadows on + technique + { + pass + { + specular 0.449020 0.449020 0.449020 50.000000 + texture_unit + { + texture D.png + + } + } + } +} \ No newline at end of file Added: trunk/3d_objects/plants/mushrooms/amanita/mushroom_A.mesh ============================================================================== Binary file. No diff available. Added: trunk/3d_objects/plants/mushrooms/amanita/mushroom_B.mesh ============================================================================== Binary file. No diff available. Added: trunk/3d_objects/plants/mushrooms/blue_moon/D.png ============================================================================== Binary file. No diff available. Added: trunk/3d_objects/plants/mushrooms/blue_moon/N.png ============================================================================== Binary file. No diff available. Added: trunk/3d_objects/plants/mushrooms/blue_moon/S.png ============================================================================== Binary file. No diff available. Added: trunk/3d_objects/plants/mushrooms/blue_moon/mushroom.material ============================================================================== --- (empty file) +++ trunk/3d_objects/plants/mushrooms/blue_moon/mushroom.material Sat May 3 01:26:16 2008 @@ -0,0 +1,17 @@ + +material /global/plants/mushroom +{ + receive_shadows on + technique + { + pass + { + specular 0.449020 0.449020 0.449020 50.000000 + texture_unit + { + texture D.png + + } + } + } +} \ No newline at end of file Added: trunk/3d_objects/plants/mushrooms/blue_moon/mushroom_A.mesh ============================================================================== Binary file. No diff available. Added: trunk/3d_objects/plants/mushrooms/blue_moon/mushroom_B.mesh ============================================================================== Binary file. No diff available. Added: trunk/3d_objects/plants/mushrooms/galerina/D.png ============================================================================== Binary file. No diff available. Added: trunk/3d_objects/plants/mushrooms/galerina/N.png ============================================================================== Binary file. No diff available. Added: trunk/3d_objects/plants/mushrooms/galerina/S.png ============================================================================== Binary file. No diff available. Added: trunk/3d_objects/plants/mushrooms/galerina/mushroom.material ============================================================================== --- (empty file) +++ trunk/3d_objects/plants/mushrooms/galerina/mushroom.material Sat May 3 01:26:16 2008 @@ -0,0 +1,17 @@ + +material /global/plants/mushroom +{ + receive_shadows on + technique + { + pass + { + specular 0.449020 0.449020 0.449020 50.000000 + texture_unit + { + texture D.png + + } + } + } +} \ No newline at end of file Added: trunk/3d_objects/plants/mushrooms/galerina/mushroom_A.mesh ============================================================================== Binary file. No diff available. Added: trunk/3d_objects/plants/mushrooms/galerina/mushroom_B.mesh ============================================================================== Binary file. No diff available. Added: trunk/3d_objects/plants/mushrooms/silkfoot/D.png ============================================================================== Binary file. No diff available. Added: trunk/3d_objects/plants/mushrooms/silkfoot/N.png ============================================================================== Binary file. No diff available. Added: trunk/3d_objects/plants/mushrooms/silkfoot/S.png ============================================================================== Binary file. No diff available. Added: trunk/3d_objects/plants/mushrooms/silkfoot/mushroom.material ============================================================================== --- (empty file) +++ trunk/3d_objects/plants/mushrooms/silkfoot/mushroom.material Sat May 3 01:26:16 2008 @@ -0,0 +1,17 @@ + +material /global/plants/mushroom +{ + receive_shadows on + technique + { + pass + { + specular 0.449020 0.449020 0.449020 50.000000 + texture_unit + { + texture D.png + + } + } + } +} \ No newline at end of file Added: trunk/3d_objects/plants/mushrooms/silkfoot/mushroom_A.mesh ============================================================================== Binary file. No diff available. Added: trunk/3d_objects/plants/mushrooms/silkfoot/mushroom_B.mesh ============================================================================== Binary file. No diff available. Added: trunk/3d_objects/plants/mushrooms/silkfoot/silkfoot.mesh ============================================================================== Binary file. No diff available. From commit-messages at dark.worldforge.org Fri May 2 20:56:29 2008 From: commit-messages at dark.worldforge.org (commit-messages at dark.worldforge.org) Date: Sat, 3 May 2008 05:56:29 +0200 Subject: [WF-CVS] [WF media] r2514 - in trunk/3d_objects/plants: flowers fruit Message-ID: <200805030356.m433uTxe015295@rzcomm22.rz.tu-bs.de> Author: xrenmilay Date: Sat May 3 06:17:20 2008 New Revision: 2514 Log: removed old directories Removed: trunk/3d_objects/plants/flowers/ trunk/3d_objects/plants/fruit/ From commit-messages at dark.worldforge.org Fri May 2 21:06:07 2008 From: commit-messages at dark.worldforge.org (commit-messages at dark.worldforge.org) Date: Sat, 3 May 2008 06:06:07 +0200 Subject: [WF-CVS] [WF media] r2515 - in trunk/3d_objects/plants: flowers flowers/camellia fruit fruit/acorn fruit/apple fruit/beet fruit/carrot fruit/textures fruit/textures/acorn fruit/textures/apple fruit/textures/beet fruit/textures/carrot fruit/textures/mushrooms Message-ID: <200805030406.m434677d016298@rzcomm22.rz.tu-bs.de> Author: xrenmilay Date: Sat May 3 06:20:39 2008 New Revision: 2515 Log: added a new directory structure form the old version Added: trunk/3d_objects/plants/flowers/ trunk/3d_objects/plants/flowers/camellia/ trunk/3d_objects/plants/flowers/camellia/D.png (contents, props changed) trunk/3d_objects/plants/flowers/camellia/N.png (contents, props changed) trunk/3d_objects/plants/flowers/camellia/camellia.mesh (contents, props changed) trunk/3d_objects/plants/fruit/ trunk/3d_objects/plants/fruit/acorn/ trunk/3d_objects/plants/fruit/acorn/D.png (contents, props changed) trunk/3d_objects/plants/fruit/acorn/N.png (contents, props changed) trunk/3d_objects/plants/fruit/acorn/S.png (contents, props changed) trunk/3d_objects/plants/fruit/acorn/T.png (contents, props changed) trunk/3d_objects/plants/fruit/acorn/acorn.mesh (contents, props changed) trunk/3d_objects/plants/fruit/acorn/acron.material trunk/3d_objects/plants/fruit/apple/ trunk/3d_objects/plants/fruit/apple/D.png (contents, props changed) trunk/3d_objects/plants/fruit/apple/N.png (contents, props changed) trunk/3d_objects/plants/fruit/apple/S.png (contents, props changed) trunk/3d_objects/plants/fruit/apple/apple.material trunk/3d_objects/plants/fruit/apple/apple.mesh (contents, props changed) trunk/3d_objects/plants/fruit/beet/ trunk/3d_objects/plants/fruit/beet/D.png (contents, props changed) trunk/3d_objects/plants/fruit/beet/I.png (contents, props changed) trunk/3d_objects/plants/fruit/beet/N.png (contents, props changed) trunk/3d_objects/plants/fruit/beet/S.png (contents, props changed) trunk/3d_objects/plants/fruit/beet/T.png (contents, props changed) trunk/3d_objects/plants/fruit/beet/beet.material trunk/3d_objects/plants/fruit/beet/beet.mesh (contents, props changed) trunk/3d_objects/plants/fruit/carrot/ trunk/3d_objects/plants/fruit/carrot/D.png (contents, props changed) trunk/3d_objects/plants/fruit/carrot/N.png (contents, props changed) trunk/3d_objects/plants/fruit/carrot/S.png (contents, props changed) trunk/3d_objects/plants/fruit/carrot/T.png (contents, props changed) trunk/3d_objects/plants/fruit/carrot/carrot.material trunk/3d_objects/plants/fruit/carrot/carrot.mesh (contents, props changed) trunk/3d_objects/plants/fruit/readme.txt trunk/3d_objects/plants/fruit/textures/ trunk/3d_objects/plants/fruit/textures/acorn/ trunk/3d_objects/plants/fruit/textures/apple/ trunk/3d_objects/plants/fruit/textures/beet/ trunk/3d_objects/plants/fruit/textures/carrot/ trunk/3d_objects/plants/fruit/textures/mushrooms/ Added: trunk/3d_objects/plants/flowers/camellia/D.png ============================================================================== Binary file. No diff available. Added: trunk/3d_objects/plants/flowers/camellia/N.png ============================================================================== Binary file. No diff available. Added: trunk/3d_objects/plants/flowers/camellia/camellia.mesh ============================================================================== Binary file. No diff available. Added: trunk/3d_objects/plants/fruit/acorn/D.png ============================================================================== Binary file. No diff available. Added: trunk/3d_objects/plants/fruit/acorn/N.png ============================================================================== Binary file. No diff available. Added: trunk/3d_objects/plants/fruit/acorn/S.png ============================================================================== Binary file. No diff available. Added: trunk/3d_objects/plants/fruit/acorn/T.png ============================================================================== Binary file. No diff available. Added: trunk/3d_objects/plants/fruit/acorn/acorn.mesh ============================================================================== Binary file. No diff available. Added: trunk/3d_objects/plants/fruit/acorn/acron.material ============================================================================== --- (empty file) +++ trunk/3d_objects/plants/fruit/acorn/acron.material Sat May 3 06:20:39 2008 @@ -0,0 +1,39 @@ + +material /global/plants/fruit/acorn + + +{ + receive_shadows on + technique + { + pass + { + specular 0.8 0.8 0.8 50.000000 + texture_unit + { + texture D.png + + } + } + } +} + + +material /global/plants/fruit/acorn/matte + + +{ + receive_shadows on + technique + { + pass + { + specular 0.02 0.02 0.02 50.000000 + texture_unit + { + texture D.png + + } + } + } +} Added: trunk/3d_objects/plants/fruit/apple/D.png ============================================================================== Binary file. No diff available. Added: trunk/3d_objects/plants/fruit/apple/N.png ============================================================================== Binary file. No diff available. Added: trunk/3d_objects/plants/fruit/apple/S.png ============================================================================== Binary file. No diff available. Added: trunk/3d_objects/plants/fruit/apple/apple.material ============================================================================== --- (empty file) +++ trunk/3d_objects/plants/fruit/apple/apple.material Sat May 3 06:20:39 2008 @@ -0,0 +1,39 @@ + +material /global/plants/fruit/apple/bark + + +{ + receive_shadows on + technique + { + pass + { + specular 0.8 0.8 0.8 50.000000 + texture_unit + { + texture D.png + + } + } + } +} + + +material /global/plants/fruit/apple + + +{ + receive_shadows on + technique + { + pass + { + specular 0.02 0.02 0.02 50.000000 + texture_unit + { + texture D.png + + } + } + } +} Added: trunk/3d_objects/plants/fruit/apple/apple.mesh ============================================================================== Binary file. No diff available. Added: trunk/3d_objects/plants/fruit/beet/D.png ============================================================================== Binary file. No diff available. Added: trunk/3d_objects/plants/fruit/beet/I.png ============================================================================== Binary file. No diff available. Added: trunk/3d_objects/plants/fruit/beet/N.png ============================================================================== Binary file. No diff available. Added: trunk/3d_objects/plants/fruit/beet/S.png ============================================================================== Binary file. No diff available. Added: trunk/3d_objects/plants/fruit/beet/T.png ============================================================================== Binary file. No diff available. Added: trunk/3d_objects/plants/fruit/beet/beet.material ============================================================================== --- (empty file) +++ trunk/3d_objects/plants/fruit/beet/beet.material Sat May 3 06:20:39 2008 @@ -0,0 +1,37 @@ +material /global/plants/fruit/beet/beet +{ + receive_shadows on + technique + { + pass + { + texture_unit + { + texture D.png + } + } + } +} + +material /global/plants/fruit/beet/beet_leaves +{ + receive_shadows off + technique + { + pass + { + scene_blend alpha_blend + cull_hardware none + cull_software none + alpha_rejection greater_equal 64 + texture_unit + { + + texture D.png + } + + diffuse 1.000000 1.000000 1.000000 + emissive 0.500000 0.500000 0.300000 + } + } +} Added: trunk/3d_objects/plants/fruit/beet/beet.mesh ============================================================================== Binary file. No diff available. Added: trunk/3d_objects/plants/fruit/carrot/D.png ============================================================================== Binary file. No diff available. Added: trunk/3d_objects/plants/fruit/carrot/N.png ============================================================================== Binary file. No diff available. Added: trunk/3d_objects/plants/fruit/carrot/S.png ============================================================================== Binary file. No diff available. Added: trunk/3d_objects/plants/fruit/carrot/T.png ============================================================================== Binary file. No diff available. Added: trunk/3d_objects/plants/fruit/carrot/carrot.material ============================================================================== --- (empty file) +++ trunk/3d_objects/plants/fruit/carrot/carrot.material Sat May 3 06:20:39 2008 @@ -0,0 +1,47 @@ +material /global/plants/fruit/carrot/carrot_root +{ + receive_shadows on + technique + { + pass + { + scene_blend alpha_blend + cull_hardware none + cull_software none + alpha_rejection greater_equal 64 + texture_unit + { + + texture D.png + } + + diffuse 1.000000 1.000000 1.000000 + emissive 0.800000 0.500000 0.100000 + } + } +} + +material /global/plants/fruit/carrot/carrot_leaves + +{ + receive_shadows on + technique + { + pass + { + scene_blend alpha_blend + cull_hardware none + cull_software none + alpha_rejection greater_equal 64 + texture_unit + { + + texture D.png + } + + + diffuse 1.000000 1.000000 1.000000 + emissive 0.500000 0.500000 0.100000 + } + } +} \ No newline at end of file Added: trunk/3d_objects/plants/fruit/carrot/carrot.mesh ============================================================================== Binary file. No diff available. Added: trunk/3d_objects/plants/fruit/readme.txt ============================================================================== --- (empty file) +++ trunk/3d_objects/plants/fruit/readme.txt Sat May 3 06:20:39 2008 @@ -0,0 +1 @@ +please put the edible part of a plant developed from a flower, with any accessory tissues, as the peach, mulberry, or banana. \ No newline at end of file From commitmsg at worldforge.de Sat May 3 07:42:39 2008 From: commitmsg at worldforge.de (commitmsg at worldforge.de) Date: Sat, 3 May 2008 16:42:39 +0200 (CEST) Subject: [WF-CVS] [WF-git] The Ember WorldForge client. branch, master, updated. d9106b7e28a822492ac6028d5571e86207981733 Message-ID: <20080503144244.24CE728FB8002@worldforge.de> The branch, master has been updated via d9106b7e28a822492ac6028d5571e86207981733 (commit) from 510ef281f7582e513d04a01ed9dc740ccca60cd0 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit d9106b7e28a822492ac6028d5571e86207981733 Author: Erik Hjortsberg Date: Sat May 3 16:42:06 2008 +0200 Fix incorrect case spcification on the bread. ----------------------------------------------------------------------- Summary of changes: .../modeldefinitions/modelmappings.modelmap.xml | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/src/components/ogre/modeldefinitions/modelmappings.modelmap.xml b/src/components/ogre/modeldefinitions/modelmappings.modelmap.xml index 0545a47..bad347c 100644 --- a/src/components/ogre/modeldefinitions/modelmappings.modelmap.xml +++ b/src/components/ogre/modeldefinitions/modelmappings.modelmap.xml @@ -442,7 +442,6 @@ shovel - spade spade @@ -614,7 +613,6 @@ merchant mercenary marshall - butcher male @@ -799,7 +797,8 @@ bread - + + 0.8 bread_cut -- The Ember WorldForge client. From commit-messages at dark.worldforge.org Sat May 3 08:02:00 2008 From: commit-messages at dark.worldforge.org (commit-messages at dark.worldforge.org) Date: Sat, 3 May 2008 17:02:00 +0200 Subject: [WF-CVS] [WF media] r2516 - in trunk/resources: lexi_tools makelink Message-ID: <200805031502.m43F20Jk014329@rzcomm22.rz.tu-bs.de> Author: xrenmilay Date: Sat May 3 17:21:39 2008 New Revision: 2516 Log: added some tools that are really hard to find Added: trunk/resources/lexi_tools/ trunk/resources/lexi_tools/OgreLexiExportInstall_1.0.9.zip (contents, props changed) trunk/resources/lexi_tools/OgreLexiViewerInstall_1.0.7.msi (contents, props changed) Modified: trunk/resources/makelink/install.bat Added: trunk/resources/lexi_tools/OgreLexiExportInstall_1.0.9.zip ============================================================================== Binary file. No diff available. Added: trunk/resources/lexi_tools/OgreLexiViewerInstall_1.0.7.msi ============================================================================== Binary file. No diff available. Modified: trunk/resources/makelink/install.bat ============================================================================== --- trunk/resources/makelink/install.bat (original) +++ trunk/resources/makelink/install.bat Sat May 3 17:21:39 2008 @@ -1,3 +1,4 @@ - +if exist c:\svn makelink /d c:\svn md c:\wf_trunk -makelink c:\wf_trunk "F:\worldforge" +MakeLink.exe c:\wf_trunk "D:\trunk" + at echo Make sure to check that c:\svn is empty and delete it if it is. \ No newline at end of file From commit-messages at dark.worldforge.org Sat May 3 09:19:48 2008 From: commit-messages at dark.worldforge.org (commit-messages at dark.worldforge.org) Date: Sat, 3 May 2008 18:19:48 +0200 Subject: [WF-CVS] [WF media] r2517 - in trunk/3d_objects/containers: . barrel Message-ID: <200805031619.m43GJm7p021706@rzcomm22.rz.tu-bs.de> Author: xrenmilay Date: Sat May 3 18:39:23 2008 New Revision: 2517 Log: barrel stuff Added: trunk/3d_objects/containers/ trunk/3d_objects/containers/barrel/ trunk/3d_objects/containers/barrel/D.png (contents, props changed) trunk/3d_objects/containers/barrel/N.png (contents, props changed) trunk/3d_objects/containers/barrel/S.png (contents, props changed) trunk/3d_objects/containers/barrel/barrel.material trunk/3d_objects/containers/barrel/barrel.mesh (contents, props changed) Added: trunk/3d_objects/containers/barrel/D.png ============================================================================== Binary file. No diff available. Added: trunk/3d_objects/containers/barrel/N.png ============================================================================== Binary file. No diff available. Added: trunk/3d_objects/containers/barrel/S.png ============================================================================== Binary file. No diff available. Added: trunk/3d_objects/containers/barrel/barrel.material ============================================================================== --- (empty file) +++ trunk/3d_objects/containers/barrel/barrel.material Sat May 3 18:39:23 2008 @@ -0,0 +1,20 @@ + +material /global/container/barrel +{ + technique Default + { + pass Main + { + ambient 0.588 0.588 0.588 1 + specular 0.9 0.9 0.9 1 0.1 + + texture_unit + { + texture_alias diffuse + texture D.png -1 + } + } + + } + +} Added: trunk/3d_objects/containers/barrel/barrel.mesh ============================================================================== Binary file. No diff available. From commit-messages at dark.worldforge.org Sat May 3 09:21:51 2008 From: commit-messages at dark.worldforge.org (commit-messages at dark.worldforge.org) Date: Sat, 3 May 2008 18:21:51 +0200 Subject: [WF-CVS] [WF media] r2518 - trunk/art/3d_objects/items/containers/models/barrel Message-ID: <200805031621.m43GLptX021775@rzcomm22.rz.tu-bs.de> Author: xrenmilay Date: Sat May 3 18:41:41 2008 New Revision: 2518 Log: modified max added barrel psd Added: trunk/art/3d_objects/items/containers/models/barrel/barrel.psd (contents, props changed) Modified: trunk/art/3d_objects/items/containers/models/barrel/cylinder.max Added: trunk/art/3d_objects/items/containers/models/barrel/barrel.psd ============================================================================== Binary file. No diff available. Modified: trunk/art/3d_objects/items/containers/models/barrel/cylinder.max ============================================================================== Binary files trunk/art/3d_objects/items/containers/models/barrel/cylinder.max (original) and trunk/art/3d_objects/items/containers/models/barrel/cylinder.max Sat May 3 18:41:41 2008 differ From commit-messages at dark.worldforge.org Sat May 3 12:40:56 2008 From: commit-messages at dark.worldforge.org (commit-messages at dark.worldforge.org) Date: Sat, 3 May 2008 21:40:56 +0200 Subject: [WF-CVS] [WF media] r2519 - trunk/resources/maxscripts Message-ID: <200805031940.m43JeuF5008412@rzcomm22.rz.tu-bs.de> Author: xrenmilay Date: Sat May 3 21:59:11 2008 New Revision: 2519 Log: added some Max scripts Added: trunk/resources/maxscripts/ trunk/resources/maxscripts/install.bat trunk/resources/maxscripts/wfTools_16a.bmp (contents, props changed) trunk/resources/maxscripts/wfTools_16i.bmp (contents, props changed) trunk/resources/maxscripts/wfTools_24a.bmp (contents, props changed) trunk/resources/maxscripts/wfTools_24i.bmp (contents, props changed) trunk/resources/maxscripts/worldforgeTools.ms Added: trunk/resources/maxscripts/install.bat ============================================================================== --- (empty file) +++ trunk/resources/maxscripts/install.bat Sat May 3 21:59:11 2008 @@ -0,0 +1,11 @@ + +xcopy *.bmp "C:\Program Files\Autodesk\3ds Max 9\ui\Icons\" + + +xcopy worldforgeTools.ms "C:\Program Files\Autodesk\3ds Max 9\Scripts\" + + + +xcopy *.bmp "C:\Program Files\Autodesk\3dsMax8\UI\Icons\" + +xcopy worldforgeTools.ms "C:\Program Files\Autodesk\3dsMax8\Scripts\" \ No newline at end of file Added: trunk/resources/maxscripts/wfTools_16a.bmp ============================================================================== Binary file. No diff available. Added: trunk/resources/maxscripts/wfTools_16i.bmp ============================================================================== Binary file. No diff available. Added: trunk/resources/maxscripts/wfTools_24a.bmp ============================================================================== Binary file. No diff available. Added: trunk/resources/maxscripts/wfTools_24i.bmp ============================================================================== Binary file. No diff available. Added: trunk/resources/maxscripts/worldforgeTools.ms ============================================================================== --- (empty file) +++ trunk/resources/maxscripts/worldforgeTools.ms Sat May 3 21:59:11 2008 @@ -0,0 +1,88 @@ +--Cleaner Script For WF +macroScript WF_Cleaner + category:"WorldForge" + icon:#("wfTools",1) +( + local removeIdArray = #() --We declare this here to use in the et_removeIDs handler + --Export XML assumes this array exists so we declare it in order to not get an error + + if ((ExportPrep !=undefined) and (ExportPrep.isdisplayed)) do + (destroyDialog ExportPrep) + + rollout ExportPrep "Export Prep" + width:150 --height:440 + ( + --Create the rollout and name the buttons + + group "Utilities" + ( + button btn_ResXForm "Freeze Xfroms" --pos:[5,5] width:91 height:32 + button btn_resetTrans "Reset Postion" + button btn_AdjPivot "Adjust Pivot" + button btn_CurrentFolder "Current Folder" + button btn_cleanOBJ "Clean OBJ" + ) + + --Rest XForm and collapse stack + on btn_ResXForm pressed do + ( + if selection.count >= 1 then ( + ResetXForm $ + ResetXForm $ + collapsestack $ + ) + else (messageBox "Select an Object") + ) + -- move object to 0,0,0 + on btn_resetTrans pressed do + ( + if selection.count == 1 then ( + $.position = [0,0,0] + ) + else (messageBox "Please select a single mesh") + ) + + --open current working directory + on btn_CurrentFolder pressed do + ( + try (ShellLaunch (maxFilePath) "") + catch (messageBox "Save the scene before and try again") + ) + + + --modify pivot + on btn_AdjPivot pressed do + ( + case maxops.pivotmode of + ( + #none: maxops.pivotmode = #pivotonly + #pivotonly: maxops.pivotmode = #none + ) + ) + --Clean Obj + on btn_cleanOBJ pressed do + +( + if selection.count >= 1 then + ( + convertTo $ PolyMeshObject + subobjectLevel = 1 + modPanel.setCurrentObject $.baseObject + numFaces = $.EditablePoly.GetNumFaces() + + $.EditablePoly.SetSelection #Face #{1..numFaces} + $.autoSmoothThreshold = 180 + $.EditablePoly.autosmooth () + subobjectLevel = 0 + + ) + else (print "Select an object") +) + + + + + + )--end rollout + CreateDialog ExportPrep +) \ No newline at end of file From commit-messages at dark.worldforge.org Sat May 3 15:02:46 2008 From: commit-messages at dark.worldforge.org (commit-messages at dark.worldforge.org) Date: Sun, 4 May 2008 00:02:46 +0200 Subject: [WF-CVS] [WF media] r2520 - in trunk/art/3d_objects: containers containers/models containers/models/barrel containers/textures items/containers Message-ID: <200805032202.m43M2k0b022224@rzcomm22.rz.tu-bs.de> Author: xrenmilay Date: Sun May 4 00:22:19 2008 New Revision: 2520 Log: moved containers Added: trunk/art/3d_objects/containers/ - copied from r2425, /trunk/art/3d_objects/items/containers/ trunk/art/3d_objects/containers/models/ - copied from r2519, /trunk/art/3d_objects/items/containers/models/ trunk/art/3d_objects/containers/textures/ - copied from r2519, /trunk/art/3d_objects/items/containers/textures/ Removed: trunk/art/3d_objects/items/containers/ Modified: trunk/art/3d_objects/containers/models/barrel/cylinder.max Modified: trunk/art/3d_objects/containers/models/barrel/cylinder.max ============================================================================== Binary files /trunk/art/3d_objects/items/containers/models/barrel/cylinder.max (original) and trunk/art/3d_objects/containers/models/barrel/cylinder.max Sun May 4 00:22:19 2008 differ From commit-messages at dark.worldforge.org Sat May 3 15:09:03 2008 From: commit-messages at dark.worldforge.org (commit-messages at dark.worldforge.org) Date: Sun, 4 May 2008 00:09:03 +0200 Subject: [WF-CVS] [WF media] r2521 - in trunk/art/3d_objects/containers: models/barrel models/bottle models/earthenware models/open_crate models/template models/tinderbox textures/bottle_vodka textures/craftsman_wood textures/earthenware textures/template textures/tinderbox textures/wood_boards Message-ID: <200805032209.m43M933L023077@rzcomm22.rz.tu-bs.de> Author: xrenmilay Date: Sun May 4 00:30:01 2008 New Revision: 2521 Log: simplifying directory structure Added: trunk/art/3d_objects/containers/models/barrel/cylinder.psp - copied unchanged from r2520, /trunk/art/3d_objects/containers/textures/wood_boards/cylinder.psp trunk/art/3d_objects/containers/models/barrel/cylinder_wood_boards_barrel_preview_01.jpg - copied unchanged from r2520, /trunk/art/3d_objects/containers/textures/wood_boards/cylinder_wood_boards_barrel_preview_01.jpg trunk/art/3d_objects/containers/models/barrel/cylinder_wood_boards_bottle_preview_01.jpg - copied unchanged from r2520, /trunk/art/3d_objects/containers/textures/wood_boards/cylinder_wood_boards_bottle_preview_01.jpg trunk/art/3d_objects/containers/models/bottle/vodka1_512.psd - copied unchanged from r2520, /trunk/art/3d_objects/containers/textures/bottle_vodka/vodka1_512.psd trunk/art/3d_objects/containers/models/earthenware/ - copied from r2520, /trunk/art/3d_objects/containers/textures/earthenware/ trunk/art/3d_objects/containers/models/open_crate/box.psp - copied unchanged from r2520, /trunk/art/3d_objects/containers/textures/tinderbox/box.psp trunk/art/3d_objects/containers/models/open_crate/box_template.psp - copied unchanged from r2520, /trunk/art/3d_objects/containers/textures/tinderbox/box_template.psp trunk/art/3d_objects/containers/models/template/ - copied from r2520, /trunk/art/3d_objects/containers/textures/template/ trunk/art/3d_objects/containers/models/tinderbox/authors.txt - copied unchanged from r2520, /trunk/art/3d_objects/containers/textures/craftsman_wood/authors.txt trunk/art/3d_objects/containers/models/tinderbox/box.psp - copied unchanged from r2520, /trunk/art/3d_objects/containers/textures/tinderbox/box.psp trunk/art/3d_objects/containers/models/tinderbox/box_craftsman_wood.psd - copied unchanged from r2520, /trunk/art/3d_objects/containers/textures/craftsman_wood/box_craftsman_wood.psd trunk/art/3d_objects/containers/models/tinderbox/box_template.psp - copied unchanged from r2520, /trunk/art/3d_objects/containers/textures/tinderbox/box_template.psp trunk/art/3d_objects/containers/models/tinderbox/tinderbox.wrl - copied unchanged from r2520, /trunk/art/3d_objects/containers/textures/tinderbox/tinderbox.wrl trunk/art/3d_objects/containers/models/tinderbox/tinderboxD.tif - copied unchanged from r2520, /trunk/art/3d_objects/containers/textures/tinderbox/tinderboxD.tif trunk/art/3d_objects/containers/models/tinderbox/tinderboxN.tif - copied unchanged from r2520, /trunk/art/3d_objects/containers/textures/tinderbox/tinderboxN.tif trunk/art/3d_objects/containers/models/tinderbox/tinderboxS.tif - copied unchanged from r2520, /trunk/art/3d_objects/containers/textures/tinderbox/tinderboxS.tif Removed: trunk/art/3d_objects/containers/textures/bottle_vodka/vodka1_512.psd trunk/art/3d_objects/containers/textures/craftsman_wood/authors.txt trunk/art/3d_objects/containers/textures/craftsman_wood/box_craftsman_wood.psd trunk/art/3d_objects/containers/textures/earthenware/ trunk/art/3d_objects/containers/textures/template/ trunk/art/3d_objects/containers/textures/tinderbox/box.psp trunk/art/3d_objects/containers/textures/tinderbox/box_template.psp trunk/art/3d_objects/containers/textures/tinderbox/tinderbox.wrl trunk/art/3d_objects/containers/textures/tinderbox/tinderboxD.tif trunk/art/3d_objects/containers/textures/tinderbox/tinderboxN.tif trunk/art/3d_objects/containers/textures/tinderbox/tinderboxS.tif trunk/art/3d_objects/containers/textures/wood_boards/cylinder.psp trunk/art/3d_objects/containers/textures/wood_boards/cylinder_wood_boards_barrel_preview_01.jpg trunk/art/3d_objects/containers/textures/wood_boards/cylinder_wood_boards_bottle_preview_01.jpg From commit-messages at dark.worldforge.org Sat May 3 15:18:30 2008 From: commit-messages at dark.worldforge.org (commit-messages at dark.worldforge.org) Date: Sun, 4 May 2008 00:18:30 +0200 Subject: [WF-CVS] [WF media] r2522 - in trunk/art/3d_objects/plants/fruit: models/acorn models/apple models/asparagus models/avacdo models/beans models/beet models/bell_pepper models/carrot models/celery models/cucumber models/garlic models/greenpeas models/horseradish models/hot_pepper models/melon models/mushrooms models/pear models/pumkin models/radish models/squash models/template models/tomato models/watermelon textures Message-ID: <200805032218.m43MIUql023995@rzcomm22.rz.tu-bs.de> Author: xrenmilay Date: Sun May 4 00:39:30 2008 New Revision: 2522 Log: simplifying directory structure Added: trunk/art/3d_objects/plants/fruit/models/acorn/acornD.psd - copied unchanged from r2521, /trunk/art/3d_objects/plants/fruit/textures/acorn/acornD.psd trunk/art/3d_objects/plants/fruit/models/acorn/acornN.psd - copied unchanged from r2521, /trunk/art/3d_objects/plants/fruit/textures/acorn/acornN.psd trunk/art/3d_objects/plants/fruit/models/acorn/acornS.psd - copied unchanged from r2521, /trunk/art/3d_objects/plants/fruit/textures/acorn/acornS.psd trunk/art/3d_objects/plants/fruit/models/apple/authors.txt - copied unchanged from r2521, /trunk/art/3d_objects/plants/fruit/textures/apple/authors.txt trunk/art/3d_objects/plants/fruit/models/apple/fruitable.png - copied unchanged from r2521, /trunk/art/3d_objects/plants/fruit/textures/apple/fruitable.png trunk/art/3d_objects/plants/fruit/models/asparagus/asparagus.jpg - copied unchanged from r2521, /trunk/art/3d_objects/plants/fruit/textures/asparagus/asparagus.jpg trunk/art/3d_objects/plants/fruit/models/asparagus/asparagus.url - copied unchanged from r2521, /trunk/art/3d_objects/plants/fruit/textures/asparagus/asparagus.url trunk/art/3d_objects/plants/fruit/models/avacdo/avocado.jpg - copied unchanged from r2521, /trunk/art/3d_objects/plants/fruit/textures/avocado/avocado.jpg trunk/art/3d_objects/plants/fruit/models/avacdo/avocado.url - copied unchanged from r2521, /trunk/art/3d_objects/plants/fruit/textures/avocado/avocado.url trunk/art/3d_objects/plants/fruit/models/beans/green beans.url - copied unchanged from r2521, /trunk/art/3d_objects/plants/fruit/textures/beans/green beans.url trunk/art/3d_objects/plants/fruit/models/beans/template.jpg - copied unchanged from r2521, /trunk/art/3d_objects/plants/fruit/textures/beans/template.jpg trunk/art/3d_objects/plants/fruit/models/beet/authors.txt - copied unchanged from r2521, /trunk/art/3d_objects/plants/fruit/textures/beet/authors.txt trunk/art/3d_objects/plants/fruit/models/beet/beetD.tif - copied unchanged from r2521, /trunk/art/3d_objects/plants/fruit/textures/beet/beetD.tif trunk/art/3d_objects/plants/fruit/models/beet/beetN.tif - copied unchanged from r2521, /trunk/art/3d_objects/plants/fruit/textures/beet/beetN.tif trunk/art/3d_objects/plants/fruit/models/beet/beetS.tif - copied unchanged from r2521, /trunk/art/3d_objects/plants/fruit/textures/beet/beetS.tif trunk/art/3d_objects/plants/fruit/models/beet/beetT.tif - copied unchanged from r2521, /trunk/art/3d_objects/plants/fruit/textures/beet/beetT.tif trunk/art/3d_objects/plants/fruit/models/beet/fruitable.psp - copied unchanged from r2521, /trunk/art/3d_objects/plants/fruit/textures/beet/fruitable.psp trunk/art/3d_objects/plants/fruit/models/beet/readme.txt - copied unchanged from r2521, /trunk/art/3d_objects/plants/fruit/textures/beet/readme.txt trunk/art/3d_objects/plants/fruit/models/bell_pepper/bell_pepper.jpg - copied unchanged from r2521, /trunk/art/3d_objects/plants/fruit/textures/bell_pepper/bell_pepper.jpg trunk/art/3d_objects/plants/fruit/models/bell_pepper/bell_pepper.url - copied unchanged from r2521, /trunk/art/3d_objects/plants/fruit/textures/bell_pepper/bell_pepper.url trunk/art/3d_objects/plants/fruit/models/carrot/authors.txt - copied unchanged from r2521, /trunk/art/3d_objects/plants/fruit/textures/carrot/authors.txt trunk/art/3d_objects/plants/fruit/models/carrot/carrotD.psd - copied unchanged from r2521, /trunk/art/3d_objects/plants/fruit/textures/carrot/carrotD.psd trunk/art/3d_objects/plants/fruit/models/carrot/carrotN.psd - copied unchanged from r2521, /trunk/art/3d_objects/plants/fruit/textures/carrot/carrotN.psd trunk/art/3d_objects/plants/fruit/models/carrot/carrotS.psd - copied unchanged from r2521, /trunk/art/3d_objects/plants/fruit/textures/carrot/carrotS.psd trunk/art/3d_objects/plants/fruit/models/carrot/carrot_leaf_ref.psd - copied unchanged from r2521, /trunk/art/3d_objects/plants/fruit/textures/carrot/carrot_leaf_ref.psd trunk/art/3d_objects/plants/fruit/models/carrot/fruitable.psp - copied unchanged from r2521, /trunk/art/3d_objects/plants/fruit/textures/carrot/fruitable.psp trunk/art/3d_objects/plants/fruit/models/celery/celery.jpg - copied unchanged from r2521, /trunk/art/3d_objects/plants/fruit/textures/celery/celery.jpg trunk/art/3d_objects/plants/fruit/models/celery/celery.url - copied unchanged from r2521, /trunk/art/3d_objects/plants/fruit/textures/celery/celery.url trunk/art/3d_objects/plants/fruit/models/cucumber/cucumber.jpg - copied unchanged from r2521, /trunk/art/3d_objects/plants/fruit/textures/cucumber/cucumber.jpg trunk/art/3d_objects/plants/fruit/models/cucumber/cucumber.url - copied unchanged from r2521, /trunk/art/3d_objects/plants/fruit/textures/cucumber/cucumber.url trunk/art/3d_objects/plants/fruit/models/garlic/garlic.url - copied unchanged from r2521, /trunk/art/3d_objects/plants/fruit/textures/garlic/garlic.url trunk/art/3d_objects/plants/fruit/models/garlic/template.jpg - copied unchanged from r2521, /trunk/art/3d_objects/plants/fruit/textures/garlic/template.jpg trunk/art/3d_objects/plants/fruit/models/greenpeas/greenpeas.jpg - copied unchanged from r2521, /trunk/art/3d_objects/plants/fruit/textures/greenpeas/greenpeas.jpg trunk/art/3d_objects/plants/fruit/models/greenpeas/peas.url - copied unchanged from r2521, /trunk/art/3d_objects/plants/fruit/textures/greenpeas/peas.url trunk/art/3d_objects/plants/fruit/models/horseradish/horseradish.jpg - copied unchanged from r2521, /trunk/art/3d_objects/plants/fruit/textures/horseradish/horseradish.jpg trunk/art/3d_objects/plants/fruit/models/horseradish/horseradish.url - copied unchanged from r2521, /trunk/art/3d_objects/plants/fruit/textures/horseradish/horseradish.url trunk/art/3d_objects/plants/fruit/models/hot_pepper/hot_peppers.url - copied unchanged from r2521, /trunk/art/3d_objects/plants/fruit/textures/hot_pepper/hot_peppers.url trunk/art/3d_objects/plants/fruit/models/hot_pepper/hotpeppers.jpg - copied unchanged from r2521, /trunk/art/3d_objects/plants/fruit/textures/hot_pepper/hotpeppers.jpg trunk/art/3d_objects/plants/fruit/models/melon/melon.jpg - copied unchanged from r2521, /trunk/art/3d_objects/plants/fruit/textures/melon/melon.jpg trunk/art/3d_objects/plants/fruit/models/melon/melon.url - copied unchanged from r2521, /trunk/art/3d_objects/plants/fruit/textures/melon/melon.url trunk/art/3d_objects/plants/fruit/models/mushrooms/authors.txt - copied unchanged from r2521, /trunk/art/3d_objects/plants/fruit/textures/mushrooms/authors.txt trunk/art/3d_objects/plants/fruit/models/mushrooms/brown_mushroom_preview.jpg - copied unchanged from r2521, /trunk/art/3d_objects/plants/fruit/textures/mushrooms/brown_mushroom_preview.jpg trunk/art/3d_objects/plants/fruit/models/mushrooms/mushroom.png - copied unchanged from r2521, /trunk/art/3d_objects/plants/fruit/textures/mushrooms/mushroom.png trunk/art/3d_objects/plants/fruit/models/mushrooms/mushroom.psp - copied unchanged from r2521, /trunk/art/3d_objects/plants/fruit/textures/mushrooms/mushroom.psp trunk/art/3d_objects/plants/fruit/models/mushrooms/mushroom_silkfoot_hh.psp - copied unchanged from r2521, /trunk/art/3d_objects/plants/fruit/textures/mushrooms/mushroom_silkfoot_hh.psp trunk/art/3d_objects/plants/fruit/models/mushrooms/mushroom_silkfoot_mature_hh.psp - copied unchanged from r2521, /trunk/art/3d_objects/plants/fruit/textures/mushrooms/mushroom_silkfoot_mature_hh.psp trunk/art/3d_objects/plants/fruit/models/mushrooms/pointy_amanita_preview.jpg - copied unchanged from r2521, /trunk/art/3d_objects/plants/fruit/textures/mushrooms/pointy_amanita_preview.jpg trunk/art/3d_objects/plants/fruit/models/mushrooms/pointy_silkfoot_bottom_preview.jpg - copied unchanged from r2521, /trunk/art/3d_objects/plants/fruit/textures/mushrooms/pointy_silkfoot_bottom_preview.jpg trunk/art/3d_objects/plants/fruit/models/mushrooms/pointy_silkfoot_top_preview.jpg - copied unchanged from r2521, /trunk/art/3d_objects/plants/fruit/textures/mushrooms/pointy_silkfoot_top_preview.jpg trunk/art/3d_objects/plants/fruit/models/mushrooms/round_amanita_preview.jpg - copied unchanged from r2521, /trunk/art/3d_objects/plants/fruit/textures/mushrooms/round_amanita_preview.jpg trunk/art/3d_objects/plants/fruit/models/mushrooms/silkfoot_bottom_preview.jpg - copied unchanged from r2521, /trunk/art/3d_objects/plants/fruit/textures/mushrooms/silkfoot_bottom_preview.jpg trunk/art/3d_objects/plants/fruit/models/mushrooms/silkfoot_top_preview.jpg - copied unchanged from r2521, /trunk/art/3d_objects/plants/fruit/textures/mushrooms/silkfoot_top_preview.jpg trunk/art/3d_objects/plants/fruit/models/pear/pear.jpg - copied unchanged from r2521, /trunk/art/3d_objects/plants/fruit/textures/pear/pear.jpg trunk/art/3d_objects/plants/fruit/models/pear/pear.url - copied unchanged from r2521, /trunk/art/3d_objects/plants/fruit/textures/pear/pear.url trunk/art/3d_objects/plants/fruit/models/pumkin/pumpkin.jpg - copied unchanged from r2521, /trunk/art/3d_objects/plants/fruit/textures/pumpkin/pumpkin.jpg trunk/art/3d_objects/plants/fruit/models/pumkin/pumpkin.url - copied unchanged from r2521, /trunk/art/3d_objects/plants/fruit/textures/pumpkin/pumpkin.url trunk/art/3d_objects/plants/fruit/models/radish/radish.jpg - copied unchanged from r2521, /trunk/art/3d_objects/plants/fruit/textures/radish/radish.jpg trunk/art/3d_objects/plants/fruit/models/radish/radish.url - copied unchanged from r2521, /trunk/art/3d_objects/plants/fruit/textures/radish/radish.url trunk/art/3d_objects/plants/fruit/models/squash/squash.jpg - copied unchanged from r2521, /trunk/art/3d_objects/plants/fruit/textures/squash/squash.jpg trunk/art/3d_objects/plants/fruit/models/squash/squash.url - copied unchanged from r2521, /trunk/art/3d_objects/plants/fruit/textures/squash/squash.url trunk/art/3d_objects/plants/fruit/models/template/ - copied from r2521, /trunk/art/3d_objects/plants/fruit/textures/template/ trunk/art/3d_objects/plants/fruit/models/tomato/tomato.jpg - copied unchanged from r2521, /trunk/art/3d_objects/plants/fruit/textures/tomato/tomato.jpg trunk/art/3d_objects/plants/fruit/models/tomato/tomato.url - copied unchanged from r2521, /trunk/art/3d_objects/plants/fruit/textures/tomato/tomato.url trunk/art/3d_objects/plants/fruit/models/watermelon/watermelon.jpg - copied unchanged from r2521, /trunk/art/3d_objects/plants/fruit/textures/watermelon/watermelon.jpg trunk/art/3d_objects/plants/fruit/models/watermelon/watermelon.url - copied unchanged from r2521, /trunk/art/3d_objects/plants/fruit/textures/watermelon/watermelon.url Removed: trunk/art/3d_objects/plants/fruit/textures/ From commit-messages at dark.worldforge.org Sat May 3 15:30:09 2008 From: commit-messages at dark.worldforge.org (commit-messages at dark.worldforge.org) Date: Sun, 4 May 2008 00:30:09 +0200 Subject: [WF-CVS] [WF media] r2523 - in trunk/art/3d_objects/plants/fruit: acorn apple asparagus avacdo beans beet bell_pepper carrot celery cucumber garlic greenpeas horseradish hot_pepper melon models/acorn models/apple models/asparagus models/avacdo models/beans models/beet models/bell_pepper models/carrot models/celery models/cucumber models/garlic models/greenpeas models/horseradish models/hot_pepper models/melon models/mushrooms models/pear models/pumkin models/radish models/squash models/template models/tomato models/watermelon mushrooms pear pumkin radish squash template tomato watermelon Message-ID: <200805032230.m43MU9I9024960@rzcomm22.rz.tu-bs.de> Author: xrenmilay Date: Sun May 4 00:51:08 2008 New Revision: 2523 Log: simplifying directory structure Added: trunk/art/3d_objects/plants/fruit/acorn/ - copied from r2521, /trunk/art/3d_objects/plants/fruit/models/acorn/ trunk/art/3d_objects/plants/fruit/acorn/acorn.wrl - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/acorn/acorn.wrl trunk/art/3d_objects/plants/fruit/acorn/acornD.psd - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/acorn/acornD.psd trunk/art/3d_objects/plants/fruit/acorn/acornN.psd - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/acorn/acornN.psd trunk/art/3d_objects/plants/fruit/acorn/acornS.psd - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/acorn/acornS.psd trunk/art/3d_objects/plants/fruit/acorn/acorn_LP.wrl - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/acorn/acorn_LP.wrl trunk/art/3d_objects/plants/fruit/acorn/acron.blend - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/acorn/acron.blend trunk/art/3d_objects/plants/fruit/acorn/acron.mtl - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/acorn/acron.mtl trunk/art/3d_objects/plants/fruit/acorn/acron.obj - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/acorn/acron.obj trunk/art/3d_objects/plants/fruit/acorn/fruitable.3ds - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/acorn/fruitable.3ds trunk/art/3d_objects/plants/fruit/acorn/fruitable.wrl - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/acorn/fruitable.wrl trunk/art/3d_objects/plants/fruit/acorn/fruitable_LP.3ds - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/acorn/fruitable_LP.3ds trunk/art/3d_objects/plants/fruit/acorn/fruitable_LP.wrl - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/acorn/fruitable_LP.wrl trunk/art/3d_objects/plants/fruit/acorn/leafy_round_rooth_growth.wrl - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/acorn/leafy_round_rooth_growth.wrl trunk/art/3d_objects/plants/fruit/apple/ - copied from r2521, /trunk/art/3d_objects/plants/fruit/models/apple/ trunk/art/3d_objects/plants/fruit/apple/authors.txt - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/apple/authors.txt trunk/art/3d_objects/plants/fruit/apple/fruitable.png - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/apple/fruitable.png trunk/art/3d_objects/plants/fruit/asparagus/ - copied from r2521, /trunk/art/3d_objects/plants/fruit/models/asparagus/ trunk/art/3d_objects/plants/fruit/asparagus/asparagus.jpg - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/asparagus/asparagus.jpg trunk/art/3d_objects/plants/fruit/asparagus/asparagus.url - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/asparagus/asparagus.url trunk/art/3d_objects/plants/fruit/avacdo/ - copied from r2521, /trunk/art/3d_objects/plants/fruit/models/avacdo/ trunk/art/3d_objects/plants/fruit/avacdo/avocado.jpg - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/avacdo/avocado.jpg trunk/art/3d_objects/plants/fruit/avacdo/avocado.url - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/avacdo/avocado.url trunk/art/3d_objects/plants/fruit/beans/ - copied from r2521, /trunk/art/3d_objects/plants/fruit/models/beans/ trunk/art/3d_objects/plants/fruit/beans/green beans.url - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/beans/green beans.url trunk/art/3d_objects/plants/fruit/beans/template.jpg - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/beans/template.jpg trunk/art/3d_objects/plants/fruit/beet/ - copied from r2521, /trunk/art/3d_objects/plants/fruit/models/beet/ trunk/art/3d_objects/plants/fruit/beet/authors.txt - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/beet/authors.txt trunk/art/3d_objects/plants/fruit/beet/beet.blend - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/beet/beet.blend trunk/art/3d_objects/plants/fruit/beet/beet.mtl - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/beet/beet.mtl trunk/art/3d_objects/plants/fruit/beet/beet.obj - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/beet/beet.obj trunk/art/3d_objects/plants/fruit/beet/beet.xsi - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/beet/beet.xsi trunk/art/3d_objects/plants/fruit/beet/beetD.tif - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/beet/beetD.tif trunk/art/3d_objects/plants/fruit/beet/beetN.tif - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/beet/beetN.tif trunk/art/3d_objects/plants/fruit/beet/beetS.tif - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/beet/beetS.tif trunk/art/3d_objects/plants/fruit/beet/beetT.tif - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/beet/beetT.tif trunk/art/3d_objects/plants/fruit/beet/fruitable.max - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/beet/fruitable.max trunk/art/3d_objects/plants/fruit/beet/fruitable.psp - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/beet/fruitable.psp trunk/art/3d_objects/plants/fruit/beet/leafy_round_rooth_growth.3ds - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/beet/leafy_round_rooth_growth.3ds trunk/art/3d_objects/plants/fruit/beet/leafy_round_rooth_growth.wrl - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/beet/leafy_round_rooth_growth.wrl trunk/art/3d_objects/plants/fruit/beet/readme.txt - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/beet/readme.txt trunk/art/3d_objects/plants/fruit/bell_pepper/ - copied from r2521, /trunk/art/3d_objects/plants/fruit/models/bell_pepper/ trunk/art/3d_objects/plants/fruit/bell_pepper/bell_pepper.jpg - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/bell_pepper/bell_pepper.jpg trunk/art/3d_objects/plants/fruit/bell_pepper/bell_pepper.url - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/bell_pepper/bell_pepper.url trunk/art/3d_objects/plants/fruit/carrot/ - copied from r2521, /trunk/art/3d_objects/plants/fruit/models/carrot/ trunk/art/3d_objects/plants/fruit/carrot/authors.txt - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/carrot/authors.txt trunk/art/3d_objects/plants/fruit/carrot/carrot.blend - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/carrot/carrot.blend trunk/art/3d_objects/plants/fruit/carrot/carrot.mtl - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/carrot/carrot.mtl trunk/art/3d_objects/plants/fruit/carrot/carrot.obj - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/carrot/carrot.obj trunk/art/3d_objects/plants/fruit/carrot/carrot.xsi - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/carrot/carrot.xsi trunk/art/3d_objects/plants/fruit/carrot/carrotD.psd - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/carrot/carrotD.psd trunk/art/3d_objects/plants/fruit/carrot/carrotN.psd - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/carrot/carrotN.psd trunk/art/3d_objects/plants/fruit/carrot/carrotS.psd - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/carrot/carrotS.psd trunk/art/3d_objects/plants/fruit/carrot/carrot_leaf_ref.psd - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/carrot/carrot_leaf_ref.psd trunk/art/3d_objects/plants/fruit/carrot/fruitable.psp - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/carrot/fruitable.psp trunk/art/3d_objects/plants/fruit/carrot/leafy_long_rooth_growth.3ds - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/carrot/leafy_long_rooth_growth.3ds trunk/art/3d_objects/plants/fruit/carrot/leafy_long_rooth_growth.max - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/carrot/leafy_long_rooth_growth.max trunk/art/3d_objects/plants/fruit/carrot/leafy_long_rooth_growth.wrl - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/carrot/leafy_long_rooth_growth.wrl trunk/art/3d_objects/plants/fruit/carrot/leafy_round_rooth_growth.wrl - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/carrot/leafy_round_rooth_growth.wrl trunk/art/3d_objects/plants/fruit/celery/ - copied from r2521, /trunk/art/3d_objects/plants/fruit/models/celery/ trunk/art/3d_objects/plants/fruit/celery/celery.jpg - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/celery/celery.jpg trunk/art/3d_objects/plants/fruit/celery/celery.url - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/celery/celery.url trunk/art/3d_objects/plants/fruit/cucumber/ - copied from r2521, /trunk/art/3d_objects/plants/fruit/models/cucumber/ trunk/art/3d_objects/plants/fruit/cucumber/cucumber.jpg - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/cucumber/cucumber.jpg trunk/art/3d_objects/plants/fruit/cucumber/cucumber.url - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/cucumber/cucumber.url trunk/art/3d_objects/plants/fruit/garlic/ - copied from r2521, /trunk/art/3d_objects/plants/fruit/models/garlic/ trunk/art/3d_objects/plants/fruit/garlic/garlic.url - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/garlic/garlic.url trunk/art/3d_objects/plants/fruit/garlic/template.jpg - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/garlic/template.jpg trunk/art/3d_objects/plants/fruit/greenpeas/ - copied from r2521, /trunk/art/3d_objects/plants/fruit/models/greenpeas/ trunk/art/3d_objects/plants/fruit/greenpeas/greenpeas.jpg - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/greenpeas/greenpeas.jpg trunk/art/3d_objects/plants/fruit/greenpeas/peas.url - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/greenpeas/peas.url trunk/art/3d_objects/plants/fruit/horseradish/ - copied from r2521, /trunk/art/3d_objects/plants/fruit/models/horseradish/ trunk/art/3d_objects/plants/fruit/horseradish/horseradish.jpg - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/horseradish/horseradish.jpg trunk/art/3d_objects/plants/fruit/horseradish/horseradish.url - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/horseradish/horseradish.url trunk/art/3d_objects/plants/fruit/hot_pepper/ - copied from r2521, /trunk/art/3d_objects/plants/fruit/models/hot_pepper/ trunk/art/3d_objects/plants/fruit/hot_pepper/hot_peppers.url - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/hot_pepper/hot_peppers.url trunk/art/3d_objects/plants/fruit/hot_pepper/hotpeppers.jpg - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/hot_pepper/hotpeppers.jpg trunk/art/3d_objects/plants/fruit/melon/ - copied from r2521, /trunk/art/3d_objects/plants/fruit/models/melon/ trunk/art/3d_objects/plants/fruit/melon/melon.jpg - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/melon/melon.jpg trunk/art/3d_objects/plants/fruit/melon/melon.url - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/melon/melon.url trunk/art/3d_objects/plants/fruit/mushrooms/ - copied from r2521, /trunk/art/3d_objects/plants/fruit/models/mushrooms/ trunk/art/3d_objects/plants/fruit/mushrooms/authors.txt - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/mushrooms/authors.txt trunk/art/3d_objects/plants/fruit/mushrooms/brown_mushroom_preview.jpg - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/mushrooms/brown_mushroom_preview.jpg trunk/art/3d_objects/plants/fruit/mushrooms/mushroom.3ds - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/mushrooms/mushroom.3ds trunk/art/3d_objects/plants/fruit/mushrooms/mushroom.png - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/mushrooms/mushroom.png trunk/art/3d_objects/plants/fruit/mushrooms/mushroom.psp - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/mushrooms/mushroom.psp trunk/art/3d_objects/plants/fruit/mushrooms/mushroom_round.xsi - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/mushrooms/mushroom_round.xsi trunk/art/3d_objects/plants/fruit/mushrooms/mushroom_silkfoot_hh.psp - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/mushrooms/mushroom_silkfoot_hh.psp trunk/art/3d_objects/plants/fruit/mushrooms/mushroom_silkfoot_mature_hh.psp - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/mushrooms/mushroom_silkfoot_mature_hh.psp trunk/art/3d_objects/plants/fruit/mushrooms/pointy_amanita_preview.jpg - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/mushrooms/pointy_amanita_preview.jpg trunk/art/3d_objects/plants/fruit/mushrooms/pointy_hatted_mushroom.3dc - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/mushrooms/pointy_hatted_mushroom.3dc trunk/art/3d_objects/plants/fruit/mushrooms/pointy_hatted_mushroom.wrl - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/mushrooms/pointy_hatted_mushroom.wrl trunk/art/3d_objects/plants/fruit/mushrooms/pointy_hatted_mushroom__alt.3dc - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/mushrooms/pointy_hatted_mushroom__alt.3dc trunk/art/3d_objects/plants/fruit/mushrooms/pointy_silkfoot_bottom_preview.jpg - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/mushrooms/pointy_silkfoot_bottom_preview.jpg trunk/art/3d_objects/plants/fruit/mushrooms/pointy_silkfoot_top_preview.jpg - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/mushrooms/pointy_silkfoot_top_preview.jpg trunk/art/3d_objects/plants/fruit/mushrooms/round_amanita_preview.jpg - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/mushrooms/round_amanita_preview.jpg trunk/art/3d_objects/plants/fruit/mushrooms/round_mshroom.wrl - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/mushrooms/round_mshroom.wrl trunk/art/3d_objects/plants/fruit/mushrooms/round_mushroom.blend - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/mushrooms/round_mushroom.blend trunk/art/3d_objects/plants/fruit/mushrooms/round_mushroom.max - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/mushrooms/round_mushroom.max trunk/art/3d_objects/plants/fruit/mushrooms/round_mushroom.mtl - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/mushrooms/round_mushroom.mtl trunk/art/3d_objects/plants/fruit/mushrooms/round_mushroom.obj - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/mushrooms/round_mushroom.obj trunk/art/3d_objects/plants/fruit/mushrooms/silkfoot_bottom_preview.jpg - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/mushrooms/silkfoot_bottom_preview.jpg trunk/art/3d_objects/plants/fruit/mushrooms/silkfoot_top_preview.jpg - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/mushrooms/silkfoot_top_preview.jpg trunk/art/3d_objects/plants/fruit/pear/ - copied from r2521, /trunk/art/3d_objects/plants/fruit/models/pear/ trunk/art/3d_objects/plants/fruit/pear/pear.jpg - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/pear/pear.jpg trunk/art/3d_objects/plants/fruit/pear/pear.url - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/pear/pear.url trunk/art/3d_objects/plants/fruit/pumkin/ - copied from r2521, /trunk/art/3d_objects/plants/fruit/models/pumkin/ trunk/art/3d_objects/plants/fruit/pumkin/pumpkin.jpg - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/pumkin/pumpkin.jpg trunk/art/3d_objects/plants/fruit/pumkin/pumpkin.url - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/pumkin/pumpkin.url trunk/art/3d_objects/plants/fruit/radish/ - copied from r2521, /trunk/art/3d_objects/plants/fruit/models/radish/ trunk/art/3d_objects/plants/fruit/radish/radish.jpg - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/radish/radish.jpg trunk/art/3d_objects/plants/fruit/radish/radish.url - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/radish/radish.url trunk/art/3d_objects/plants/fruit/squash/ - copied from r2521, /trunk/art/3d_objects/plants/fruit/models/squash/ trunk/art/3d_objects/plants/fruit/squash/squash.jpg - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/squash/squash.jpg trunk/art/3d_objects/plants/fruit/squash/squash.url - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/squash/squash.url trunk/art/3d_objects/plants/fruit/template/ - copied from r2522, /trunk/art/3d_objects/plants/fruit/models/template/ trunk/art/3d_objects/plants/fruit/tomato/ - copied from r2521, /trunk/art/3d_objects/plants/fruit/models/tomato/ trunk/art/3d_objects/plants/fruit/tomato/tomato.jpg - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/tomato/tomato.jpg trunk/art/3d_objects/plants/fruit/tomato/tomato.url - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/tomato/tomato.url trunk/art/3d_objects/plants/fruit/watermelon/ - copied from r2521, /trunk/art/3d_objects/plants/fruit/models/watermelon/ trunk/art/3d_objects/plants/fruit/watermelon/watermelon.jpg - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/watermelon/watermelon.jpg trunk/art/3d_objects/plants/fruit/watermelon/watermelon.url - copied unchanged from r2522, /trunk/art/3d_objects/plants/fruit/models/watermelon/watermelon.url Removed: trunk/art/3d_objects/plants/fruit/models/acorn/ trunk/art/3d_objects/plants/fruit/models/apple/ trunk/art/3d_objects/plants/fruit/models/asparagus/ trunk/art/3d_objects/plants/fruit/models/avacdo/ trunk/art/3d_objects/plants/fruit/models/beans/ trunk/art/3d_objects/plants/fruit/models/beet/ trunk/art/3d_objects/plants/fruit/models/bell_pepper/ trunk/art/3d_objects/plants/fruit/models/carrot/ trunk/art/3d_objects/plants/fruit/models/celery/ trunk/art/3d_objects/plants/fruit/models/cucumber/ trunk/art/3d_objects/plants/fruit/models/garlic/ trunk/art/3d_objects/plants/fruit/models/greenpeas/ trunk/art/3d_objects/plants/fruit/models/horseradish/ trunk/art/3d_objects/plants/fruit/models/hot_pepper/ trunk/art/3d_objects/plants/fruit/models/melon/ trunk/art/3d_objects/plants/fruit/models/mushrooms/ trunk/art/3d_objects/plants/fruit/models/pear/ trunk/art/3d_objects/plants/fruit/models/pumkin/ trunk/art/3d_objects/plants/fruit/models/radish/ trunk/art/3d_objects/plants/fruit/models/squash/ trunk/art/3d_objects/plants/fruit/models/template/ trunk/art/3d_objects/plants/fruit/models/tomato/ trunk/art/3d_objects/plants/fruit/models/watermelon/ From commit-messages at dark.worldforge.org Sat May 3 15:35:36 2008 From: commit-messages at dark.worldforge.org (commit-messages at dark.worldforge.org) Date: Sun, 4 May 2008 00:35:36 +0200 Subject: [WF-CVS] [WF media] r2524 - trunk/art/3d_objects/plants/fruit/beet Message-ID: <200805032235.m43MZast025424@rzcomm22.rz.tu-bs.de> Author: xrenmilay Date: Sun May 4 00:56:33 2008 New Revision: 2524 Log: Added: trunk/art/3d_objects/plants/fruit/beet/beet..emdl (contents, props changed) Added: trunk/art/3d_objects/plants/fruit/beet/beet..emdl ============================================================================== Binary file. No diff available. From commit-messages at dark.worldforge.org Sat May 3 15:36:36 2008 From: commit-messages at dark.worldforge.org (commit-messages at dark.worldforge.org) Date: Sun, 4 May 2008 00:36:36 +0200 Subject: [WF-CVS] [WF media] r2525 - trunk/art/3d_objects/plants/fruit/beet Message-ID: <200805032236.m43MaaL9025431@rzcomm22.rz.tu-bs.de> Author: xrenmilay Date: Sun May 4 00:57:38 2008 New Revision: 2525 Log: Removed: trunk/art/3d_objects/plants/fruit/beet/beet.xsi From commit-messages at dark.worldforge.org Sat May 3 15:37:34 2008 From: commit-messages at dark.worldforge.org (commit-messages at dark.worldforge.org) Date: Sun, 4 May 2008 00:37:34 +0200 Subject: [WF-CVS] [WF media] r2526 - trunk/art/3d_objects/plants/fruit/carrot Message-ID: <200805032237.m43MbYfj025450@rzcomm22.rz.tu-bs.de> Author: xrenmilay Date: Sun May 4 00:58:36 2008 New Revision: 2526 Log: Added: trunk/art/3d_objects/plants/fruit/carrot/carrot.emdl (contents, props changed) Removed: trunk/art/3d_objects/plants/fruit/carrot/carrot.xsi Added: trunk/art/3d_objects/plants/fruit/carrot/carrot.emdl ============================================================================== Binary file. No diff available. From commit-messages at dark.worldforge.org Sat May 3 15:37:53 2008 From: commit-messages at dark.worldforge.org (commit-messages at dark.worldforge.org) Date: Sun, 4 May 2008 00:37:53 +0200 Subject: [WF-CVS] [WF media] r2527 - trunk/art/3d_objects/plants/fruit/apple Message-ID: <200805032237.m43Mbr5s025454@rzcomm22.rz.tu-bs.de> Author: