From commit-messages at dark.worldforge.org Wed Apr 2 06:53:27 2008 From: commit-messages at dark.worldforge.org (commit-messages at dark.worldforge.org) Date: Wed, 2 Apr 2008 15:53:27 +0200 Subject: [WF-CVS] [WF media] r2409 - in trunk/3d_skeletons/quadrapeds: cow horse models/cow models/horse models/rabbit rabbit Message-ID: <200804021353.m32DrRHh004987@rzcomm22.rz.tu-bs.de> Author: xrenmilay Date: Wed Apr 2 16:10:36 2008 New Revision: 2409 Log: Added: trunk/3d_skeletons/quadrapeds/cow/ - copied from r2402, /trunk/3d_skeletons/quadrapeds/models/cow/ trunk/3d_skeletons/quadrapeds/horse/ - copied from r2402, /trunk/3d_skeletons/quadrapeds/models/horse/ trunk/3d_skeletons/quadrapeds/rabbit/ - copied from r2402, /trunk/3d_skeletons/quadrapeds/models/rabbit/ Removed: trunk/3d_skeletons/quadrapeds/models/cow/ trunk/3d_skeletons/quadrapeds/models/horse/ trunk/3d_skeletons/quadrapeds/models/rabbit/ From commit-messages at dark.worldforge.org Wed Apr 2 06:58:51 2008 From: commit-messages at dark.worldforge.org (commit-messages at dark.worldforge.org) Date: Wed, 2 Apr 2008 15:58:51 +0200 Subject: [WF-CVS] [WF media] r2410 - in trunk/3d_skeletons/quadrapeds: animations cow horse models rabbit textures Message-ID: <200804021358.m32Dwpv5005671@rzcomm22.rz.tu-bs.de> Author: xrenmilay Date: Wed Apr 2 16:16:03 2008 New Revision: 2410 Log: Added: trunk/3d_skeletons/quadrapeds/cow/cow.xsf - copied unchanged from r2402, /trunk/3d_skeletons/quadrapeds/animations/cow/cow.xsf trunk/3d_skeletons/quadrapeds/cow/cowD.tga - copied unchanged from r2402, /trunk/3d_skeletons/quadrapeds/textures/cow/cowD.tga trunk/3d_skeletons/quadrapeds/cow/cowN.tga - copied unchanged from r2402, /trunk/3d_skeletons/quadrapeds/textures/cow/cowN.tga trunk/3d_skeletons/quadrapeds/cow/cowS.tga - copied unchanged from r2402, /trunk/3d_skeletons/quadrapeds/textures/cow/cowS.tga trunk/3d_skeletons/quadrapeds/cow/eat_low.xaf - copied unchanged from r2402, /trunk/3d_skeletons/quadrapeds/animations/cow/eat_low.xaf trunk/3d_skeletons/quadrapeds/cow/look_l.xaf - copied unchanged from r2402, /trunk/3d_skeletons/quadrapeds/animations/cow/look_l.xaf trunk/3d_skeletons/quadrapeds/cow/moo.xaf - copied unchanged from r2402, /trunk/3d_skeletons/quadrapeds/animations/cow/moo.xaf trunk/3d_skeletons/quadrapeds/cow/tail_flick.xaf - copied unchanged from r2402, /trunk/3d_skeletons/quadrapeds/animations/cow/tail_flick.xaf trunk/3d_skeletons/quadrapeds/cow/walk.xaf - copied unchanged from r2402, /trunk/3d_skeletons/quadrapeds/animations/cow/walk.xaf trunk/3d_skeletons/quadrapeds/horse/horse.skeleton - copied unchanged from r2402, /trunk/3d_skeletons/quadrapeds/animations/horse/horse.skeleton trunk/3d_skeletons/quadrapeds/horse/horseD.tga - copied unchanged from r2402, /trunk/3d_skeletons/quadrapeds/textures/horse/horseD.tga trunk/3d_skeletons/quadrapeds/horse/horseN.tga - copied unchanged from r2402, /trunk/3d_skeletons/quadrapeds/textures/horse/horseN.tga trunk/3d_skeletons/quadrapeds/horse/horseS.tga - copied unchanged from r2402, /trunk/3d_skeletons/quadrapeds/textures/horse/horseS.tga trunk/3d_skeletons/quadrapeds/rabbit/death1.xaf - copied unchanged from r2402, /trunk/3d_skeletons/quadrapeds/animations/rabbit/death1.xaf trunk/3d_skeletons/quadrapeds/rabbit/death2.xaf - copied unchanged from r2402, /trunk/3d_skeletons/quadrapeds/animations/rabbit/death2.xaf trunk/3d_skeletons/quadrapeds/rabbit/eat1.xaf - copied unchanged from r2402, /trunk/3d_skeletons/quadrapeds/animations/rabbit/eat1.xaf trunk/3d_skeletons/quadrapeds/rabbit/eat2.xaf - copied unchanged from r2402, /trunk/3d_skeletons/quadrapeds/animations/rabbit/eat2.xaf trunk/3d_skeletons/quadrapeds/rabbit/look_around.xaf - copied unchanged from r2402, /trunk/3d_skeletons/quadrapeds/animations/rabbit/look_around.xaf trunk/3d_skeletons/quadrapeds/rabbit/rabbit - copied unchanged from r2402, /trunk/3d_skeletons/quadrapeds/animations/rabbit/rabbit trunk/3d_skeletons/quadrapeds/rabbit/rabbit.skeleton - copied unchanged from r2402, /trunk/3d_skeletons/quadrapeds/animations/rabbit/rabbit.skeleton trunk/3d_skeletons/quadrapeds/rabbit/rabbit.xrf - copied unchanged from r2402, /trunk/3d_skeletons/quadrapeds/textures/rabbit/rabbit.xrf trunk/3d_skeletons/quadrapeds/rabbit/rabbitD.png - copied unchanged from r2402, /trunk/3d_skeletons/quadrapeds/textures/rabbit/rabbitD.png trunk/3d_skeletons/quadrapeds/rabbit/rabbitD.tga - copied unchanged from r2402, /trunk/3d_skeletons/quadrapeds/textures/rabbit/rabbitD.tga trunk/3d_skeletons/quadrapeds/rabbit/rabbitN.tga - copied unchanged from r2402, /trunk/3d_skeletons/quadrapeds/textures/rabbit/rabbitN.tga trunk/3d_skeletons/quadrapeds/rabbit/rabbitS.tga - copied unchanged from r2402, /trunk/3d_skeletons/quadrapeds/textures/rabbit/rabbitS.tga trunk/3d_skeletons/quadrapeds/rabbit/rabit.xsf - copied unchanged from r2402, /trunk/3d_skeletons/quadrapeds/animations/rabbit/rabit.xsf trunk/3d_skeletons/quadrapeds/rabbit/run1.xaf - copied unchanged from r2402, /trunk/3d_skeletons/quadrapeds/animations/rabbit/run1.xaf trunk/3d_skeletons/quadrapeds/rabbit/run2.xaf - copied unchanged from r2402, /trunk/3d_skeletons/quadrapeds/animations/rabbit/run2.xaf trunk/3d_skeletons/quadrapeds/rabbit/scratch1.xaf - copied unchanged from r2402, /trunk/3d_skeletons/quadrapeds/animations/rabbit/scratch1.xaf trunk/3d_skeletons/quadrapeds/rabbit/scratch2.xaf - copied unchanged from r2402, /trunk/3d_skeletons/quadrapeds/animations/rabbit/scratch2.xaf trunk/3d_skeletons/quadrapeds/rabbit/sit1.xaf - copied unchanged from r2402, /trunk/3d_skeletons/quadrapeds/animations/rabbit/sit1.xaf trunk/3d_skeletons/quadrapeds/rabbit/sit2.xaf - copied unchanged from r2402, /trunk/3d_skeletons/quadrapeds/animations/rabbit/sit2.xaf trunk/3d_skeletons/quadrapeds/rabbit/skeleton.xsf - copied unchanged from r2402, /trunk/3d_skeletons/quadrapeds/animations/rabbit/skeleton.xsf Removed: trunk/3d_skeletons/quadrapeds/animations/ trunk/3d_skeletons/quadrapeds/models/ trunk/3d_skeletons/quadrapeds/textures/ From cvs at mail.worldforge.org Wed Apr 2 12:31:34 2008 From: cvs at mail.worldforge.org (worldforge cvs) Date: Wed, 2 Apr 2008 15:31:34 -0400 (EDT) Subject: [WF-CVS] cvs: simon Message-ID: <20080402193134.C1FC4140915A@moria.seul.org> CVSROOT: /home/cvspsrv/worldforge Module name: forge Changes by: simon 08/04/02 15:31:34 Modified files: libs/libwfut/tools: wfut.cpp Log message: Fix typo From cvs at mail.worldforge.org Wed Apr 2 12:31:21 2008 From: cvs at mail.worldforge.org (worldforge cvs) Date: Wed, 2 Apr 2008 15:31:21 -0400 (EDT) Subject: [WF-CVS] cvs: simon Message-ID: <20080402193121.DDCFE1411620@moria.seul.org> CVSROOT: /home/cvspsrv/worldforge Module name: forge Changes by: simon 08/04/02 15:31:21 Modified files: libs/libwfut : README Log message: Added some links. From cvs at mail.worldforge.org Wed Apr 2 13:19:06 2008 From: cvs at mail.worldforge.org (worldforge cvs) Date: Wed, 2 Apr 2008 16:19:06 -0400 (EDT) Subject: [WF-CVS] cvs: simon Message-ID: <20080402201906.D3A8C1410259@moria.seul.org> CVSROOT: /home/cvspsrv/worldforge Module name: forge Changes by: simon 08/04/02 16:19:06 Modified files: libs/libwfut : ChangeLog NEWS Log message: 2008-04-02 Simon Goodall * NEWS: 0.2.0 Released. From commit-messages at dark.worldforge.org Fri Apr 4 06:50:05 2008 From: commit-messages at dark.worldforge.org (commit-messages at dark.worldforge.org) Date: Fri, 4 Apr 2008 15:50:05 +0200 Subject: [WF-CVS] [WF media] r2411 - trunk/3d_objects/items/building_element/textures/marketstall Message-ID: <200804041350.m34Do5Hq003251@rzcomm22.rz.tu-bs.de> Author: xrenmilay Date: Fri Apr 4 16:07:29 2008 New Revision: 2411 Log: removed unnecessary files Removed: trunk/3d_objects/items/building_element/textures/marketstall/canvas_details copy.tga From commit-messages at dark.worldforge.org Sat Apr 5 09:06:42 2008 From: commit-messages at dark.worldforge.org (commit-messages at dark.worldforge.org) Date: Sat, 5 Apr 2008 18:06:42 +0200 Subject: [WF-CVS] [WF media] r2412 - in trunk/3d_objects/environment/boulder/models: granite_boulder mossy_boulders Message-ID: <200804051606.m35G6gqB031270@rzcomm22.rz.tu-bs.de> Author: xrenmilay Date: Sat Apr 5 18:24:13 2008 New Revision: 2412 Log: Added: trunk/3d_objects/environment/boulder/models/granite_boulder/ - copied from r1965, /trunk/3d_objects/environment/boulder/models/mossy_boulders/ trunk/3d_objects/environment/boulder/models/granite_boulder/mossy_bouldersD.dae - copied unchanged from r1890, /trunk/3d_objects/environment/boulder/models/mossy_boulders/mossy_bouldersD.dae Removed: trunk/3d_objects/environment/boulder/models/mossy_boulders/ From commit-messages at dark.worldforge.org Sat Apr 5 09:09:01 2008 From: commit-messages at dark.worldforge.org (commit-messages at dark.worldforge.org) Date: Sat, 5 Apr 2008 18:09:01 +0200 Subject: [WF-CVS] [WF media] r2413 - in trunk/3d_objects/environment/boulder/models: granite granite_boulder Message-ID: <200804051609.m35G91sq031737@rzcomm22.rz.tu-bs.de> Author: xrenmilay Date: Sat Apr 5 18:26:37 2008 New Revision: 2413 Log: Added: trunk/3d_objects/environment/boulder/models/granite/ - copied from r2412, /trunk/3d_objects/environment/boulder/models/granite_boulder/ Removed: trunk/3d_objects/environment/boulder/models/granite_boulder/ From commit-messages at dark.worldforge.org Sat Apr 5 10:07:49 2008 From: commit-messages at dark.worldforge.org (commit-messages at dark.worldforge.org) Date: Sat, 5 Apr 2008 19:07:49 +0200 Subject: [WF-CVS] [WF media] r2415 - trunk/3d_objects/environment/ground/textures/cobble_stone Message-ID: <200804051707.m35H7nJr004611@rzcomm22.rz.tu-bs.de> Author: xrenmilay Date: Sat Apr 5 19:25:16 2008 New Revision: 2415 Log: Modified: trunk/3d_objects/environment/ground/textures/cobble_stone/cobblestoneN.png trunk/3d_objects/environment/ground/textures/cobble_stone/cobblestone_mossy.png Modified: trunk/3d_objects/environment/ground/textures/cobble_stone/cobblestoneN.png ============================================================================== Binary files. No diff available. Modified: trunk/3d_objects/environment/ground/textures/cobble_stone/cobblestone_mossy.png ============================================================================== Binary files. No diff available. From cvs at mail.worldforge.org Sun Apr 6 07:21:41 2008 From: cvs at mail.worldforge.org (worldforge cvs) Date: Sun, 6 Apr 2008 10:21:41 -0400 (EDT) Subject: [WF-CVS] cvs: simon Message-ID: <20080406142141.C8735141B4CE@moria.seul.org> CVSROOT: /home/cvspsrv/worldforge Module name: forge Changes by: simon 08/04/06 10:21:41 Modified files: clients/sear : configure.ac ChangeLog clients/sear/environment: Environment.cpp clients/sear/gui: Button.cpp Button.h ConnectDialogue.cpp ConnectDialogue.h LoginDialogue.cpp LoginDialogue.h ToggleButton.cpp ToggleButton.h Widget.h TextEntry.cpp focus.cpp focus.h clients/sear/loaders: ObjectHandler.cpp clients/sear/renderers: Camera.cpp GL.cpp RenderSystem.cpp StateManager.cpp clients/sear/src: System.h clients/sear/guichan: ActionListenerSigC.h Alert.cpp Alert.h CharacterWindow.cpp CharacterWindow.h CommandLine.h ConnectWindow.cpp ConnectWindow.h ConsoleWindow.cpp ConsoleWindow.h Inventory.cpp Inventory.h LoginWindow.h OptionsWindow.cpp OptionsWindow.h Overlay.cpp Overlay.h Panel.cpp Panel.h RenameDialog.h StatusWindow.h TaskWindow.h VideoOptions.cpp VideoOptions.h Workarea.cpp Log message: 2008-04-06 Simon Goodall * configure.ac: Use libwfut 0.2.0. Disable sigc++ 1.2 API. * environment/Environment.cpp, gui/Button.cpp, gui/Button.h, gui/ConnectDialog.cpp, gui/ConnectDialogue.h, gui/LoginDialog.cpp, gui/LoginDialog.h, gui/TextEntry.cpp, gui/ToggleButton.cpp, gui/ToggleButton.h, gui/Widget.h, gui/Window.h, gui/focus.cpp, gui/focus.h, guichan/ActionListenerSigC.h, guichan/Alert.cpp, guichan/Alert.h, guichan/CharacterWindow.cpp, guichan/CharacterWindow.h, guichan/CommandLine.h, guichan/ConnectWindow.cpp, guichan/ConnectWindow.h, guichan/ConsoleWindow.cpp, guichan/ConsoleWindow.h, guichan/Inventory.cpp, guichan/Inventory.h, guichan/LoginWindow.h, guichan/OptionsWindow.cpp, guichan/OptionsWindow.h, guichan/Overlay.cpp, guichan/Overlay.h, guichan/Panel.cpp, guichan/Panel.h, guichan/RenameDialog.h, guichan/StatusWindow.h, guichan/TaskWindow.h, guichan/VideoOptions.cpp, guichan/VideoOptions.h, guichan/Workarea.cpp, loaders/ObjectHandler.cpp, renderers/Camera.cpp, renderers/GL.cpp, renderers/RenderSystem.cpp, renderers/StateManager.cpp, src/System.h: Replace sigc++ 1.2 calls with sigc++ 2.0 calls. From cvs at mail.worldforge.org Sun Apr 6 07:29:17 2008 From: cvs at mail.worldforge.org (worldforge cvs) Date: Sun, 6 Apr 2008 10:29:17 -0400 (EDT) Subject: [WF-CVS] cvs: simon Message-ID: <20080406142917.2D8D6140F467@moria.seul.org> CVSROOT: /home/cvspsrv/worldforge Module name: forge Changes by: simon 08/04/06 10:29:17 Modified files: clients/sear/gui: Window.h Log message: File missed out of sigc commit. From commit-messages at dark.worldforge.org Sun Apr 6 09:51:21 2008 From: commit-messages at dark.worldforge.org (commit-messages at dark.worldforge.org) Date: Sun, 6 Apr 2008 18:51:21 +0200 Subject: [WF-CVS] [WF media] r2417 - in trunk/3d_objects/environment: boulder/textures/felsite stalactites/textures Message-ID: <200804061651.m36GpLqO014209@rzcomm22.rz.tu-bs.de> Author: erik Date: Sun Apr 6 19:09:00 2008 New Revision: 2417 Log: Renamed to use lowercase file appendix to fit with other media. Added: trunk/3d_objects/environment/boulder/textures/felsite/D.png - copied unchanged from r2416, /trunk/3d_objects/environment/boulder/textures/felsite/D.PNG trunk/3d_objects/environment/boulder/textures/felsite/N.png - copied unchanged from r2416, /trunk/3d_objects/environment/boulder/textures/felsite/N.PNG trunk/3d_objects/environment/stalactites/textures/D.png - copied unchanged from r2416, /trunk/3d_objects/environment/stalactites/textures/D.PNG trunk/3d_objects/environment/stalactites/textures/N.png - copied unchanged from r2416, /trunk/3d_objects/environment/stalactites/textures/N.PNG Removed: trunk/3d_objects/environment/boulder/textures/felsite/D.PNG trunk/3d_objects/environment/boulder/textures/felsite/N.PNG trunk/3d_objects/environment/stalactites/textures/D.PNG trunk/3d_objects/environment/stalactites/textures/N.PNG From commit-messages at dark.worldforge.org Sun Apr 6 13:08:27 2008 From: commit-messages at dark.worldforge.org (commit-messages at dark.worldforge.org) Date: Sun, 6 Apr 2008 22:08:27 +0200 Subject: [WF-CVS] [WF media] r2418 - in trunk/3d_skeletons/bipeds/races/goblin/male: . body head head/eyes head/teeth Message-ID: <200804062008.m36K8RkT001181@rzcomm22.rz.tu-bs.de> Author: xrenmilay Date: Sun Apr 6 22:20:19 2008 New Revision: 2418 Log: Added: trunk/3d_skeletons/bipeds/races/goblin/male/head/eyes/eyes.xrf Modified: trunk/3d_skeletons/bipeds/races/goblin/male/body/body.xrf trunk/3d_skeletons/bipeds/races/goblin/male/goblin.cfg trunk/3d_skeletons/bipeds/races/goblin/male/head/head.xrf trunk/3d_skeletons/bipeds/races/goblin/male/head/teeth/teeth.xrf Modified: trunk/3d_skeletons/bipeds/races/goblin/male/body/body.xrf ============================================================================== --- trunk/3d_skeletons/bipeds/races/goblin/male/body/body.xrf (original) +++ trunk/3d_skeletons/bipeds/races/goblin/male/body/body.xrf Sun Apr 6 22:20:19 2008 @@ -4,5 +4,5 @@ 255.000000 255.000000 255.000000 255.000000 255.000000 255.000000 255.000000 255.000000 1.000000 - body.png + D.tga Modified: trunk/3d_skeletons/bipeds/races/goblin/male/goblin.cfg ============================================================================== --- trunk/3d_skeletons/bipeds/races/goblin/male/goblin.cfg (original) +++ trunk/3d_skeletons/bipeds/races/goblin/male/goblin.cfg Sun Apr 6 22:20:19 2008 @@ -7,27 +7,27 @@ skeleton=animation/goblin.xsf # --- Animations --- -animation_action=animation/Throw.xaf +animation=animation/Throw.xaf animation=animation/GripL.xaf animation=animation/Dead3.xaf animation=animation/Dead2.xaf -animation_action=animation/Leap.xaf +animation=animation/Leap.xaf animation=animation/Dead.xaf animation=animation/Walk.xaf -animation_action=animation/Jump.xaf -animation_action=animation/Pickup.xaf +animation=animation/Jump.xaf +animation=animation/Pickup.xaf animation=animation/Stand.xaf animation=animation/Jog.xaf -animation_action=animation/Bash2.xaf -animation_action=animation/Bash1.xaf +animation=animation/Bash2.xaf +animation=animation/Bash1.xaf animation=animation/GripR.xaf animation=animation/DefaultGrip.xaf -animation_action=animation/Eat.xaf -animation_action=animation/Bash.xaf +animation=animation/Eat.xaf +animation=animation/Bash.xaf # --- Meshes --- mesh=body/GoblinBody.xmf -mesh=eyes/GoblinEyes.xmf +mesh=head/eyes/GoblinEyes.xmf mesh=head/GoblinHead.xmf mesh=head/GoblinMouth.xmf @@ -35,6 +35,6 @@ material=body/body.xrf material=head/head.xrf -material=teeth/teeth.xrf +material=head/teeth/teeth.xrf Added: trunk/3d_skeletons/bipeds/races/goblin/male/head/eyes/eyes.xrf ============================================================================== --- (empty file) +++ trunk/3d_skeletons/bipeds/races/goblin/male/head/eyes/eyes.xrf Sun Apr 6 22:20:19 2008 @@ -0,0 +1,8 @@ +
+ + 255.000000 255.000000 255.000000 255.000000 + 255.000000 255.000000 255.000000 255.000000 + 255.000000 255.000000 255.000000 255.000000 + 1.000000 + D.tga + Modified: trunk/3d_skeletons/bipeds/races/goblin/male/head/head.xrf ============================================================================== --- trunk/3d_skeletons/bipeds/races/goblin/male/head/head.xrf (original) +++ trunk/3d_skeletons/bipeds/races/goblin/male/head/head.xrf Sun Apr 6 22:20:19 2008 @@ -4,5 +4,5 @@ 255.000000 255.000000 255.000000 255.000000 255.000000 255.000000 255.000000 255.000000 1.000000 - head.jpg + D.tga Modified: trunk/3d_skeletons/bipeds/races/goblin/male/head/teeth/teeth.xrf ============================================================================== --- trunk/3d_skeletons/bipeds/races/goblin/male/head/teeth/teeth.xrf (original) +++ trunk/3d_skeletons/bipeds/races/goblin/male/head/teeth/teeth.xrf Sun Apr 6 22:20:19 2008 @@ -4,4 +4,5 @@ 255.000000 255.000000 255.000000 255.000000 255.000000 255.000000 255.000000 255.000000 1.000000 + D.tga From commit-messages at dark.worldforge.org Mon Apr 7 21:34:24 2008 From: commit-messages at dark.worldforge.org (commit-messages at dark.worldforge.org) Date: Tue, 8 Apr 2008 06:34:24 +0200 Subject: [WF-CVS] [WF media] r2419 - in trunk/3d_objects/items/building_element: models/stone_palisade textures/foundation_brick textures/ozark_brick textures/ozark_brick/ozark_brick textures/rezpa_column textures/rough_stone Message-ID: <200804080434.m384YOOG023219@rzcomm22.rz.tu-bs.de> Author: xrenmilay Date: Tue Apr 8 06:52:13 2008 New Revision: 2419 Log: modified a couple of things added a couple of things Added: trunk/3d_objects/items/building_element/models/stone_palisade/ trunk/3d_objects/items/building_element/models/stone_palisade/stone_palisade.mesh (contents, props changed) trunk/3d_objects/items/building_element/textures/foundation_brick/ trunk/3d_objects/items/building_element/textures/foundation_brick/D.png (contents, props changed) trunk/3d_objects/items/building_element/textures/foundation_brick/N.png (contents, props changed) trunk/3d_objects/items/building_element/textures/foundation_brick/S.png (contents, props changed) trunk/3d_objects/items/building_element/textures/ozark_brick/ trunk/3d_objects/items/building_element/textures/ozark_brick/D.png (contents, props changed) trunk/3d_objects/items/building_element/textures/ozark_brick/N.png (contents, props changed) trunk/3d_objects/items/building_element/textures/ozark_brick/S.png (contents, props changed) trunk/3d_objects/items/building_element/textures/ozark_brick/ozark_brick/ trunk/3d_objects/items/building_element/textures/ozark_brick/ozark_brick/ozark_brick.psd (contents, props changed) trunk/3d_objects/items/building_element/textures/rezpa_column/ trunk/3d_objects/items/building_element/textures/rezpa_column/D.png (contents, props changed) trunk/3d_objects/items/building_element/textures/rezpa_column/N.png (contents, props changed) trunk/3d_objects/items/building_element/textures/rezpa_column/S.png (contents, props changed) Removed: trunk/3d_objects/items/building_element/textures/rough_stone/stoneL.png Modified: trunk/3d_objects/items/building_element/textures/rough_stone/big_arcN.png trunk/3d_objects/items/building_element/textures/rough_stone/ceilingN.png trunk/3d_objects/items/building_element/textures/rough_stone/floorN.png trunk/3d_objects/items/building_element/textures/rough_stone/normal_slope_wallN.png trunk/3d_objects/items/building_element/textures/rough_stone/stoneN.png Added: trunk/3d_objects/items/building_element/models/stone_palisade/stone_palisade.mesh ============================================================================== Binary file. No diff available. Added: trunk/3d_objects/items/building_element/textures/foundation_brick/D.png ============================================================================== Binary file. No diff available. Added: trunk/3d_objects/items/building_element/textures/foundation_brick/N.png ============================================================================== Binary file. No diff available. Added: trunk/3d_objects/items/building_element/textures/foundation_brick/S.png ============================================================================== Binary file. No diff available. Added: trunk/3d_objects/items/building_element/textures/ozark_brick/D.png ============================================================================== Binary file. No diff available. Added: trunk/3d_objects/items/building_element/textures/ozark_brick/N.png ============================================================================== Binary file. No diff available. Added: trunk/3d_objects/items/building_element/textures/ozark_brick/S.png ============================================================================== Binary file. No diff available. Added: trunk/3d_objects/items/building_element/textures/ozark_brick/ozark_brick/ozark_brick.psd ============================================================================== Binary file. No diff available. Added: trunk/3d_objects/items/building_element/textures/rezpa_column/D.png ============================================================================== Binary file. No diff available. Added: trunk/3d_objects/items/building_element/textures/rezpa_column/N.png ============================================================================== Binary file. No diff available. Added: trunk/3d_objects/items/building_element/textures/rezpa_column/S.png ============================================================================== Binary file. No diff available. Modified: trunk/3d_objects/items/building_element/textures/rough_stone/big_arcN.png ============================================================================== Binary files. No diff available. Modified: trunk/3d_objects/items/building_element/textures/rough_stone/ceilingN.png ============================================================================== Binary files. No diff available. Modified: trunk/3d_objects/items/building_element/textures/rough_stone/floorN.png ============================================================================== Binary files. No diff available. Modified: trunk/3d_objects/items/building_element/textures/rough_stone/normal_slope_wallN.png ============================================================================== Binary files. No diff available. Modified: trunk/3d_objects/items/building_element/textures/rough_stone/stoneN.png ============================================================================== Binary files. No diff available. From commit-messages at dark.worldforge.org Mon Apr 7 21:47:19 2008 From: commit-messages at dark.worldforge.org (commit-messages at dark.worldforge.org) Date: Tue, 8 Apr 2008 06:47:19 +0200 Subject: [WF-CVS] [WF media] r2421 - in trunk/3d_objects/items/building_element/textures: ozark_brick ozark_brick/ozark_brick rezpa_column Message-ID: <200804080447.m384lJeD024192@rzcomm22.rz.tu-bs.de> Author: xrenmilay Date: Tue Apr 8 07:02:43 2008 New Revision: 2421 Log: more adds Added: trunk/3d_objects/items/building_element/textures/ozark_brick/ozark_brick.xrf trunk/3d_objects/items/building_element/textures/rezpa_column/rezpa_column.xrf Removed: trunk/3d_objects/items/building_element/textures/ozark_brick/ozark_brick/ozark_brick.psd Added: trunk/3d_objects/items/building_element/textures/ozark_brick/ozark_brick.xrf ============================================================================== --- (empty file) +++ trunk/3d_objects/items/building_element/textures/ozark_brick/ozark_brick.xrf Tue Apr 8 07:02:43 2008 @@ -0,0 +1,8 @@ +
+ + 0 0 0 255 + 178 178 178 0 + 255 255 255 0 + 0.500000 + D.png + Added: trunk/3d_objects/items/building_element/textures/rezpa_column/rezpa_column.xrf ============================================================================== --- (empty file) +++ trunk/3d_objects/items/building_element/textures/rezpa_column/rezpa_column.xrf Tue Apr 8 07:02:43 2008 @@ -0,0 +1,8 @@ +
+ + 0 0 0 255 + 178 178 178 0 + 255 255 255 0 + 0.500000 + D.png + From commit-messages at dark.worldforge.org Mon Apr 7 21:49:59 2008 From: commit-messages at dark.worldforge.org (commit-messages at dark.worldforge.org) Date: Tue, 8 Apr 2008 06:49:59 +0200 Subject: [WF-CVS] [WF media] r2422 - trunk/3d_objects/items/building_element/textures/ozark_brick/ozark_brick Message-ID: <200804080449.m384nx7T024650@rzcomm22.rz.tu-bs.de> Author: xrenmilay Date: Tue Apr 8 07:07:52 2008 New Revision: 2422 Log: Removed: trunk/3d_objects/items/building_element/textures/ozark_brick/ozark_brick/ From commit-messages at dark.worldforge.org Mon Apr 7 21:56:02 2008 From: commit-messages at dark.worldforge.org (commit-messages at dark.worldforge.org) Date: Tue, 8 Apr 2008 06:56:02 +0200 Subject: [WF-CVS] [WF media] r2423 - in trunk/3d_skeletons: bipeds/races/goblin/male/head/eyes bipeds/races/goblin/male/head/teeth quadrapeds/cow Message-ID: <200804080456.m384u2xq025158@rzcomm22.rz.tu-bs.de> Author: xrenmilay Date: Tue Apr 8 07:09:10 2008 New Revision: 2423 Log: Added: trunk/3d_skeletons/quadrapeds/cow/cow.xrf Modified: trunk/3d_skeletons/bipeds/races/goblin/male/head/eyes/eyes.xrf trunk/3d_skeletons/bipeds/races/goblin/male/head/teeth/teeth.xrf trunk/3d_skeletons/quadrapeds/cow/cow.cfg Modified: trunk/3d_skeletons/bipeds/races/goblin/male/head/eyes/eyes.xrf ============================================================================== --- trunk/3d_skeletons/bipeds/races/goblin/male/head/eyes/eyes.xrf (original) +++ trunk/3d_skeletons/bipeds/races/goblin/male/head/eyes/eyes.xrf Tue Apr 8 07:09:10 2008 @@ -4,5 +4,5 @@ 255.000000 255.000000 255.000000 255.000000 255.000000 255.000000 255.000000 255.000000 1.000000 - D.tga + D.png Modified: trunk/3d_skeletons/bipeds/races/goblin/male/head/teeth/teeth.xrf ============================================================================== --- trunk/3d_skeletons/bipeds/races/goblin/male/head/teeth/teeth.xrf (original) +++ trunk/3d_skeletons/bipeds/races/goblin/male/head/teeth/teeth.xrf Tue Apr 8 07:09:10 2008 @@ -4,5 +4,5 @@ 255.000000 255.000000 255.000000 255.000000 255.000000 255.000000 255.000000 255.000000 1.000000 - D.tga + D.png Modified: trunk/3d_skeletons/quadrapeds/cow/cow.cfg ============================================================================== --- trunk/3d_skeletons/quadrapeds/cow/cow.cfg (original) +++ trunk/3d_skeletons/quadrapeds/cow/cow.cfg Tue Apr 8 07:09:10 2008 @@ -4,19 +4,19 @@ scale=0.010000 # --- Skeleton --- -skeleton=../../animations/cow/cow.xsf +skeleton=cow.xsf # --- Animations --- -animation_action=../../animations/cow/tail_flick.xaf -animation=../../animations/cow/walk.xaf -animation_action=../../animations/cow/moo.xaf -animation=../../animations/cow/eat_low.xaf -animation=../../animations/cow/look_l.xaf +animation=tail_flick.xaf +animation=walk.xaf +animation=moo.xaf +animation=eat_low.xaf +animation=look_l.xaf # --- Meshes --- mesh=cow.xmf # --- Materials --- -material=../../textures/cow.xrf +material=cow.xrf Added: trunk/3d_skeletons/quadrapeds/cow/cow.xrf ============================================================================== --- (empty file) +++ trunk/3d_skeletons/quadrapeds/cow/cow.xrf Tue Apr 8 07:09:10 2008 @@ -0,0 +1,8 @@ +
+ + 0 0 0 255 + 255 255 255 255 + 255 255 255 255 + 0.000000 + D.tga + From commit-messages at dark.worldforge.org Mon Apr 7 22:00:06 2008 From: commit-messages at dark.worldforge.org (commit-messages at dark.worldforge.org) Date: Tue, 8 Apr 2008 07:00:06 +0200 Subject: [WF-CVS] [WF media] r2425 - in trunk/art/3d_objects/items/building_element/textures: . ozark_brick Message-ID: <200804080500.m38506qd025672@rzcomm22.rz.tu-bs.de> Author: xrenmilay Date: Tue Apr 8 07:17:59 2008 New Revision: 2425 Log: Added: trunk/art/3d_objects/items/building_element/textures/ozark_brick/ozark_brick.psd - copied unchanged from r2424, /trunk/art/3d_objects/items/building_element/textures/ozark_brick.psd Removed: trunk/art/3d_objects/items/building_element/textures/ozark_brick.psd From cvs at mail.worldforge.org Tue Apr 8 11:54:53 2008 From: cvs at mail.worldforge.org (worldforge cvs) Date: Tue, 8 Apr 2008 14:54:53 -0400 (EDT) Subject: [WF-CVS] cvs: simon Message-ID: <20080408185453.A35011415738@moria.seul.org> CVSROOT: /home/cvspsrv/worldforge Module name: forge Changes by: simon 08/04/08 14:54:53 Modified files: libs/libwfut : ChangeLog libs/libwfut/python: Makefile.am Added files: libs/libwfut : libwfut.spec.in libs/libwfut/python: wfut-python.py Log message: 2008-04-08 Simon Goodall * python/Makefile.am, python/wfut-python.py: Added a sample python implementation of the wfut command line tool. * Added missing libwfut.spec.in From cvs at mail.worldforge.org Wed Apr 9 01:34:18 2008 From: cvs at mail.worldforge.org (worldforge cvs) Date: Wed, 9 Apr 2008 04:34:18 -0400 (EDT) Subject: [WF-CVS] cvs: simon Message-ID: <20080409083418.217851408DF0@moria.seul.org> CVSROOT: /home/cvspsrv/worldforge Module name: forge Changes by: simon 08/04/09 04:34:18 Modified files: libs/libwfut : ChangeLog libs/libwfut/python: Makefile.am wfut-python.py Added files: libs/libwfut/python: WFUTCore.py Log message: 2008-04-09 Simon Goodall * python/wfut-client.py, python/WUFTCore.py, python/Makefile.am: Added a new file containing the core parts of the update process in a class and changed wfut-python.py to use this class. From commit-messages at dark.worldforge.org Wed Apr 9 20:40:50 2008 From: commit-messages at dark.worldforge.org (commit-messages at dark.worldforge.org) Date: Thu, 10 Apr 2008 05:40:50 +0200 Subject: [WF-CVS] [WF media] r2426 - trunk/art/3d_objects/items/furniture/models/stool Message-ID: <200804100340.m3A3eoCx017696@rzcomm22.rz.tu-bs.de> Author: xrenmilay Date: Thu Apr 10 05:58:54 2008 New Revision: 2426 Log: Added: trunk/art/3d_objects/items/furniture/models/stool/stool.3DS (contents, props changed) Added: trunk/art/3d_objects/items/furniture/models/stool/stool.3DS ============================================================================== Binary file. No diff available. From commit-messages at dark.worldforge.org Wed Apr 9 20:50:42 2008 From: commit-messages at dark.worldforge.org (commit-messages at dark.worldforge.org) Date: Thu, 10 Apr 2008 05:50:42 +0200 Subject: [WF-CVS] [WF media] r2427 - in trunk/3d_skeletons/bipeds/races/human/male: . animation attire/drystan_archer Message-ID: <200804100350.m3A3ogqP018635@rzcomm22.rz.tu-bs.de> Author: xrenmilay Date: Thu Apr 10 06:08:49 2008 New Revision: 2427 Log: got it to work using one skeleton YAY! Modified: trunk/3d_skeletons/bipeds/races/human/male/animation/male.skeleton trunk/3d_skeletons/bipeds/races/human/male/attire/drystan_archer/drystan_archer.mesh trunk/3d_skeletons/bipeds/races/human/male/male.mesh Modified: trunk/3d_skeletons/bipeds/races/human/male/animation/male.skeleton ============================================================================== Binary files. No diff available. Modified: trunk/3d_skeletons/bipeds/races/human/male/attire/drystan_archer/drystan_archer.mesh ============================================================================== Binary files. No diff available. Modified: trunk/3d_skeletons/bipeds/races/human/male/male.mesh ============================================================================== Binary files. No diff available. From commit-messages at dark.worldforge.org Wed Apr 9 20:54:18 2008 From: commit-messages at dark.worldforge.org (commit-messages at dark.worldforge.org) Date: Thu, 10 Apr 2008 05:54:18 +0200 Subject: [WF-CVS] [WF media] r2428 - trunk/art/3d_objects/items/food Message-ID: <200804100354.m3A3sIFI019128@rzcomm22.rz.tu-bs.de> Author: xrenmilay Date: Thu Apr 10 06:11:09 2008 New Revision: 2428 Log: Added: trunk/art/3d_objects/items/food/readme.txt Added: trunk/art/3d_objects/items/food/readme.txt ============================================================================== --- (empty file) +++ trunk/art/3d_objects/items/food/readme.txt Thu Apr 10 06:11:09 2008 @@ -0,0 +1,6 @@ +Covers prepared solid foods, such as bakery products, butchery products, and cheese. + +Liquid, gel-like, and grainy foods are covered by the material template. +Vegetables and fruits are covered by the fruitable template. + +-- zzorn \ No newline at end of file From commit-messages at dark.worldforge.org Wed Apr 9 21:03:36 2008 From: commit-messages at dark.worldforge.org (commit-messages at dark.worldforge.org) Date: Thu, 10 Apr 2008 06:03:36 +0200 Subject: [WF-CVS] [WF media] r2429 - trunk/art/3d_skeletons/bipeds/male/models Message-ID: <200804100403.m3A43age020068@rzcomm22.rz.tu-bs.de> Author: xrenmilay Date: Thu Apr 10 06:21:42 2008 New Revision: 2429 Log: Added: trunk/art/3d_skeletons/bipeds/male/models/RenderMap_male_Final.emdl (contents, props changed) Added: trunk/art/3d_skeletons/bipeds/male/models/RenderMap_male_Final.emdl ============================================================================== Binary file. No diff available. From commit-messages at dark.worldforge.org Wed Apr 9 21:17:29 2008 From: commit-messages at dark.worldforge.org (commit-messages at dark.worldforge.org) Date: Thu, 10 Apr 2008 06:17:29 +0200 Subject: [WF-CVS] [WF media] r2430 - in trunk/art/3d_skeletons/bipeds/male/accessories: drystan_archer drystan_archer/models drystan_archer/textures hauberk_infantry Message-ID: <200804100417.m3A4HTZm020954@rzcomm22.rz.tu-bs.de> Author: xrenmilay Date: Thu Apr 10 06:33:07 2008 New Revision: 2430 Log: added some of Rob Galanakis stuff Added: trunk/art/3d_skeletons/bipeds/male/accessories/drystan_archer/ trunk/art/3d_skeletons/bipeds/male/accessories/drystan_archer/ReadMe.txt trunk/art/3d_skeletons/bipeds/male/accessories/drystan_archer/models/ trunk/art/3d_skeletons/bipeds/male/accessories/drystan_archer/models/clothes_drystan_weight.Preset (contents, props changed) trunk/art/3d_skeletons/bipeds/male/accessories/drystan_archer/models/drystan_archer.emdl (contents, props changed) trunk/art/3d_skeletons/bipeds/male/accessories/drystan_archer/textures/ trunk/art/3d_skeletons/bipeds/male/accessories/drystan_archer/textures/drystan_archer_footwear.psd (contents, props changed) trunk/art/3d_skeletons/bipeds/male/accessories/drystan_archer/textures/drystan_archer_pants.psd (contents, props changed) trunk/art/3d_skeletons/bipeds/male/accessories/drystan_archer/textures/drystan_archer_shirt.psd (contents, props changed) trunk/art/3d_skeletons/bipeds/male/accessories/hauberk_infantry/ trunk/art/3d_skeletons/bipeds/male/accessories/hauberk_infantry/ReadMe.txt trunk/art/3d_skeletons/bipeds/male/accessories/hauberk_infantry/hauberk_infantry.emdl (contents, props changed) Added: trunk/art/3d_skeletons/bipeds/male/accessories/drystan_archer/ReadMe.txt ============================================================================== --- (empty file) +++ trunk/art/3d_skeletons/bipeds/male/accessories/drystan_archer/ReadMe.txt Thu Apr 10 06:33:07 2008 @@ -0,0 +1,5 @@ +I worked with Rob and asked him if it would be okay to republish his content under GPL. +His exact words were "Go ahead! I don't give a F*@k!" +The Creative Conent License or General Public License are trivial. +Its republished under GPL +http://robg3d.com/ \ No newline at end of file Added: trunk/art/3d_skeletons/bipeds/male/accessories/drystan_archer/models/clothes_drystan_weight.Preset ============================================================================== Binary file. No diff available. Added: trunk/art/3d_skeletons/bipeds/male/accessories/drystan_archer/models/drystan_archer.emdl ============================================================================== Binary file. No diff available. Added: trunk/art/3d_skeletons/bipeds/male/accessories/drystan_archer/textures/drystan_archer_footwear.psd ============================================================================== Binary file. No diff available. Added: trunk/art/3d_skeletons/bipeds/male/accessories/drystan_archer/textures/drystan_archer_pants.psd ============================================================================== Binary file. No diff available. Added: trunk/art/3d_skeletons/bipeds/male/accessories/drystan_archer/textures/drystan_archer_shirt.psd ============================================================================== Binary file. No diff available. Added: trunk/art/3d_skeletons/bipeds/male/accessories/hauberk_infantry/ReadMe.txt ============================================================================== --- (empty file) +++ trunk/art/3d_skeletons/bipeds/male/accessories/hauberk_infantry/ReadMe.txt Thu Apr 10 06:33:07 2008 @@ -0,0 +1,5 @@ +I worked with Rob and asked him if it would be okay to republish his content under GPL. +His exact words were "Go ahead! I don't give a F*@k!" +The Creative Conent License or General Public License are trivial. +Its republished under GPL +http://robg3d.com/ \ No newline at end of file Added: trunk/art/3d_skeletons/bipeds/male/accessories/hauberk_infantry/hauberk_infantry.emdl ============================================================================== Binary file. No diff available. From commit-messages at dark.worldforge.org Wed Apr 9 22:04:59 2008 From: commit-messages at dark.worldforge.org (commit-messages at dark.worldforge.org) Date: Thu, 10 Apr 2008 07:04:59 +0200 Subject: [WF-CVS] [WF media] r2431 - trunk/art/3d_skeletons/quadrapeds/horse/textures Message-ID: <200804100505.m3A54xvt025595@rzcomm22.rz.tu-bs.de> Author: xrenmilay Date: Thu Apr 10 07:23:03 2008 New Revision: 2431 Log: Added: trunk/art/3d_skeletons/quadrapeds/horse/textures/horse.psd (contents, props changed) Added: trunk/art/3d_skeletons/quadrapeds/horse/textures/horse.psd ============================================================================== Binary file. No diff available. From commit-messages at dark.worldforge.org Wed Apr 9 22:39:20 2008 From: commit-messages at dark.worldforge.org (commit-messages at dark.worldforge.org) Date: Thu, 10 Apr 2008 07:39:20 +0200 Subject: [WF-CVS] [WF media] r2432 - trunk/art/3d_skeletons/quadrapeds/pig/textures Message-ID: <200804100539.m3A5dKV2029027@rzcomm22.rz.tu-bs.de> Author: xrenmilay Date: Thu Apr 10 07:57:24 2008 New Revision: 2432 Log: Added: trunk/art/3d_skeletons/quadrapeds/pig/textures/quadruped_v2.png (contents, props changed) Added: trunk/art/3d_skeletons/quadrapeds/pig/textures/quadruped_v2.png ============================================================================== Binary file. No diff available. From commit-messages at dark.worldforge.org Thu Apr 10 12:29:49 2008 From: commit-messages at dark.worldforge.org (commit-messages at dark.worldforge.org) Date: Thu, 10 Apr 2008 21:29:49 +0200 Subject: [WF-CVS] [WF media] r2433 - trunk/3d_objects/items/building_element/models/stone_palisade Message-ID: <200804101929.m3AJTnTI000674@rzcomm22.rz.tu-bs.de> Author: xrenmilay Date: Thu Apr 10 21:47:58 2008 New Revision: 2433 Log: Modified: trunk/3d_objects/items/building_element/models/stone_palisade/stone_palisade.mesh Modified: trunk/3d_objects/items/building_element/models/stone_palisade/stone_palisade.mesh ============================================================================== Binary files. No diff available. From commit-messages at dark.worldforge.org Thu Apr 10 12:47:06 2008 From: commit-messages at dark.worldforge.org (commit-messages at dark.worldforge.org) Date: Thu, 10 Apr 2008 21:47:06 +0200 Subject: [WF-CVS] [WF media] r2434 - trunk/art/3d_objects/items/building_element/models/stone_palisade Message-ID: <200804101947.m3AJl6ov002198@rzcomm22.rz.tu-bs.de> Author: xrenmilay Date: Thu Apr 10 22:05:14 2008 New Revision: 2434 Log: Modified: trunk/art/3d_objects/items/building_element/models/stone_palisade/stone_palisade.emdl Modified: trunk/art/3d_objects/items/building_element/models/stone_palisade/stone_palisade.emdl ============================================================================== Binary files. No diff available. From commit-messages at dark.worldforge.org Thu Apr 10 12:51:31 2008 From: commit-messages at dark.worldforge.org (commit-messages at dark.worldforge.org) Date: Thu, 10 Apr 2008 21:51:31 +0200 Subject: [WF-CVS] [WF media] r2435 - trunk/3d_objects/items/building_element/models/stone_palisade Message-ID: <200804101951.m3AJpVAP002649@rzcomm22.rz.tu-bs.de> Author: xrenmilay Date: Thu Apr 10 22:09:43 2008 New Revision: 2435 Log: minor name change Modified: trunk/3d_objects/items/building_element/models/stone_palisade/stone_palisade.mesh Modified: trunk/3d_objects/items/building_element/models/stone_palisade/stone_palisade.mesh ============================================================================== Binary files. No diff available. From commit-messages at dark.worldforge.org Thu Apr 10 12:52:18 2008 From: commit-messages at dark.worldforge.org (commit-messages at dark.worldforge.org) Date: Thu, 10 Apr 2008 21:52:18 +0200 Subject: [WF-CVS] [WF media] r2436 - trunk/art/3d_objects/items/building_element/models/stone_palisade Message-ID: <200804101952.m3AJqId8002663@rzcomm22.rz.tu-bs.de> Author: xrenmilay Date: Thu Apr 10 22:10:28 2008 New Revision: 2436 Log: updated stuff Modified: trunk/art/3d_objects/items/building_element/models/stone_palisade/stone_palisade.emdl Modified: trunk/art/3d_objects/items/building_element/models/stone_palisade/stone_palisade.emdl ============================================================================== Binary files. No diff available. From commitmsg at worldforge.de Fri Apr 11 14:30:33 2008 From: commitmsg at worldforge.de (commitmsg at worldforge.de) Date: Fri, 11 Apr 2008 23:30:33 +0200 (CEST) Subject: [WF-CVS] [WF-git] The Ember WorldForge client. branch, master, updated. 6b80ed0ca509583f440be25237cded10ab9ad64f Message-ID: <20080411213034.64E3D2937801E@worldforge.de> The branch, master has been updated via 6b80ed0ca509583f440be25237cded10ab9ad64f (commit) from c50119532df4b6c0dce8e0e735c95f65bc32ee0e (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 6b80ed0ca509583f440be25237cded10ab9ad64f Author: Erik Hjortsberg Date: Fri Apr 11 23:30:20 2008 +0200 Use the c++ logging methods instead so we don't have to worry about buffer sizes. ----------------------------------------------------------------------- Summary of changes: src/components/ogre/OgreLogObserver.cpp | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/src/components/ogre/OgreLogObserver.cpp b/src/components/ogre/OgreLogObserver.cpp index 78207bf..21346ff 100644 --- a/src/components/ogre/OgreLogObserver.cpp +++ b/src/components/ogre/OgreLogObserver.cpp @@ -55,14 +55,15 @@ void OgreLogObserver::messageLogged( const String& message, LogMessageLevel lml, } switch (lml) { case Ogre::LML_TRIVIAL: - Ember::EmberServices::getSingletonPtr()->getLoggingService()->log("Ogre", Ember::LoggingService::VERBOSE, (ogre + message).c_str()); + Ember::EmberServices::getSingletonPtr()->getLoggingService()->slog("Ogre", Ember::LoggingService::VERBOSE) << ogre << message << Ember::LoggingService::END_MESSAGE; break; case Ogre::LML_NORMAL: - Ember::EmberServices::getSingletonPtr()->getLoggingService()->log("Ogre", Ember::LoggingService::INFO, (ogre + message).c_str()); + Ember::EmberServices::getSingletonPtr()->getLoggingService()->slog("Ogre", Ember::LoggingService::INFO) << ogre << message << Ember::LoggingService::END_MESSAGE; break; case Ogre::LML_CRITICAL: - Ember::EmberServices::getSingletonPtr()->getLoggingService()->log("Ogre", Ember::LoggingService::FAILURE, (ogre + message).c_str()); + Ember::EmberServices::getSingletonPtr()->getLoggingService()->slog("Ogre", Ember::LoggingService::FAILURE) << ogre << message << Ember::LoggingService::END_MESSAGE; break; + } } -- The Ember WorldForge client. From commit-messages at dark.worldforge.org Fri Apr 11 17:15:12 2008 From: commit-messages at dark.worldforge.org (commit-messages at dark.worldforge.org) Date: Sat, 12 Apr 2008 02:15:12 +0200 Subject: [WF-CVS] [WF media] r2437 - trunk/resources/material_textures Message-ID: <200804120015.m3C0FCFi017917@rzcomm22.rz.tu-bs.de> Author: xrenmilay Date: Sat Apr 12 02:32:17 2008 New Revision: 2437 Log: Modified: trunk/resources/material_textures/readme.txt Modified: trunk/resources/material_textures/readme.txt ============================================================================== --- trunk/resources/material_textures/readme.txt (original) +++ trunk/resources/material_textures/readme.txt Sat Apr 12 02:32:17 2008 @@ -1,6 +1,6 @@ -This directory is for generic tiling textures, potentially usable as a material for different things. - +This directory is for generic tiling textures, potentially usable as a material for different things. + Textures implementing some template (building element, humanoid, stone boulder, mushroom, etc) -should go in the proper directories under media/3d_objects/ instead of here. - --- zzorn +should go in the proper directories under media/3d_objects/ instead of here. + +-- zzorn From commit-messages at dark.worldforge.org Fri Apr 11 17:35:44 2008 From: commit-messages at dark.worldforge.org (commit-messages at dark.worldforge.org) Date: Sat, 12 Apr 2008 02:35:44 +0200 Subject: [WF-CVS] [WF media] r2438 - trunk/3d_skeletons/bipeds/races/human/male/head/middle_aged Message-ID: <200804120035.m3C0ZiWE019877@rzcomm22.rz.tu-bs.de> Author: xrenmilay Date: Sat Apr 12 02:54:01 2008 New Revision: 2438 Log: added pngs Added: trunk/3d_skeletons/bipeds/races/human/male/head/middle_aged/D.png (contents, props changed) trunk/3d_skeletons/bipeds/races/human/male/head/middle_aged/N.png (contents, props changed) trunk/3d_skeletons/bipeds/races/human/male/head/middle_aged/S.png (contents, props changed) Added: trunk/3d_skeletons/bipeds/races/human/male/head/middle_aged/D.png ============================================================================== Binary file. No diff available. Added: trunk/3d_skeletons/bipeds/races/human/male/head/middle_aged/N.png ============================================================================== Binary file. No diff available. Added: trunk/3d_skeletons/bipeds/races/human/male/head/middle_aged/S.png ============================================================================== Binary file. No diff available. From commit-messages at dark.worldforge.org Fri Apr 11 18:16:20 2008 From: commit-messages at dark.worldforge.org (commit-messages at dark.worldforge.org) Date: Sat, 12 Apr 2008 03:16:20 +0200 Subject: [WF-CVS] [WF media] r2439 - in trunk/3d_skeletons/bipeds/races/human/male: . animation body/base Message-ID: <200804120116.m3C1GKRJ023584@rzcomm22.rz.tu-bs.de> Author: xrenmilay Date: Sat Apr 12 03:34:36 2008 New Revision: 2439 Log: updates Added: trunk/3d_skeletons/bipeds/races/human/male/body/base/D.png (contents, props changed) trunk/3d_skeletons/bipeds/races/human/male/body/base/N.png (contents, props changed) trunk/3d_skeletons/bipeds/races/human/male/body/base/S.png (contents, props changed) Modified: trunk/3d_skeletons/bipeds/races/human/male/animation/male.skeleton trunk/3d_skeletons/bipeds/races/human/male/male.mesh Modified: trunk/3d_skeletons/bipeds/races/human/male/animation/male.skeleton ============================================================================== Binary files. No diff available. Added: trunk/3d_skeletons/bipeds/races/human/male/body/base/D.png ============================================================================== Binary file. No diff available. Added: trunk/3d_skeletons/bipeds/races/human/male/body/base/N.png ============================================================================== Binary file. No diff available. Added: trunk/3d_skeletons/bipeds/races/human/male/body/base/S.png ============================================================================== Binary file. No diff available. Modified: trunk/3d_skeletons/bipeds/races/human/male/male.mesh ============================================================================== Binary files. No diff available. From commit-messages at dark.worldforge.org Fri Apr 11 18:43:00 2008 From: commit-messages at dark.worldforge.org (commit-messages at dark.worldforge.org) Date: Sat, 12 Apr 2008 03:43:00 +0200 Subject: [WF-CVS] [WF media] r2440 - trunk/3d_skeletons/bipeds/races/human/male/head/middle_aged Message-ID: <200804120143.m3C1h0dU026204@rzcomm22.rz.tu-bs.de> Author: xrenmilay Date: Sat Apr 12 04:01:09 2008 New Revision: 2440 Log: Removed: trunk/3d_skeletons/bipeds/races/human/male/head/middle_aged/D.tga trunk/3d_skeletons/bipeds/races/human/male/head/middle_aged/N.tga trunk/3d_skeletons/bipeds/races/human/male/head/middle_aged/S.tga From commit-messages at dark.worldforge.org Fri Apr 11 18:50:37 2008 From: commit-messages at dark.worldforge.org (commit-messages at dark.worldforge.org) Date: Sat, 12 Apr 2008 03:50:37 +0200 Subject: [WF-CVS] [WF media] r2441 - in trunk/art/3d_skeletons/bipeds: humanoid_rig/rig male/models Message-ID: <200804120150.m3C1obcn026738@rzcomm22.rz.tu-bs.de> Author: xrenmilay Date: Sat Apr 12 04:08:44 2008 New Revision: 2441 Log: material revisions on th wf_male.emdl Envelope revisions on wf_rig.emdl Modified: trunk/art/3d_skeletons/bipeds/humanoid_rig/rig/wf_rig.emdl trunk/art/3d_skeletons/bipeds/male/models/wf_male.emdl Modified: trunk/art/3d_skeletons/bipeds/humanoid_rig/rig/wf_rig.emdl ============================================================================== Binary files. No diff available. Modified: trunk/art/3d_skeletons/bipeds/male/models/wf_male.emdl ============================================================================== Binary files. No diff available. From commitmsg at worldforge.de Sat Apr 12 05:31:37 2008 From: commitmsg at worldforge.de (commitmsg at worldforge.de) Date: Sat, 12 Apr 2008 14:31:37 +0200 (CEST) Subject: [WF-CVS] [WF-git] The Ember WorldForge client. branch, master, updated. a6d46d268d2cc092bdb0c7556f158a37d162b851 Message-ID: <20080412123138.E0CBC2937801E@worldforge.de> The branch, master has been updated via a6d46d268d2cc092bdb0c7556f158a37d162b851 (commit) via bd81961c0f697fefcc81f6e1e6fa81f3435714bc (commit) via 551a61ed240fa7636d575cea844e73a5e4a369ec (commit) via e0d6a6d77839ec9fd4c55720119dbac2d9b94470 (commit) via e9a3e63a00f642f57afe9b7a4a8bb730418438ad (commit) from 6b80ed0ca509583f440be25237cded10ab9ad64f (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 a6d46d268d2cc092bdb0c7556f158a37d162b851 Author: Erik Hjortsberg Date: Sat Apr 12 14:30:51 2008 +0200 Update materials after jayr's new additions. commit bd81961c0f697fefcc81f6e1e6fa81f3435714bc Author: Erik Hjortsberg Date: Sat Apr 12 14:29:39 2008 +0200 Use a standard panel since this element should have no border. commit 551a61ed240fa7636d575cea844e73a5e4a369ec Author: Erik Hjortsberg Date: Sat Apr 12 14:25:10 2008 +0200 Render the gui after the regular Ogre render queues, thus ensuring that it's always on top. commit e0d6a6d77839ec9fd4c55720119dbac2d9b94470 Author: Erik Hjortsberg Date: Sat Apr 12 13:34:39 2008 +0200 Sync with calum trunk. commit e9a3e63a00f642f57afe9b7a4a8bb730418438ad Author: Erik Hjortsberg Date: Sat Apr 12 13:22:58 2008 +0200 Use different shader programs depending on how many textures will be used. This is more efficient than having if-statments all over the place. ----------------------------------------------------------------------- Summary of changes: media/materials/overlays/Compass.overlay | 2 +- media/materials/scripts/buildings.material | 21 + media/materials/scripts/creatures.material | 29 +- media/materials/scripts/environment.material | 120 ++++ media/materials/splatting/Splat.cg | 679 +++++++++++++++++++- media/materials/splatting/splat.program | 98 +++- media/packs/Caelum.zip | Bin 748524 -> 749472 bytes src/components/ogre/GUIManager.cpp | 14 +- .../ogre/environment/caelum/include/SkyDome.h | 10 - .../ogre/environment/caelum/include/Starfield.h | 9 - .../environment/caelum/src/GeometryFactory.cpp | 19 +- .../ogre/environment/caelum/src/SkyDome.cpp | 110 +--- .../ogre/environment/caelum/src/Starfield.cpp | 44 +-- .../modeldefinitions/modelmappings.modelmap.xml | 47 ++- .../TerrainPageSurfaceCompilerTechniqueShader.cpp | 20 +- 15 files changed, 1004 insertions(+), 218 deletions(-) Changeset truncated at 500 lines: diff --git a/media/materials/overlays/Compass.overlay b/media/materials/overlays/Compass.overlay index a3dd0db..43c3d85 100644 --- a/media/materials/overlays/Compass.overlay +++ b/media/materials/overlays/Compass.overlay @@ -1,6 +1,6 @@ CompassOverlay { - container BorderPanel(CompassOverlayPanel) + container Panel(CompassOverlayPanel) { metrics_mode pixels vert_align top diff --git a/media/materials/scripts/buildings.material b/media/materials/scripts/buildings.material index 95bb44f..f5775ac 100644 --- a/media/materials/scripts/buildings.material +++ b/media/materials/scripts/buildings.material @@ -398,6 +398,27 @@ 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/foundation_brick : /base/normalmap/specular +{ + set_texture_alias DiffuseMap 3d_objects/items/building_element/textures/foundation_brick/D.png + set_texture_alias NormalHeightMap 3d_objects/items/building_element/textures/foundation_brick/N.png + set_texture_alias SpecularMap 3d_objects/items/building_element/textures/foundation_brick/S.png +} + +material /global/items/building_element/rezpa_column : /base/normalmap/specular +{ + set_texture_alias DiffuseMap 3d_objects/items/building_element/textures/rezpa_column/D.png + set_texture_alias NormalHeightMap 3d_objects/items/building_element/textures/rezpa_column/N.png + set_texture_alias SpecularMap 3d_objects/items/building_element/textures/rezpa_column/S.png +} + +material /global/items/building_element/ozark_brick : /base/normalmap/specular +{ + set_texture_alias DiffuseMap 3d_objects/items/building_element/textures/ozark_brick/D.png + set_texture_alias NormalHeightMap 3d_objects/items/building_element/textures/ozark_brick/N.png + set_texture_alias SpecularMap 3d_objects/items/building_element/textures/ozark_brick/S.png +} + // material /global/items/building/castle/foundation diff --git a/media/materials/scripts/creatures.material b/media/materials/scripts/creatures.material index b07fc43..6db9f30 100755 --- a/media/materials/scripts/creatures.material +++ b/media/materials/scripts/creatures.material @@ -91,14 +91,14 @@ material /global/creatures/humanoid/humanoid : /base/simple set_texture_alias DiffuseMap 3d_objects/creatures/humanoid/textures/humanoid/humanoid_body.png } -material /global/bipeds/goblin/body : /base/simple +material /global/bipeds/races/goblin/male/body : /base/simple { - set_texture_alias DiffuseMap 3d_skeletons/bipeds/textures/goblin/body.png + set_texture_alias DiffuseMap 3d_skeletons/bipeds/races/goblin/male/body/D.png } -material /global/bipeds/goblin/head : /base/simple +material /global/bipeds/races/goblin/male/head : /base/simple { - set_texture_alias DiffuseMap 3d_skeletons/bipeds/textures/goblin/head.png + set_texture_alias DiffuseMap 3d_skeletons/bipeds/races/goblin/male/head/D.png } material /global/creature/humanoid/kobold : /base/simple @@ -112,27 +112,6 @@ material /global/bipeds/male/male : /base/simple set_texture_alias DiffuseMap 3d_skeletons/bipeds/textures/male/maleD.png } -material /global/bipeds/drystan_archer/drystan_archer_footwear : /base/normalmap/specular -{ - set_texture_alias DiffuseMap 3d_skeletons/bipeds/textures/drystan_archer/drystan_archer_footwearD.png - set_texture_alias NormalHeightMap 3d_skeletons/bipeds/textures/drystan_archer/drystan_archer_footwearN.png - set_texture_alias SpecularMap 3d_skeletons/bipeds/textures/drystan_archer/drystan_archer_footwearS.png -} - -material /global/bipeds/drystan_archer/drystan_archer_shirt : /base/normalmap/specular -{ - set_texture_alias DiffuseMap 3d_skeletons/bipeds/textures/drystan_archer/drystan_archer_shirtD.png - set_texture_alias NormalHeightMap 3d_skeletons/bipeds/textures/drystan_archer/drystan_archer_shirtN.png - set_texture_alias SpecularMap 3d_skeletons/bipeds/textures/drystan_archer/drystan_archer_shirtS.png -} - -material /global/bipeds/drystan_archer/drystan_archer_pants : /base/normalmap/specular -{ - set_texture_alias DiffuseMap 3d_skeletons/bipeds/textures/drystan_archer/drystan_archer_pantsD.png - set_texture_alias NormalHeightMap 3d_skeletons/bipeds/textures/drystan_archer/drystan_archer_pantsN.png - set_texture_alias SpecularMap 3d_skeletons/bipeds/textures/drystan_archer/drystan_archer_pantsS.png -} - material /global/bipeds/male_body : /base/normalmap/specular { set_texture_alias DiffuseMap 3d_skeletons/bipeds/textures/male_body/male_bodyD.png diff --git a/media/materials/scripts/environment.material b/media/materials/scripts/environment.material index 5151659..9d5118b 100644 --- a/media/materials/scripts/environment.material +++ b/media/materials/scripts/environment.material @@ -53,6 +53,33 @@ material /global/environment/stone/stone_boulder_mossy : /base/simple set_texture_alias DiffuseMap 3d_objects/environment/stone/textures/stone_boulder_mossy/stone.png } +material /global/environment/boulder/felsite : /base/normalmap/specular +{ + set_texture_alias DiffuseMap 3d_objects/environment/boulder/textures/felsite/D.png + set_texture_alias NormalHeightMap 3d_objects/environment/boulder/textures/felsite/N.png + set_texture_alias SpecularMap 3d_objects/environment/boulder/textures/felsite/S.png +} + +material /global/environment/boulder/felsite_face : /base/normalmap/specular +{ + set_texture_alias DiffuseMap 3d_objects/environment/boulder/textures/felsite_face/D.png + set_texture_alias NormalHeightMap 3d_objects/environment/boulder/textures/felsite_face/N.png + set_texture_alias SpecularMap 3d_objects/environment/boulder/textures/felsite_face/S.png +} + +material /global/environment/boulder/granite : /base/normalmap/specular +{ + set_texture_alias DiffuseMap 3d_objects/environment/boulder/textures/granite/D.png + set_texture_alias NormalHeightMap 3d_objects/environment/boulder/textures/granite/N.png + set_texture_alias SpecularMap 3d_objects/environment/boulder/textures/granite/S.png +} + +material /global/environment/boulder/moraf : /base/normalmap/specular +{ + set_texture_alias DiffuseMap 3d_objects/environment/boulder/textures/moraf/D.png + set_texture_alias NormalHeightMap 3d_objects/environment/boulder/textures/moraf/N.png + set_texture_alias SpecularMap 3d_objects/environment/boulder/textures/moraf/S.png +} @@ -86,6 +113,99 @@ material /global/environment/ground/sand/sand : /base/normalmap set_texture_alias NormalHeightMap 3d_objects/environment/ground/textures/sand/sand_AN.png } +material /global/environment/cave : /base/normalmap/specular +{ + set_texture_alias DiffuseMap 3d_objects/environment/cave/textures/D.png + set_texture_alias NormalHeightMap 3d_objects/environment/cave/textures/N.png + set_texture_alias SpecularMap 3d_objects/environment/cave/textures/S.png +} + +material /global/environment/spanish_moss : /base/normalmap/specular/nonculled/alpharejected +{ + set_texture_alias DiffuseMap 3d_objects/environment/spanish_moss/textures/D.png + set_texture_alias NormalHeightMap 3d_objects/environment/spanish_moss/textures/N.png + set_texture_alias SpecularMap 3d_objects/environment/spanish_moss/textures/S.png + technique NormalMapped + { + pass Main + { + alpha_rejection greater_equal 160 + } + } + technique NormalMappedOld + { + pass Main + { + alpha_rejection greater_equal 160 + } + } + technique General + { + pass Main + { + alpha_rejection greater_equal 160 + } + } + technique GeneralDistance + { + pass Main + { + alpha_rejection greater_equal 160 + } + } +} + +material /global/environment/roots : /base/normalmap/specular/nonculled/alpharejected +{ + set_texture_alias DiffuseMap 3d_objects/environment/roots/textures/D.png + set_texture_alias NormalHeightMap 3d_objects/environment/roots/textures/N.png + set_texture_alias SpecularMap 3d_objects/environment/roots/textures/S.png + technique NormalMapped + { + pass Main + { + alpha_rejection greater_equal 160 + } + } + technique NormalMappedOld + { + pass Main + { + alpha_rejection greater_equal 160 + } + } + technique General + { + pass Main + { + alpha_rejection greater_equal 160 + } + } + technique GeneralDistance + { + pass Main + { + alpha_rejection greater_equal 160 + } + } +} + +material /global/environment/stalactites : /base/normalmap/specular +{ + set_texture_alias DiffuseMap 3d_objects/environment/stalactites/textures/D.png + set_texture_alias NormalHeightMap 3d_objects/environment/stalactites/textures/N.png + set_texture_alias SpecularMap 3d_objects/environment/stalactites/textures/S.png +} + + + + + + + + + + material /global/environment/water/simple { technique diff --git a/media/materials/splatting/Splat.cg b/media/materials/splatting/Splat.cg index 09cd580..48b3421 100644 --- a/media/materials/splatting/Splat.cg +++ b/media/materials/splatting/Splat.cg @@ -155,7 +155,7 @@ void fog_linear_vp // Fragment program for automatic terrain texture generation -void splat_fp +void splat_fp_dynamic ( float2 iCoverage : TEXCOORD0, float2 iTexcoord : TEXCOORD1, @@ -241,6 +241,683 @@ void splat_fp } +void splat_fp_1 +( + float2 iCoverage : TEXCOORD0, + float2 iTexcoord : TEXCOORD1, + float iFog : FOG, + + uniform float4 iLightDiffuse, + uniform float4 iLightSpecular, + uniform float4 iLightAmbient, + uniform float4 iFogColour, + + out float4 oColour : COLOR, + + uniform float4 iScales[4], + uniform sampler2D shadowTexture: TEXUNIT0, + uniform sampler2D baseTextureDiffuse: TEXUNIT1 +) +{ + //tile = 0.0025; +// float fogFactor = exp2(-abs(iFog)); + + //only do lerp if we can see the pixels (i.e. not when in full fog + if (iFog < 1) { + //iTexcoord = iTexcoord * 16.0f; + + oColour = tex2D(baseTextureDiffuse, iTexcoord.xy * iScales[0].x); + + //shadow, we'll multiply by the diffuse light + oColour *= (tex2D(shadowTexture, iCoverage.xy).x * iLightDiffuse); + + oColour = lerp(oColour, iFogColour, iFog); + } else { + oColour = iFogColour; + } +} + + + +void splat_fp_2 +( + float2 iCoverage : TEXCOORD0, + float2 iTexcoord : TEXCOORD1, + float iFog : FOG, + + uniform float4 iLightDiffuse, + uniform float4 iLightSpecular, + uniform float4 iLightAmbient, + uniform float4 iFogColour, + + out float4 oColour : COLOR, + + uniform float4 iScales[4], + uniform sampler2D shadowTexture: TEXUNIT0, + uniform sampler2D baseTextureDiffuse: TEXUNIT1, + uniform sampler2D coverageTexture1: TEXUNIT2, + uniform sampler2D splat1TextureDiffuse: TEXUNIT3, + uniform sampler2D splat2TextureDiffuse: TEXUNIT4, + uniform sampler2D splat3TextureDiffuse: TEXUNIT5, + uniform sampler2D splat4TextureDiffuse: TEXUNIT6, + uniform sampler2D coverageTexture2: TEXUNIT7, + uniform sampler2D splat5TextureDiffuse: TEXUNIT8, + uniform sampler2D splat6TextureDiffuse: TEXUNIT9, + uniform sampler2D splat7TextureDiffuse: TEXUNIT10, + uniform sampler2D splat8TextureDiffuse: TEXUNIT11, + uniform sampler2D coverageTexture3: TEXUNIT12, + uniform sampler2D splat9TextureDiffuse: TEXUNIT13, + uniform sampler2D splat10TextureDiffuse: TEXUNIT14, + uniform sampler2D splat11TextureDiffuse: TEXUNIT15 +) +{ + //tile = 0.0025; +// float fogFactor = exp2(-abs(iFog)); + + //only do lerp if we can see the pixels (i.e. not when in full fog + if (iFog < 1) { + //iTexcoord = iTexcoord * 16.0f; + + oColour = tex2D(baseTextureDiffuse, iTexcoord.xy * iScales[0].x); + oColour = (lerp(oColour, tex2D(splat1TextureDiffuse, iTexcoord.xy * iScales[0].y), tex2D(coverageTexture1, iCoverage.xy).w)); + + //shadow, we'll multiply by the diffuse light + oColour *= (tex2D(shadowTexture, iCoverage.xy).x * iLightDiffuse); + + oColour = lerp(oColour, iFogColour, iFog); + } else { + oColour = iFogColour; + } +} + + + +void splat_fp_3 +( + float2 iCoverage : TEXCOORD0, + float2 iTexcoord : TEXCOORD1, + float iFog : FOG, + + uniform float4 iLightDiffuse, + uniform float4 iLightSpecular, + uniform float4 iLightAmbient, + uniform float4 iFogColour, + + out float4 oColour : COLOR, + + uniform float4 iScales[4], + uniform sampler2D shadowTexture: TEXUNIT0, + uniform sampler2D baseTextureDiffuse: TEXUNIT1, + uniform sampler2D coverageTexture1: TEXUNIT2, + uniform sampler2D splat1TextureDiffuse: TEXUNIT3, + uniform sampler2D splat2TextureDiffuse: TEXUNIT4, + uniform sampler2D splat3TextureDiffuse: TEXUNIT5, + uniform sampler2D splat4TextureDiffuse: TEXUNIT6, + uniform sampler2D coverageTexture2: TEXUNIT7, + uniform sampler2D splat5TextureDiffuse: TEXUNIT8, + uniform sampler2D splat6TextureDiffuse: TEXUNIT9, + uniform sampler2D splat7TextureDiffuse: TEXUNIT10, + uniform sampler2D splat8TextureDiffuse: TEXUNIT11, + uniform sampler2D coverageTexture3: TEXUNIT12, + uniform sampler2D splat9TextureDiffuse: TEXUNIT13, + uniform sampler2D splat10TextureDiffuse: TEXUNIT14, + uniform sampler2D splat11TextureDiffuse: TEXUNIT15 +) +{ + //tile = 0.0025; +// float fogFactor = exp2(-abs(iFog)); + + //only do lerp if we can see the pixels (i.e. not when in full fog + if (iFog < 1) { + //iTexcoord = iTexcoord * 16.0f; + + oColour = tex2D(baseTextureDiffuse, iTexcoord.xy * iScales[0].x); + oColour = (lerp(oColour, tex2D(splat1TextureDiffuse, iTexcoord.xy * iScales[0].y), tex2D(coverageTexture1, iCoverage.xy).w)); + oColour = (lerp(oColour, tex2D(splat2TextureDiffuse, iTexcoord.xy * iScales[0].z), tex2D(coverageTexture1, iCoverage.xy).x)); + + //shadow, we'll multiply by the diffuse light + oColour *= (tex2D(shadowTexture, iCoverage.xy).x * iLightDiffuse); + + oColour = lerp(oColour, iFogColour, iFog); + } else { + oColour = iFogColour; + } +} + + + +void splat_fp_4 +( + float2 iCoverage : TEXCOORD0, + float2 iTexcoord : TEXCOORD1, + float iFog : FOG, + + uniform float4 iLightDiffuse, + uniform float4 iLightSpecular, + uniform float4 iLightAmbient, + uniform float4 iFogColour, + + out float4 oColour : COLOR, + + uniform float4 iScales[4], + uniform sampler2D shadowTexture: TEXUNIT0, + uniform sampler2D baseTextureDiffuse: TEXUNIT1, + uniform sampler2D coverageTexture1: TEXUNIT2, + uniform sampler2D splat1TextureDiffuse: TEXUNIT3, + uniform sampler2D splat2TextureDiffuse: TEXUNIT4, + uniform sampler2D splat3TextureDiffuse: TEXUNIT5, + uniform sampler2D splat4TextureDiffuse: TEXUNIT6, + uniform sampler2D coverageTexture2: TEXUNIT7, + uniform sampler2D splat5TextureDiffuse: TEXUNIT8, + uniform sampler2D splat6TextureDiffuse: TEXUNIT9, + uniform sampler2D splat7TextureDiffuse: TEXUNIT10, + uniform sampler2D splat8TextureDiffuse: TEXUNIT11, + uniform sampler2D coverageTexture3: TEXUNIT12, + uniform sampler2D splat9TextureDiffuse: TEXUNIT13, + uniform sampler2D splat10TextureDiffuse: TEXUNIT14, + uniform sampler2D splat11TextureDiffuse: TEXUNIT15 +) +{ + //tile = 0.0025; +// float fogFactor = exp2(-abs(iFog)); + + //only do lerp if we can see the pixels (i.e. not when in full fog + if (iFog < 1) { + //iTexcoord = iTexcoord * 16.0f; + + oColour = tex2D(baseTextureDiffuse, iTexcoord.xy * iScales[0].x); + oColour = (lerp(oColour, tex2D(splat1TextureDiffuse, iTexcoord.xy * iScales[0].y), tex2D(coverageTexture1, iCoverage.xy).w)); + oColour = (lerp(oColour, tex2D(splat2TextureDiffuse, iTexcoord.xy * iScales[0].z), tex2D(coverageTexture1, iCoverage.xy).x)); + oColour = (lerp(oColour, tex2D(splat3TextureDiffuse, iTexcoord.xy * iScales[0].w), tex2D(coverageTexture1, iCoverage.xy).y)); + + //shadow, we'll multiply by the diffuse light + oColour *= (tex2D(shadowTexture, iCoverage.xy).x * iLightDiffuse); + + oColour = lerp(oColour, iFogColour, iFog); + } else { + oColour = iFogColour; + } +} + + + +void splat_fp_5 +( + float2 iCoverage : TEXCOORD0, + float2 iTexcoord : TEXCOORD1, + float iFog : FOG, + + uniform float4 iLightDiffuse, + uniform float4 iLightSpecular, + uniform float4 iLightAmbient, + uniform float4 iFogColour, + + out float4 oColour : COLOR, + + uniform float4 iScales[4], + uniform sampler2D shadowTexture: TEXUNIT0, + uniform sampler2D baseTextureDiffuse: TEXUNIT1, + uniform sampler2D coverageTexture1: TEXUNIT2, + uniform sampler2D splat1TextureDiffuse: TEXUNIT3, + uniform sampler2D splat2TextureDiffuse: TEXUNIT4, + uniform sampler2D splat3TextureDiffuse: TEXUNIT5, + uniform sampler2D splat4TextureDiffuse: TEXUNIT6 +) +{ + //tile = 0.0025; +// float fogFactor = exp2(-abs(iFog)); + + //only do lerp if we can see the pixels (i.e. not when in full fog + if (iFog < 1) { + //iTexcoord = iTexcoord * 16.0f; + + oColour = tex2D(baseTextureDiffuse, iTexcoord.xy * iScales[0].x); + oColour = (lerp(oColour, tex2D(splat1TextureDiffuse, iTexcoord.xy * iScales[0].y), tex2D(coverageTexture1, iCoverage.xy).w)); + oColour = (lerp(oColour, tex2D(splat2TextureDiffuse, iTexcoord.xy * iScales[0].z), tex2D(coverageTexture1, iCoverage.xy).x)); + oColour = (lerp(oColour, tex2D(splat3TextureDiffuse, iTexcoord.xy * iScales[0].w), tex2D(coverageTexture1, iCoverage.xy).y)); + oColour = (lerp(oColour, tex2D(splat4TextureDiffuse, iTexcoord.xy * iScales[0].x), tex2D(coverageTexture1, iCoverage.xy).z)); + + //shadow, we'll multiply by the diffuse light + oColour *= (tex2D(shadowTexture, iCoverage.xy).x * iLightDiffuse); + + oColour = lerp(oColour, iFogColour, iFog); + } else { + oColour = iFogColour; + } +} + + + +void splat_fp_6 +( + float2 iCoverage : TEXCOORD0, -- The Ember WorldForge client. From commitmsg at worldforge.de Sat Apr 12 06:41:55 2008 From: commitmsg at worldforge.de (commitmsg at worldforge.de) Date: Sat, 12 Apr 2008 15:41:55 +0200 (CEST) Subject: [WF-CVS] [WF-git] The Ember WorldForge client. branch, master, updated. fea9d50962c1872ad45c962bbb41906e728beb1f Message-ID: <20080412134155.6A06E2937801E@worldforge.de> The branch, master has been updated via fea9d50962c1872ad45c962bbb41906e728beb1f (commit) from a6d46d268d2cc092bdb0c7556f158a37d162b851 (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 fea9d50962c1872ad45c962bbb41906e728beb1f Author: Erik Hjortsberg Date: Sat Apr 12 15:41:49 2008 +0200 Use scaling values which are more sane for the cale of the world (1 unit == 1 meter) ----------------------------------------------------------------------- Summary of changes: media/materials/base_scripts/base.material | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/media/materials/base_scripts/base.material b/media/materials/base_scripts/base.material index b2743bc..ae308dc 100644 --- a/media/materials/base_scripts/base.material +++ b/media/materials/base_scripts/base.material @@ -87,7 +87,9 @@ material /base/normalmap param_named_auto lightAmbient ambient_light_colour 0 param_named_auto iFogColour fog_colour 0 // Parallax Height scale and bias - param_named scaleBias float4 0.04 -0.02 1 0 + param_named scaleBias float4 0.0004 -0.002 1 0 +// param_named scaleBias float4 0.0 0.0 0.0 0.0 +// param_named scaleBias float4 0.04 -0.02 1 0 // param_named specularBias float 0 } @@ -129,7 +131,9 @@ material /base/normalmap param_indexed 1 float3 0 0 0 //param_indexed_auto 2 ambient_light_colour 0 // Parallax Height scale and bias/base/normalmap_example - param_indexed 2 float4 0.04 -0.02 1 0 + param_indexed 2 float4 0.0004 -0.002 1 0 +// param_indexed 2 float4 0.0 0.0 0.0 0.0 +// param_indexed 2 float4 0.04 -0.02 1 0 //param_indexed 4 float 0 } @@ -207,7 +211,9 @@ material /base/normalmap/specular param_named_auto lightAmbient ambient_light_colour 0 param_named_auto iFogColour fog_colour 0 // Parallax Height scale and bias - param_named scaleBias float4 0.04 -0.02 1 0 + param_named scaleBias float4 0.0004 -0.002 1 0 +// param_named scaleBias float4 0.0 0.0 0.0 0.0 +// param_named scaleBias float4 0.04 -0.02 1 0 // param_named specularBias float 1 -- The Ember WorldForge client. From commitmsg at worldforge.de Sat Apr 12 06:43:39 2008 From: commitmsg at worldforge.de (commitmsg at worldforge.de) Date: Sat, 12 Apr 2008 15:43:39 +0200 (CEST) Subject: [WF-CVS] [WF-git] The Ember WorldForge client. branch, master, updated. 85ab701112e2240abb9d0136fe7ba9e63f3057fb Message-ID: <20080412134340.3BDF72937801E@worldforge.de> The branch, master has been updated via 85ab701112e2240abb9d0136fe7ba9e63f3057fb (commit) from fea9d50962c1872ad45c962bbb41906e728beb1f (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 85ab701112e2240abb9d0136fe7ba9e63f3057fb Author: Erik Hjortsberg Date: Sat Apr 12 15:43:00 2008 +0200 Update after media changes. ----------------------------------------------------------------------- Summary of changes: media/materials/scripts/creatures.material | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) Changeset truncated at 500 lines: diff --git a/media/materials/scripts/creatures.material b/media/materials/scripts/creatures.material index 6db9f30..68987a2 100755 --- a/media/materials/scripts/creatures.material +++ b/media/materials/scripts/creatures.material @@ -134,9 +134,9 @@ material /global/bipeds/male_head : /base/normalmap/specular material /global/bipeds/races/human/male/body/base : /base/normalmap/specular { - set_texture_alias DiffuseMap 3d_skeletons/bipeds/races/human/male/body/base/D.tga - set_texture_alias NormalHeightMap 3d_skeletons/bipeds/races/human/male/body/base/N.tga - set_texture_alias SpecularMap 3d_skeletons/bipeds/races/human/male/body/base/S.tga + set_texture_alias DiffuseMap 3d_skeletons/bipeds/races/human/male/body/base/D.png + set_texture_alias NormalHeightMap 3d_skeletons/bipeds/races/human/male/body/base/N.png + set_texture_alias SpecularMap 3d_skeletons/bipeds/races/human/male/body/base/S.png } material /global/bipeds/races/universal/eyes/blue : /base/simple @@ -167,9 +167,9 @@ material /global/bipeds/races/human/male/head/bearded_male : /base/simple material /global/bipeds/races/human/male/head/middle_aged : /base/normalmap/specular { - set_texture_alias DiffuseMap 3d_skeletons/bipeds/races/human/male/head/middle_aged/D.tga - set_texture_alias NormalHeightMap 3d_skeletons/bipeds/races/human/male/head/middle_aged/N.tga - set_texture_alias SpecularMap 3d_skeletons/bipeds/races/human/male/head/middle_aged/S.tga + set_texture_alias DiffuseMap 3d_skeletons/bipeds/races/human/male/head/middle_aged/D.png + set_texture_alias NormalHeightMap 3d_skeletons/bipeds/races/human/male/head/middle_aged/N.png + set_texture_alias SpecularMap 3d_skeletons/bipeds/races/human/male/head/middle_aged/S.png } material /global/bipeds/races/human/male/attire/drystan_archer/footwear : /base/normalmap/specular -- The Ember WorldForge client. From commitmsg at worldforge.de Sat Apr 12 08:42:41 2008 From: commitmsg at worldforge.de (commitmsg at worldforge.de) Date: Sat, 12 Apr 2008 17:42:41 +0200 (CEST) Subject: [WF-CVS] [WF-git] The Ember WorldForge client. branch, master, updated. 58f5894236d9800aaa47508e16849b22e3d1ab9e Message-ID: <20080412154242.89AAF29378020@worldforge.de> The branch, master has been updated via 58f5894236d9800aaa47508e16849b22e3d1ab9e (commit) from 85ab701112e2240abb9d0136fe7ba9e63f3057fb (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 58f5894236d9800aaa47508e16849b22e3d1ab9e Author: Erik Hjortsberg Date: Sat Apr 12 17:42:35 2008 +0200 Moved duplicate param bindings to the base program declaration so to avoid duplication. ----------------------------------------------------------------------- Summary of changes: media/materials/base_scripts/base.material | 19 +++---------------- media/materials/programs/Common.program | 17 +++++++++++++++++ 2 files changed, 20 insertions(+), 16 deletions(-) Changeset truncated at 500 lines: diff --git a/media/materials/base_scripts/base.material b/media/materials/base_scripts/base.material index ae308dc..e5957e6 100644 --- a/media/materials/base_scripts/base.material +++ b/media/materials/base_scripts/base.material @@ -73,21 +73,15 @@ material /base/normalmap // Vertex program reference vertex_program_ref Examples/OffsetMappingVP { - param_named_auto lightPosition light_position_object_space 0 - param_named_auto eyePosition camera_position_object_space - param_named_auto worldViewProj worldviewproj_matrix - param_named_auto iFogParams fog_params 0 } // Fragment program fragment_program_ref Examples/OffsetMappingFP { - param_named_auto lightDiffuse light_diffuse_colour 0 + //force the specular to 0 to disable it param_named lightSpecular float3 0 0 0 - param_named_auto lightAmbient ambient_light_colour 0 - param_named_auto iFogColour fog_colour 0 // Parallax Height scale and bias - param_named scaleBias float4 0.0004 -0.002 1 0 +// param_named scaleBias float4 0.0004 -0.002 1 0 // param_named scaleBias float4 0.0 0.0 0.0 0.0 // param_named scaleBias float4 0.04 -0.02 1 0 // param_named specularBias float 0 @@ -197,21 +191,14 @@ material /base/normalmap/specular // Vertex program reference vertex_program_ref Examples/OffsetMappingVP { - param_named_auto lightPosition light_position_object_space 0 - param_named_auto eyePosition camera_position_object_space - param_named_auto worldViewProj worldviewproj_matrix - param_named_auto iFogParams fog_params 0 } // Fragment program fragment_program_ref Examples/OffsetMappingFP { - param_named_auto lightDiffuse light_diffuse_colour 0 param_named_auto lightSpecular light_specular_colour 0 - param_named_auto lightAmbient ambient_light_colour 0 - param_named_auto iFogColour fog_colour 0 // Parallax Height scale and bias - param_named scaleBias float4 0.0004 -0.002 1 0 +// param_named scaleBias float4 0.0004 -0.002 1 0 // param_named scaleBias float4 0.0 0.0 0.0 0.0 // param_named scaleBias float4 0.04 -0.02 1 0 // param_named specularBias float 1 diff --git a/media/materials/programs/Common.program b/media/materials/programs/Common.program index 15c9bb5..7016611 100644 --- a/media/materials/programs/Common.program +++ b/media/materials/programs/Common.program @@ -32,6 +32,14 @@ vertex_program Examples/OffsetMappingVP cg source OffsetMapping.cg entry_point main_vp profiles vs_1_1 arbvp1 + + default_params + { + param_named_auto lightPosition light_position_object_space 0 + param_named_auto eyePosition camera_position_object_space + param_named_auto worldViewProj worldviewproj_matrix + param_named_auto iFogParams fog_params 0 + } } // Bump map with parallax fragment program @@ -40,6 +48,15 @@ fragment_program Examples/OffsetMappingFP cg source OffsetMapping.cg entry_point main_fp profiles ps_2_0 arbfp1 + + default_params + { + param_named_auto lightDiffuse light_diffuse_colour 0 + param_named_auto lightAmbient ambient_light_colour 0 + param_named_auto iFogColour fog_colour 0 + param_named scaleBias float4 0.0004 -0.002 1 0 + } + } // Bump map with parallax fragment program -- The Ember WorldForge client. From commitmsg at worldforge.de Sat Apr 12 08:43:39 2008 From: commitmsg at worldforge.de (commitmsg at worldforge.de) Date: Sat, 12 Apr 2008 17:43:39 +0200 (CEST) Subject: [WF-CVS] [WF-git] The Ember WorldForge client. branch, master, updated. ba68f9d7172a71cd3a55ca4839df9bf78037746d Message-ID: <20080412154339.9E07029378020@worldforge.de> The branch, master has been updated via ba68f9d7172a71cd3a55ca4839df9bf78037746d (commit) from 58f5894236d9800aaa47508e16849b22e3d1ab9e (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 ba68f9d7172a71cd3a55ca4839df9bf78037746d Author: Erik Hjortsberg Date: Sat Apr 12 17:43:32 2008 +0200 Update materials to cope with changes in the media repo. ----------------------------------------------------------------------- Summary of changes: media/materials/scripts/creatures.material | 6 ++---- media/materials/scripts/environment.material | 9 --------- 2 files changed, 2 insertions(+), 13 deletions(-) Changeset truncated at 500 lines: diff --git a/media/materials/scripts/creatures.material b/media/materials/scripts/creatures.material index 68987a2..eed5972 100755 --- a/media/materials/scripts/creatures.material +++ b/media/materials/scripts/creatures.material @@ -66,13 +66,11 @@ material /global/creature/insect/carrion : /base/simple set_texture_alias DiffuseMap 3d_objects/creatures/insect/textures/carrion/insect.png } -material /global/body_parts/skeleton/bone/skeleton : /base/simple +material /global/bipeds/races/skeleton/body/white : /base/simple { - set_texture_alias DiffuseMap 3d_objects/body_parts/skeleton/textures/bone/skeleton.png + set_texture_alias DiffuseMap 3d_skeletons/bipeds/races/skeleton/body/textures/white/D.png } - - //---------------- //---- Humanoid creatures diff --git a/media/materials/scripts/environment.material b/media/materials/scripts/environment.material index 9d5118b..a6b1954 100644 --- a/media/materials/scripts/environment.material +++ b/media/materials/scripts/environment.material @@ -38,15 +38,6 @@ material /global/fire } } -material /global/environment/boulder/moraf_rock : /base/simple -{ - set_texture_alias DiffuseMap 3d_objects/environment/boulder/textures/moraf_rock/boulder.png -} - -material /global/environment/boulder/mossy_boulder : /base/simple -{ - set_texture_alias DiffuseMap 3d_objects/environment/boulder/textures/mossy_boulder/mossy_boulder.png -} material /global/environment/stone/stone_boulder_mossy : /base/simple { -- The Ember WorldForge client. From commitmsg at worldforge.de Sat Apr 12 08:45:34 2008 From: commitmsg at worldforge.de (commitmsg at worldforge.de) Date: Sat, 12 Apr 2008 17:45:34 +0200 (CEST) Subject: [WF-CVS] [WF-git] The Ember WorldForge client. branch, master, updated. 0c3a28dc0dd3b49555058c4bfecb5b49dd69f2a2 Message-ID: <20080412154537.AE1A929378022@worldforge.de> The branch, master has been updated via 0c3a28dc0dd3b49555058c4bfecb5b49dd69f2a2 (commit) from ba68f9d7172a71cd3a55ca4839df9bf78037746d (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 0c3a28dc0dd3b49555058c4bfecb5b49dd69f2a2 Author: Erik Hjortsberg Date: Sat Apr 12 17:45:24 2008 +0200 Duplicate model definitions should be logged as "info", since this is expected considering how we allow user defined media. ----------------------------------------------------------------------- Summary of changes: .../ogre/model/ModelDefinitionManager.cpp | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/src/components/ogre/model/ModelDefinitionManager.cpp b/src/components/ogre/model/ModelDefinitionManager.cpp index 9a5915f..ba67f79 100644 --- a/src/components/ogre/model/ModelDefinitionManager.cpp +++ b/src/components/ogre/model/ModelDefinitionManager.cpp @@ -82,7 +82,8 @@ const Ogre::NameValuePairList* createParams) { return Ogre::ResourceManager::create(name, group, isManual, loader, createParams); } - S_LOG_FAILURE("ModelDefinition with name " << name << " already exists."); + ///Report this. We count on this happening a lot (user media overriding shared media for example), so we will not consider it a failure. + S_LOG_INFO("ModelDefinition with name " << name << " already exists."); return Ogre::ResourcePtr(); } -- The Ember WorldForge client. From commitmsg at worldforge.de Sat Apr 12 09:51:32 2008 From: commitmsg at worldforge.de (commitmsg at worldforge.de) Date: Sat, 12 Apr 2008 18:51:32 +0200 (CEST) Subject: [WF-CVS] [WF-git] The Ember WorldForge client. branch, master, updated. 46e565567fffd01eb96cb20686781d13bfa84a70 Message-ID: <20080412165133.A41CC2937801E@worldforge.de> The branch, master has been updated via 46e565567fffd01eb96cb20686781d13bfa84a70 (commit) via 55f265b635989c915b85a25ac905c7881927b5c1 (commit) via 4d84acebd302ca419632b03923dd521255cef2bd (commit) from 0c3a28dc0dd3b49555058c4bfecb5b49dd69f2a2 (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 46e565567fffd01eb96cb20686781d13bfa84a70 Author: Erik Hjortsberg Date: Sat Apr 12 18:51:22 2008 +0200 Disable the unfinished compass/minimap for the 0.5.2 release. commit 55f265b635989c915b85a25ac905c7881927b5c1 Author: Erik Hjortsberg Date: Sat Apr 12 18:50:24 2008 +0200 Update definitions. commit 4d84acebd302ca419632b03923dd521255cef2bd Author: Erik Hjortsberg Date: Sat Apr 12 18:49:04 2008 +0200 Added new model defs for new media added by jayr. ----------------------------------------------------------------------- Summary of changes: src/components/ogre/modeldefinitions/cave.modeldef | 28 +++ .../ogre/modeldefinitions/cg_house.modeldef | 99 +++++----- .../ogre/modeldefinitions/creatures.modeldef.xml | 209 +++++++++++++------- .../ogre/modeldefinitions/environment.modeldef.xml | 8 +- .../ogre/modeldefinitions/graniteA.modeldef | 30 +++ .../ogre/modeldefinitions/graniteB.modeldef | 30 +++ .../ogre/modeldefinitions/graniteC.modeldef | 30 +++ .../ogre/modeldefinitions/graniteD.modeldef | 30 +++ .../ogre/modeldefinitions/morafboulder.modeldef | 45 +++++ .../ogre/modeldefinitions/roots.modeldef | 20 ++ .../ogre/modeldefinitions/spanish_moss.modeldef | 26 +++ .../ogre/modeldefinitions/stalactites.modeldef | 28 +++ .../ogre/modeldefinitions/stone_pallisade.modeldef | 27 +++ src/components/ogre/widgets/Bootstrap.lua | 4 +- 14 files changed, 483 insertions(+), 131 deletions(-) create mode 100644 src/components/ogre/modeldefinitions/cave.modeldef create mode 100644 src/components/ogre/modeldefinitions/graniteA.modeldef create mode 100644 src/components/ogre/modeldefinitions/graniteB.modeldef create mode 100644 src/components/ogre/modeldefinitions/graniteC.modeldef create mode 100644 src/components/ogre/modeldefinitions/graniteD.modeldef create mode 100644 src/components/ogre/modeldefinitions/morafboulder.modeldef create mode 100644 src/components/ogre/modeldefinitions/roots.modeldef create mode 100644 src/components/ogre/modeldefinitions/spanish_moss.modeldef create mode 100644 src/components/ogre/modeldefinitions/stalactites.modeldef create mode 100644 src/components/ogre/modeldefinitions/stone_pallisade.modeldef Changeset truncated at 500 lines: diff --git a/src/components/ogre/modeldefinitions/cave.modeldef b/src/components/ogre/modeldefinitions/cave.modeldef new file mode 100644 index 0000000..8750a1c --- /dev/null +++ b/src/components/ogre/modeldefinitions/cave.modeldef @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/components/ogre/modeldefinitions/cg_house.modeldef b/src/components/ogre/modeldefinitions/cg_house.modeldef index 8a89934..ad42886 100644 --- a/src/components/ogre/modeldefinitions/cg_house.modeldef +++ b/src/components/ogre/modeldefinitions/cg_house.modeldef @@ -1,51 +1,50 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/components/ogre/modeldefinitions/creatures.modeldef.xml b/src/components/ogre/modeldefinitions/creatures.modeldef.xml index 63442bf..e141125 100644 --- a/src/components/ogre/modeldefinitions/creatures.modeldef.xml +++ b/src/components/ogre/modeldefinitions/creatures.modeldef.xml @@ -163,7 +163,7 @@ - + @@ -202,32 +202,41 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -307,22 +316,35 @@ - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - + + + + + @@ -331,47 +353,82 @@ 36.0695 - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +