This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gem".
The branch, master has been updated
via e24789e8a73abcd3db728e4a84c5aa8263f0a14a (commit)
via f5690fe5370c1147d220ac1e18537e8134457877 (commit)
via 9687c5ad5fd0e22f4a3411cd5832baa2b162ae47 (commit)
via 12c0b5a5e47938c16ce3d138a5842b0651d03967 (commit)
via 672c87727814d0b8fb7e5081c8f5a532bc8fa9ad (commit)
via d0efd264670de97d917ea2f111d67ea91aa9f887 (commit)
via 72a28ce271ba5527ee175565dd833f9acccd575d (commit)
via fcc5efd7c193e7a48f803f7ae4377f217d05c687 (commit)
via bbb5eb52d99589675e7538ce034ddca1ab02f063 (commit)
via 5cc16c5772d4a43bd3bc0006da7d4cc3ea7ee5ce (commit)
via 80c921e11c563c75296caa8c9d9fb23df08377e8 (commit)
via 2c4f33c21d3027964e49c8178f7ca04327beae67 (commit)
via 127974da61f796ccb030a9285e7ac61c9fa7bf03 (commit)
via a285c2f24a021fdcb964efe09b8349cb98bcf40e (commit)
via 83428013a073d9d91164bedba8aa1a332ad3f1f0 (commit)
via a9bbae33ff0222ad714694081031dad8a3480c3b (commit)
via 8a086e35654c1f18faf5e6f0af4dc2e2d7260f43 (commit)
via 67f94ca3cd680b4761072de2b8f253aca82371d2 (commit)
via 1b938455ec73bde6ccd7101978b86e0efadad07c (commit)
via fb140d33ea4cafcb048e300a15964ec94985d721 (commit)
via c6e09d28b5ecb07dd6be07a92b2bf5ea79433068 (commit)
via cf632b01854ba6cbed34aec01bb60cc411a575f1 (commit)
via d50c15c20af892f4f55e2a2f2b084643cb7aa730 (commit)
via dfd6bb560e4499081c445664e33b685890a7ff2f (commit)
via 5f1a8f6c037a4f7fc626e76cce6ec1eda2a9b80e (commit)
via 9e8440ed923564add1707c0f086cc6dca5cd276d (commit)
via 1570bc9bfaa4eea8bdaa64b7be83059ae1f9d6cb (commit)
via 597ae30e2e85a62cc657f4046a1efa632bafaea7 (commit)
via cf688ede9f0092a67eac55a1b62b8f7be0c39151 (commit)
via 09449b0bfa6837c7b9ceee2185902590f1279612 (commit)
via c616c752256e2b8090a9da42dca26e46ed1eed14 (commit)
via ff2083e14c480b044fab1322318e847d562165c5 (commit)
via 82ff3ef242f895e401ed38c71f405b06ac393aed (commit)
from 290cc1a86d0bbda58b8b6209efe101a9484e7cd7 (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 e24789e8a73abcd3db728e4a84c5aa8263f0a14a
Merge: 290cc1a f5690fe
Author: IOhannes m zmölnig <zmoel...@iem.at>
Date: Thu Jan 5 19:21:45 2012 +0100
Merge branch 'model'
commit f5690fe5370c1147d220ac1e18537e8134457877
Author: IOhannes m zmölnig <zmoel...@iem.at>
Date: Thu Jan 5 19:18:40 2012 +0100
made textures work
and materials probably as well...
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 6 +
plugins/Makefile.am | 4 +
plugins/modelASSIMP/Makefile.am | 36 ++
plugins/modelASSIMP/README.txt | 9 +
plugins/modelASSIMP/modelASSIMP.cpp | 403 +++++++++++++++++++++++
plugins/modelASSIMP/modelASSIMP.h | 78 +++++
plugins/modelOBJ/Makefile.am | 37 ++
plugins/modelOBJ/modelOBJ.cpp | 188 +++++++++++
plugins/modelOBJ/modelOBJ.h | 72 ++++
{src/Geos => plugins/modelOBJ}/model_loader.cpp | 52 ++--
{src/Geos => plugins/modelOBJ}/model_loader.h | 16 +-
src/Gem/Properties.cpp | 6 +-
src/Gem/State.h | 5 +-
src/Geos/Makefile.am | 7 +-
src/Geos/model.cpp | 255 ++++++---------
src/Geos/model.h | 147 ++++-----
src/Geos/multimodel.cpp | 333 +++++++------------
src/Geos/multimodel.h | 82 +----
src/Pixes/pix_texture.cpp | 14 +-
src/Pixes/pix_texture.h | 5 +-
src/plugins/Makefile.am | 16 +-
src/plugins/modelloader.cpp | 219 ++++++++++++
src/plugins/modelloader.h | 150 +++++++++
23 files changed, 1559 insertions(+), 581 deletions(-)
create mode 100644 plugins/modelASSIMP/Makefile.am
create mode 100644 plugins/modelASSIMP/README.txt
create mode 100644 plugins/modelASSIMP/modelASSIMP.cpp
create mode 100644 plugins/modelASSIMP/modelASSIMP.h
create mode 100644 plugins/modelOBJ/Makefile.am
create mode 100644 plugins/modelOBJ/modelOBJ.cpp
create mode 100644 plugins/modelOBJ/modelOBJ.h
rename {src/Geos => plugins/modelOBJ}/model_loader.cpp (97%)
rename {src/Geos => plugins/modelOBJ}/model_loader.h (96%)
create mode 100644 src/plugins/modelloader.cpp
create mode 100644 src/plugins/modelloader.h
hooks/post-receive
--
Gem
------------------------------------------------------------------------------
Ridiculously easy VDI. With Citrix VDI-in-a-Box, you don't need a complex
infrastructure or vast IT resources to deliver seamless, secure access to
virtual desktops. With this all-in-one solution, easily deploy virtual
desktops for less than the cost of PCs and save 60% on VDI infrastructure
costs. Try it free! http://p.sf.net/sfu/Citrix-VDIinabox
_______________________________________________
pd-gem-CVS mailing list
pd-gem-CVS@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/pd-gem-cvs
