[GEM-cvs] [SCM] Gem - Graphics environment for multimedia branch, master, updated. 1d4d37242dcef6e3
Brought to you by:
zmoelnig
Menu
▾
▴
[GEM-cvs] [SCM] Gem - Graphics environment for multimedia branch, master, updated. 1d4d37242dcef6e30700a63da3a3b05e753bd806
|
From: IOhannes m zmöl. <zmo...@us...> - 2014-10-27 09:39:54
|
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 - Graphics environment for multimedia".
The branch, master has been updated
via 1d4d37242dcef6e30700a63da3a3b05e753bd806 (commit)
via 8e9ce2cb4a80e3a6ac3138710b4cb6f6fc1e4110 (commit)
via 1ce86e51979a967254555834ff1211bbf518bcf4 (commit)
via 254762d1ac1df3e2f15b8af77a4163f73c943273 (commit)
via 430a75f3d9b8748421f0b157a325404a10744a00 (commit)
via 2b722fdf2e01cdbabacf7e6fda282c9065238c8d (commit)
via c2c2fa355dccab9c64e7febc8f01dc818fdef2fe (commit)
via e4f06bc2b0d4d51c7cbdafc094e10c24299d1c4a (commit)
via 88d1d65120f03a4b20f4a545513b8f925a009a3b (commit)
via 7733ea5818604d74262884bb69cb7a8163694c25 (commit)
via 24dea0968227e6b795ca81b4bf9e36d334eb7c41 (commit)
via 248a83e2e4176b051065ebfa8718f8616dde4c20 (commit)
via d9c9a3008eff724715351272c24707aefba90041 (commit)
via d4a80ce6cecf9e5e62e1d423b2a6490591576645 (commit)
via b880f47cfdfd324e283f418cdb23e08bd683069e (commit)
via cce2b2c7db397488010eefa0d726cac093447502 (commit)
via 0f7d8447ec590eaab4cd56d976bdc3fa7eb745a1 (commit)
via 4d058a368dc475cf86051c7668414a8a7435e726 (commit)
via 4cf54b1b8003106b95ec1dd5cc987e1ee6b6d6c2 (commit)
via a568e55e36b056c7b02815d50de4ee52f63715a5 (commit)
via 6213f218c64777d66420d90f0efabd9b6536f520 (commit)
via 21b35249fd9ff3c44ea9b3fb9e7de1257f51d81a (commit)
via 9d6a2a367ea30f367e7a6f23ec611692812bb312 (commit)
via 84693deb237d7d8f86bf70bd897f7b1551b07884 (commit)
via 16376db07f5cf029055eb9e26e92e7a1beb29b9f (commit)
via 0062e07df34c0b7b3e9617fe125c1033fd7f5162 (commit)
via 63967970bb0f84cd01d38b604b5a3363844315b3 (commit)
via 85a7cff1b91014c42cd4c41ec3d88d0a12f4cbaa (commit)
via b106c048dd27e69c64e60b9444a3a67eae5fed2b (commit)
via df6b0991589f56be870856b56d31f3cb02af5566 (commit)
via fc0c89b0bda1db2207de0949f8c581bad696e985 (commit)
via f9b4e6921e39b0c55269689017ea3214c3a8fff9 (commit)
via c0e03f0013b338341136deaaf5b0de844e66dfbc (commit)
via a345a122f7f1b819a3764bfd33fc16d3cebdce3e (commit)
via bf3b93ecb8520aa1712900e05d4f1a6819a6efb5 (commit)
via dc0de7f54a945f0c10d6169c08278e718a31c458 (commit)
via 5cad8a75a049e81c970d3236ee63922bdb9d9920 (commit)
via a92a1738939bdefb2e614f33f202c1be27e6fbc2 (commit)
via 0ae069f2249670859073d85c5443663cf46ed1e9 (commit)
via 47e2d9af3b2bfbf51f7160fedd39d634f7101e3b (commit)
via 439a4b70cac8cd81f558d80792596848e2b4ad78 (commit)
via 7ce7c6ccf711d765b199e49c5fa5f69ad7944dd6 (commit)
via 9542c978c7741d3af6d6d37dc0a36d09e4b6a3c1 (commit)
via d21937f857d96dec42f737f460aa7f51bc7586fa (commit)
from 901cf08cff84c929e8405fd047c1064437ccd513 (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 1d4d37242dcef6e30700a63da3a3b05e753bd806
Merge: 7733ea5 8e9ce2c
Author: IOhannes m zmölnig <zmo...@um...>
Date: Sun Oct 26 16:12:52 2014 +0100
Merge remote-tracking branch 'avilleret/multiple_window'
commit 8e9ce2cb4a80e3a6ac3138710b4cb6f6fc1e4110
Author: Antoine Villeret <ant...@gm...>
Date: Sun Oct 26 14:09:11 2014 +0100
change filename in Makefile.am
commit 1ce86e51979a967254555834ff1211bbf518bcf4
Author: Antoine Villeret <ant...@gm...>
Date: Sat Oct 25 19:09:52 2014 +0200
rename example to follow default naming convention
commit 254762d1ac1df3e2f15b8af77a4163f73c943273
Author: Antoine Villeret <ant...@gm...>
Date: Sat Oct 25 18:37:42 2014 +0200
enable context sharing to make examples/14.multiple_windows/03_texture_sharing.pd work
this work on Intel driver ( ubuntu 14.10)
commit 430a75f3d9b8748421f0b157a325404a10744a00
Author: Antoine Villeret <ant...@gm...>
Date: Sat Oct 25 18:16:50 2014 +0200
add texture sharing between context example
this doesn't work (neither on intel GPU nor on Nvidia (driver 340))
commit 2b722fdf2e01cdbabacf7e6fda282c9065238c8d
Author: Antoine Villeret <ant...@gm...>
Date: Sat Oct 25 17:13:27 2014 +0200
add 2 new examples to explain multiple window system
commit c2c2fa355dccab9c64e7febc8f01dc818fdef2fe
Author: Antoine Villeret <ant...@gm...>
Date: Sat Oct 25 17:11:27 2014 +0200
document the new [context <name>( message
commit e4f06bc2b0d4d51c7cbdafc094e10c24299d1c4a
Author: Antoine Villeret <ant...@gm...>
Date: Sat Oct 25 17:09:35 2014 +0200
document the new context name argument
commit 88d1d65120f03a4b20f4a545513b8f925a009a3b
Author: Antoine Villeret <ant...@gm...>
Date: Sat Oct 25 17:09:08 2014 +0200
add a [context name( message to switch rendering context
since Pd's [receive] doesn't have a [set( method (which is a pity)
add this to switch between rendering chain
commit 7733ea5818604d74262884bb69cb7a8163694c25
Author: IOhannes m zmölnig <zmo...@um...>
Date: Wed Oct 22 18:11:10 2014 +0200
removed trailing paranthesis
commit 24dea0968227e6b795ca81b4bf9e36d334eb7c41
Author: IOhannes m zmölnig <zmo...@um...>
Date: Wed Oct 22 18:10:27 2014 +0200
notes on indentation/bracing
commit 248a83e2e4176b051065ebfa8718f8616dde4c20
Author: IOhannes m zmölnig <zmo...@um...>
Date: Wed Oct 22 18:09:55 2014 +0200
Do not make backups when re-indenting
commit d9c9a3008eff724715351272c24707aefba90041
Author: IOhannes m zmölnig <zmo...@um...>
Date: Tue Oct 21 18:16:04 2014 +0200
early return on error
commit d4a80ce6cecf9e5e62e1d423b2a6490591576645
Author: IOhannes m zmölnig <zmo...@um...>
Date: Tue Oct 21 18:13:17 2014 +0200
document that some methods in gem::VertexBuffer require a valid context
commit b880f47cfdfd324e283f418cdb23e08bd683069e
Author: IOhannes m zmölnig <zmo...@um...>
Date: Tue Oct 21 18:10:42 2014 +0200
fixed typo: ambiant -> ambient
commit cce2b2c7db397488010eefa0d726cac093447502
Author: IOhannes m zmölnig <zmo...@um...>
Date: Tue Oct 21 18:06:11 2014 +0200
use gem::VertexBuffer
it has moved into a namespace!
commit 0f7d8447ec590eaab4cd56d976bdc3fa7eb745a1
Author: IOhannes m zmölnig <zmo...@um...>
Date: Tue Oct 21 18:05:49 2014 +0200
moved VertexBuffer into namespace "gem"
commit 4d058a368dc475cf86051c7668414a8a7435e726
Author: IOhannes m zmölnig <zmo...@um...>
Date: Tue Oct 21 18:02:46 2014 +0200
fix typo in comment (FTBFS)
commit 4cf54b1b8003106b95ec1dd5cc987e1ee6b6d6c2
Author: IOhannes m zmölnig <zmo...@um...>
Date: Tue Oct 21 18:02:36 2014 +0200
adapt to member-rename of VertexBuffer.dimen
commit a568e55e36b056c7b02815d50de4ee52f63715a5
Author: IOhannes m zmölnig <zmo...@um...>
Date: Tue Oct 21 18:02:06 2014 +0200
renamed VertexBuffer.stride to VertexBuffer.dimen
as this is really the meaning of this member
commit 6213f218c64777d66420d90f0efabd9b6536f520
Author: IOhannes m zmölnig <zmo...@um...>
Date: Tue Oct 21 17:44:49 2014 +0200
documentation (and TODO)
commit 21b35249fd9ff3c44ea9b3fb9e7de1257f51d81a
Author: IOhannes m zmölnig <zmo...@um...>
Date: Tue Oct 21 17:39:09 2014 +0200
indentation script
TODO: add 'modelines' for vim & emacs
commit 9d6a2a367ea30f367e7a6f23ec611692812bb312
Author: IOhannes m zmölnig <zmo...@um...>
Date: Tue Oct 21 17:30:29 2014 +0200
indentation
commit 84693deb237d7d8f86bf70bd897f7b1551b07884
Author: IOhannes m zmölnig <zmo...@um...>
Date: Tue Oct 21 17:26:24 2014 +0200
backported modelASSIMP2
it's really the code from modelASSIMP3 with different include headers
commit 16376db07f5cf029055eb9e26e92e7a1beb29b9f
Author: IOhannes m zmölnig <zmo...@um...>
Date: Mon Oct 20 08:46:46 2014 +0200
indentation / ordering
commit 0062e07df34c0b7b3e9617fe125c1033fd7f5162
Author: IOhannes m zmölnig <zmo...@um...>
Date: Mon Oct 20 08:46:13 2014 +0200
removed render() and compile() from modelloader
commit 63967970bb0f84cd01d38b604b5a3363844315b3
Author: IOhannes m zmölnig <zmo...@um...>
Date: Mon Oct 20 08:45:51 2014 +0200
removed init of (now) non-existant member
commit 85a7cff1b91014c42cd4c41ec3d88d0a12f4cbaa
Author: IOhannes m zmölnig <zmo...@um...>
Date: Mon Oct 20 08:44:59 2014 +0200
don't call modelloader->render()
instead use VBOs
TODO: implement VBOs for [multimodel]
commit b106c048dd27e69c64e60b9444a3a67eae5fed2b
Author: IOhannes m zmölnig <zmo...@um...>
Date: Mon Oct 20 08:44:07 2014 +0200
removed members from modelloader class
the base-plugin classes shall remain pure virtual
*without* any member data
commit df6b0991589f56be870856b56d31f3cb02af5566
Author: IOhannes m zmölnig <zmo...@um...>
Date: Mon Oct 20 08:42:40 2014 +0200
make plugin members class-local (do not use those from ParentClass)
commit fc0c89b0bda1db2207de0949f8c581bad696e985
Author: IOhannes m zmölnig <zmo...@um...>
Date: Tue Oct 14 09:11:19 2014 +0200
renamed ASSIMP2 to ASSIMP3
seems to be a search-and-replace leftover
commit f9b4e6921e39b0c55269689017ea3214c3a8fff9
Merge: 901cf08 c0e03f0
Author: IOhannes m zmölnig <zmo...@um...>
Date: Tue Oct 14 09:08:38 2014 +0200
Merge remote-tracking branch 'avilleret/model_plugin'
commit c0e03f0013b338341136deaaf5b0de844e66dfbc
Author: Antoine Villeret <ant...@gm...>
Date: Mon Oct 13 17:13:21 2014 +0200
use the new getVBOayrray()
commit a345a122f7f1b819a3764bfd33fc16d3cebdce3e
Author: Antoine Villeret <ant...@gm...>
Date: Mon Oct 13 17:12:33 2014 +0200
add a getVBOarray() method that return an array of VBOarray
VBOarray contains both data and VBO type
this is more optimized than string comparison
commit bf3b93ecb8520aa1712900e05d4f1a6819a6efb5
Author: Antoine Villeret <ant...@gm...>
Date: Mon Oct 13 17:07:11 2014 +0200
don't pass array name but array array itself to copyArray
commit dc0de7f54a945f0c10d6169c08278e718a31c458
Author: Antoine Villeret <ant...@gm...>
Date: Mon Oct 13 17:05:49 2014 +0200
add a Type to describe VBO data
commit 5cad8a75a049e81c970d3236ee63922bdb9d9920
Author: Antoine Villeret <ant...@gm...>
Date: Mon Oct 13 17:05:17 2014 +0200
allow multiple inclusion of this file
commit a92a1738939bdefb2e614f33f202c1be27e6fbc2
Merge: 0ae069f 47e2d9a
Author: Antoine Villeret <ant...@gm...>
Date: Mon Oct 13 03:41:17 2014 +0200
Merge branch 'modelASSIMP3' of github.com:avilleret/Gem into modelASSIMP3
Conflicts:
src/Geos/model.cpp
commit 0ae069f2249670859073d85c5443663cf46ed1e9
Author: Antoine Villeret <ant...@gm...>
Date: Mon Oct 13 03:32:13 2014 +0200
pass model data to VBO
commit 47e2d9af3b2bfbf51f7160fedd39d634f7101e3b
Author: Antoine Villeret <ant...@gm...>
Date: Mon Oct 13 03:24:24 2014 +0200
pass model data to VBO
also add a m_refresh bool to update VBO arrays
commit 439a4b70cac8cd81f558d80792596848e2b4ad78
Author: Antoine Villeret <ant...@gm...>
Date: Mon Oct 13 00:58:22 2014 +0200
avoid crash when drawing empty arrays
commit 7ce7c6ccf711d765b199e49c5fa5f69ad7944dd6
Author: Antoine Villeret <ant...@gm...>
Date: Mon Oct 13 00:57:28 2014 +0200
first working modelASSIMP3 plugin
commit 9542c978c7741d3af6d6d37dc0a36d09e4b6a3c1
Author: Antoine Villeret <ant...@gm...>
Date: Sun Oct 12 18:33:34 2014 +0200
initialize m_refresh member variable
commit d21937f857d96dec42f737f460aa7f51bc7586fa
Author: Antoine Villeret <ant...@gm...>
Date: Sun Oct 12 18:34:08 2014 +0200
return compile status after rebuild on render()
-----------------------------------------------------------------------
Summary of changes:
build/tools/indent.sh | 17 +
configure.ac | 1 +
doc/CodingStyle.txt | 12 +-
examples/14.multiple_windows/01.basic_example.pd | 29 +
examples/14.multiple_windows/02.switch_context.pd | 28 +
examples/14.multiple_windows/03.texture_sharing.pd | 38 ++
examples/Makefile.am | 3 +
help/gemhead-help.pd | 12 +-
help/gemwin-help.pd | 95 ++--
plugins/Makefile.am | 2 +-
plugins/modelASSIMP2/modelASSIMP2.cpp | 539 ++++++++++++--------
plugins/modelASSIMP2/modelASSIMP2.h | 36 +-
plugins/modelASSIMP3/Makefile.am | 37 ++
plugins/modelASSIMP3/README.txt | 8 +
.../modelASSIMP3.cpp} | 226 +++++----
.../modelASSIMP2.h => modelASSIMP3/modelASSIMP3.h} | 33 +-
plugins/modelOBJ/modelOBJ.cpp | 15 +-
plugins/modelOBJ/modelOBJ.h | 35 +-
src/Controls/gemhead.cpp | 13 +
src/Controls/gemhead.h | 1 +
src/Gem/VertexBuffer.cpp | 34 +-
src/Gem/VertexBuffer.h | 26 +-
src/Geos/gemvertexbuffer.cpp | 71 ++--
src/Geos/gemvertexbuffer.h | 10 +-
src/Geos/model.cpp | 77 +++-
src/Geos/model.h | 8 +-
src/Geos/multimodel.cpp | 4 +-
src/Output/gemglxwindow.cpp | 4 +-
src/plugins/modelloader.cpp | 29 +-
src/plugins/modelloader.h | 53 +-
30 files changed, 978 insertions(+), 518 deletions(-)
create mode 100755 build/tools/indent.sh
create mode 100644 examples/14.multiple_windows/01.basic_example.pd
create mode 100644 examples/14.multiple_windows/02.switch_context.pd
create mode 100644 examples/14.multiple_windows/03.texture_sharing.pd
create mode 100644 plugins/modelASSIMP3/Makefile.am
create mode 100644 plugins/modelASSIMP3/README.txt
copy plugins/{modelASSIMP2/modelASSIMP2.cpp => modelASSIMP3/modelASSIMP3.cpp} (63%)
copy plugins/{modelASSIMP2/modelASSIMP2.h => modelASSIMP3/modelASSIMP3.h} (66%)
hooks/post-receive
--
Gem - Graphics environment for multimedia
|