diff options
| author | Travis CI <zmoelnig@travis-ci.umlaeute.mur.at> | 2017-12-05 19:53:02 +0000 |
|---|---|---|
| committer | Travis CI <zmoelnig@travis-ci.umlaeute.mur.at> | 2017-12-05 19:53:02 +0000 |
| commit | b84d4cc6b9c97874a958bc28ae2d6fd0da9bd833 (patch) | |
| tree | 51fb2a639e51af9aa38fc694ae9b41ba123a096f | |
| parent | 48351101d6169c18542224f9efa8d26f0af4201a (diff) | |
Gem ff2a6654059bb2881be49407cfaaee188a9aec42 osx/i386
built 'master:ff2a6654059bb2881be49407cfaaee188a9aec42' for osx/i386
140 files changed, 366 insertions, 263 deletions
@@ -17,7 +17,7 @@ old_library='' inherited_linker_flags=' -pthread' # Libraries that this one depends upon. -dependency_libs=' -L/Users/travis/build/umlaeute/Gem/build/travis-ci/deps/Pd-0.46-5.app/Contents/Resources//bin -L/usr/local/Cellar/fribidi/0.19.7_1/lib -L/usr/local/Cellar/glib/2.50.2/lib -L/usr/local/opt/gettext/lib -lfribidi -lglib-2.0 -lintl -ldl -lz -lm' +dependency_libs=' -L/Users/travis/build/umlaeute/Gem/build/travis-ci/deps/Pd-0.46-5.app/Contents/Resources//bin -ldl -lz -lm' # Names of additional weak libraries provided by this library weak_library_names='' diff --git a/Gem/Gem.pd_darwin b/Gem/Gem.pd_darwin Binary files differindex 94354b1..3ca665b 100755 --- a/Gem/Gem.pd_darwin +++ b/Gem/Gem.pd_darwin diff --git a/Gem/curve3d-help.pd b/Gem/curve3d-help.pd index 141d27a..397113d 100644 --- a/Gem/curve3d-help.pd +++ b/Gem/curve3d-help.pd @@ -1590,7 +1590,7 @@ #X connect 6 0 1 0; #X restore 214 484 pd pak f f f; #X floatatom 281 464 5 0 0 0 - - -; -#X obj 214 532 s exemples_shape; +#X obj 214 532 s examples_shape; #X obj 136 532 s curve3d; #X obj 57 532 s curve3d; #X text 13 68 Description: Renders a 3d bezier curve.; @@ -1608,10 +1608,10 @@ the displayed curve (X Y are 2 int); #X text 53 349 This message can be use to set the position of a control point. (Mx \, My : position of the point in the matrix. X \, Y \, Z : position of this control point; -#X text 21 447 exemples :; +#X text 21 447 examples :; #X text 29 87 The curve3d object renders a curve at the current position -with current color or texture. The shape of the curve is cotrolled -from a matrix. Note that control points are not necessary part of the +with current color or texture. The shape of the curve is controlled +from a matrix. Note that control points are not necessarily part of the curve.; #X connect 12 0 13 0; #X connect 13 0 12 0; diff --git a/Gem/develop/include/Gem/Base/CPPExtern.h b/Gem/develop/include/Gem/Base/CPPExtern.h index ddacc54..1f296d9 100644 --- a/Gem/develop/include/Gem/Base/CPPExtern.h +++ b/Gem/develop/include/Gem/Base/CPPExtern.h @@ -146,8 +146,8 @@ class GEM_EXTERN CPPExtern // wraps open_via_path() and canvas_makefilename() // the full filename is returned // if the file does not exist, it is constructed - std::string findFile(const std::string filename, const std::string ext) const; - std::string findFile(const std::string filename) const; + std::string findFile(const std::string&filename, const std::string&ext) const; + std::string findFile(const std::string&filename) const; private: mutable bool m_endpost; /* internal state for startpost/post/endpost */ diff --git a/Gem/develop/include/Gem/Base/TextBase.h b/Gem/develop/include/Gem/Base/TextBase.h index f65204a..de1ebbe 100644 --- a/Gem/develop/include/Gem/Base/TextBase.h +++ b/Gem/develop/include/Gem/Base/TextBase.h @@ -97,7 +97,7 @@ class GEM_EXTERN TextBase : public GemBase ////////// // The font to use - virtual void fontNameMess(const std::string filename); + virtual void fontNameMess(const std::string&filename); ////////// // set line distance diff --git a/Gem/develop/include/Gem/Gem/Dylib.h b/Gem/develop/include/Gem/Gem/Dylib.h index 1af65c1..30fea7e 100644 --- a/Gem/develop/include/Gem/Gem/Dylib.h +++ b/Gem/develop/include/Gem/Gem/Dylib.h @@ -26,12 +26,12 @@ class GEM_EXTERN GemDylib { public: GemDylib(const CPPExtern*obj, - const std::string libname, - const std::string extension=std::string("") - ) throw(GemException); - GemDylib(const std::string libname, - const std::string extension=std::string("") - ) throw(GemException); + const std::string&libname, + const std::string&extension=std::string("") + ); // throws GemException + GemDylib(const std::string&libname, + const std::string&extension=std::string("") + ); // throws GemException GemDylib(const GemDylib&); @@ -43,10 +43,10 @@ class GEM_EXTERN GemDylib { // if void<procname>(void) exists in dylib, run it and return "true" // else return false; - bool run(const std::string procname); + bool run(const std::string&procname); // if <procname> exists in dylib, return it, else return NULL - function_t proc(const std::string procname); + function_t proc(const std::string&procname); public: /** @@ -54,9 +54,9 @@ class GEM_EXTERN GemDylib { * if "extension" is NULL, a platform-specific default is used * on success "true" is returned, else "false */ - static bool LoadLib(const std::string procname, - const std::string baselibname, - const std::string fileext=std::string("")); + static bool LoadLib(const std::string&procname, + const std::string&baselibname, + const std::string&fileext=std::string("")); static const std::string getDefaultExtension(void); diff --git a/Gem/develop/include/Gem/Gem/Exception.h b/Gem/develop/include/Gem/Gem/Exception.h index 6df277f..8aaedf8 100644 --- a/Gem/develop/include/Gem/Gem/Exception.h +++ b/Gem/develop/include/Gem/Gem/Exception.h @@ -39,15 +39,15 @@ typedef struct _text t_object; class GEM_EXTERN GemException { public: - GemException(void) throw(); - GemException(const char*error) throw(); - GemException(const std::string error) throw(); - virtual ~GemException(void) throw(); + GemException(void); + GemException(const char*error); + GemException(const std::string&error); + virtual ~GemException(void); - virtual const char *what(void) const throw(); - virtual void report(const char*origin=0) const throw(); + virtual const char *what(void) const; + virtual void report(const char*origin=0) const; private: - const std::string ErrorString; + const std::string&ErrorString; }; namespace gem { diff --git a/Gem/develop/include/Gem/Gem/ImageIO.h b/Gem/develop/include/Gem/Gem/ImageIO.h index 7e71226..8b66e15 100644 --- a/Gem/develop/include/Gem/Gem/ImageIO.h +++ b/Gem/develop/include/Gem/Gem/ImageIO.h @@ -48,7 +48,7 @@ namespace gem { * the loaded image is stored in 'img' * 'props' holds a list of additional image properties discovered during loading */ - static bool sync(const std::string filename, + static bool sync(const std::string&filename, imageStruct&img, Properties&props); @@ -97,7 +97,7 @@ namespace gem { */ static bool async(callback cb, void*userdata, - const std::string filename, + const std::string&filename, id_t&ID ); @@ -113,7 +113,7 @@ namespace gem { */ static bool sync(callback cb, void*userdata, - const std::string filename, + const std::string&filename, id_t&ID); /* diff --git a/Gem/develop/include/Gem/Gem/Properties.h b/Gem/develop/include/Gem/Gem/Properties.h index 7ce011d..588fbf3 100644 --- a/Gem/develop/include/Gem/Gem/Properties.h +++ b/Gem/develop/include/Gem/Gem/Properties.h @@ -63,7 +63,7 @@ namespace gem * if the key was in the property-map, return the type of the property * if no key of the given value exists, return <code>PropertyType::UNSET</code> */ - virtual enum PropertyType type(const std::string) const; + virtual enum PropertyType type(const std::string&) const; /* set a property * e.g.: double w=640; prop.set("width", w); @@ -92,7 +92,7 @@ namespace gem /* * delete a given key from the Properties */ - virtual void erase(const std::string); + virtual void erase(const std::string&); /* * delete all keys from the Properties */ diff --git a/Gem/develop/include/Gem/Gem/Settings.h b/Gem/develop/include/Gem/Gem/Settings.h index e54b9d5..9052982 100644 --- a/Gem/develop/include/Gem/Gem/Settings.h +++ b/Gem/develop/include/Gem/Gem/Settings.h @@ -22,13 +22,13 @@ namespace gem { namespace Settings { void print(void); void save(void); - t_atom*get(const std::string key); - void set(const std::string key, t_atom*value=NULL); + t_atom*get(const std::string&key); + void set(const std::string&key, t_atom*value=NULL); - void get(const std::string key, int&value); - void get(const std::string key, float&value); - void get(const std::string key, double&value); - void get(const std::string key, std::string&value); + void get(const std::string&key, int&value); + void get(const std::string&key, float&value); + void get(const std::string&key, double&value); + void get(const std::string&key, std::string&value); std::vector<std::string> keys(); }; }; diff --git a/Gem/develop/include/Gem/RTE/MessageCallbacks.h b/Gem/develop/include/Gem/RTE/MessageCallbacks.h index b4df71b..79e174e 100644 --- a/Gem/develop/include/Gem/RTE/MessageCallbacks.h +++ b/Gem/develop/include/Gem/RTE/MessageCallbacks.h @@ -20,13 +20,13 @@ * CPPEXTERN_MSG (classPtr, "foo", gimmeMess); // A_GIMME * CPPEXTERN_MSG0(classPtr, "doit", bangMess); // no args * CPPEXTERN_MSG1(classPtr, "name", nameMess, t_symbol*); // 1 arg (A_SYMBOL) - * CPPEXTERN_MSG1(classPtr, "title", titleMess, std::string); // 1 arg (A_SYMBOL) + * CPPEXTERN_MSG1(classPtr, "title", titleMess, const std::string&); // 1 arg (A_SYMBOL) * CPPEXTERN_MSG3(classPtr, "values", tripletMess, t_float, t_float, t_float); // 3 args (A_FLOAT) * } * void myclass::gimmeMess (t_symbol*s, int argc, t_atom*argv) {;} * void myclass::bangMess (void) {;} * void myclass::nameMess (t_symbol*s) {;} - * void myclass::titleMess (std::string s) {;} + * void myclass::titleMess (const std::string&s) {;} * void myclass::tripletMess(t_float a, t_float b, t_float c) {;} */ #ifndef _INCLUDE__GEM_RTE_MESSAGECALLBACKS_H_ diff --git a/Gem/develop/include/Gem/RTE/RTE.h b/Gem/develop/include/Gem/RTE/RTE.h index bbcad94..18e2a93 100644 --- a/Gem/develop/include/Gem/RTE/RTE.h +++ b/Gem/develop/include/Gem/RTE/RTE.h @@ -43,13 +43,19 @@ namespace gem { * resolve a function-name in the current RTE * @return pointer to the function named 'name', or NULL if it doesn't exist */ - virtual void*getFunction(const std::string&name); + virtual void*getFunction(const std::string&name) const; /** * find a file in the given context(canvas), searching RTEs search paths * @return expanded filename */ virtual std::string findFile(const std::string&name, const std::string&ext, const void*context) const; + + /** + * add 'path' to the search-paths (if context==NULL, to the global search path) + * @return expanded filename + */ + virtual bool addSearchPath(const std::string&path, void*context); }; }; }; diff --git a/Gem/develop/include/Gem/Utils/GLUtil.h b/Gem/develop/include/Gem/Utils/GLUtil.h index c550c07..16fa492 100644 --- a/Gem/develop/include/Gem/Utils/GLUtil.h +++ b/Gem/develop/include/Gem/Utils/GLUtil.h @@ -45,7 +45,7 @@ GEM_EXTERN extern int getGLbitfield(int argc, struct _atom *argv); public: GLuintMap(const std::string&name); virtual ~GLuintMap(); - GLuint get(float) throw(GemException&); + GLuint get(float); // throws GemException /* map a GLuint to float; if float is 0, the new mapping is created, * else we just update an existing one * updating is especially useful with multiple contexts */ diff --git a/Gem/develop/include/Gem/Utils/GemString.h b/Gem/develop/include/Gem/Utils/GemString.h index d134f50..d767bf0 100644 --- a/Gem/develop/include/Gem/Utils/GemString.h +++ b/Gem/develop/include/Gem/Utils/GemString.h @@ -28,7 +28,8 @@ namespace gem { GEM_EXTERN std::wstring getVisualLine(const std::wstring&); /* convert a UTF-8 string to wchar */ - GEM_EXTERN std::wstring toWstring(const char*str) throw(int); + // throws 'int', holding the position of the char that couldn't be converted + GEM_EXTERN std::wstring toWstring(const char*str); }; }; diff --git a/Gem/develop/include/Gem/Utils/WorkerThread.h b/Gem/develop/include/Gem/Utils/WorkerThread.h index 9ab2285..36d4a4d 100644 --- a/Gem/develop/include/Gem/Utils/WorkerThread.h +++ b/Gem/develop/include/Gem/Utils/WorkerThread.h @@ -71,7 +71,7 @@ namespace gem { namespace thread { // you can use it to set a semaphore in the main thread, to fetch // the data // it get's called once after process() has been successful - // and will nott be called before dequeue has been called at least once + // and will not be called before dequeue has been called at least once // virtual void signal(void); diff --git a/Gem/develop/include/Gem/Utils/any.h b/Gem/develop/include/Gem/Utils/any.h index dff11bb..331a797 100644 --- a/Gem/develop/include/Gem/Utils/any.h +++ b/Gem/develop/include/Gem/Utils/any.h @@ -34,9 +34,18 @@ namespace gem bad_any_cast(const std::type_info& src, const std::type_info& dest) : result(std::string("bad cast (")+src.name() + "->" + dest.name()+")") { } - virtual ~bad_any_cast(void) throw() + virtual ~bad_any_cast(void) +#if __cplusplus <= 199711L + throw() +#endif { } - virtual const char* what(void) const throw() { + virtual const char* what(void) const +#if __cplusplus > 199711L + noexcept +#else + throw() +#endif + { return result.c_str(); } const std::string result; diff --git a/Gem/develop/include/Gem/plugins/film.h b/Gem/develop/include/Gem/plugins/film.h index 679c753..14f39ec 100644 --- a/Gem/develop/include/Gem/plugins/film.h +++ b/Gem/develop/include/Gem/plugins/film.h @@ -80,7 +80,7 @@ class GEM_EXTERN film * anything about the internal cs of the decoder */ /* returns TRUE if loading was successful, FALSE otherwise */ - virtual bool open(const std::string, + virtual bool open(const std::string&, const gem::Properties&requestprops) = 0; /* some error codes */ diff --git a/Gem/develop/include/Gem/plugins/imagesaver.h b/Gem/develop/include/Gem/plugins/imagesaver.h index 4ba2515..e883669 100644 --- a/Gem/develop/include/Gem/plugins/imagesaver.h +++ b/Gem/develop/include/Gem/plugins/imagesaver.h @@ -106,7 +106,7 @@ namespace gem { namespace plugins { */ virtual void getWriteCapabilities(std::vector<std::string>&mimetypes, gem::Properties&props) = 0; - /* returns TRUE, if it is save to use this backend from multple threads + /* returns TRUE, if it is save to use this backend from multiple threads */ virtual bool isThreadable(void) = 0; }; diff --git a/Gem/develop/include/Gem/plugins/record.h b/Gem/develop/include/Gem/plugins/record.h index b2aa254..ed0113c 100644 --- a/Gem/develop/include/Gem/plugins/record.h +++ b/Gem/develop/include/Gem/plugins/record.h @@ -54,11 +54,11 @@ public: /** * get a human readable description of the given codec (e.g. "Motion Jpeg A") */ - virtual const std::string getCodecDescription(const std::string codecname) = 0; + virtual const std::string getCodecDescription(const std::string&codecname) = 0; /** * set the current codec */ - virtual bool setCodec(const std::string name) = 0; + virtual bool setCodec(const std::string&name) = 0; /** * list all properties the currently selected codec supports @@ -76,7 +76,7 @@ public: /* * returns TRUE if opening was successful, FALSE otherwise */ - virtual bool start(const std::string filename, gem::Properties&props) = 0; + virtual bool start(const std::string&filename, gem::Properties&props) = 0; ////////// // record a frame diff --git a/Gem/develop/include/Gem/plugins/video.h b/Gem/develop/include/Gem/plugins/video.h index 7be968d..a949c86 100644 --- a/Gem/develop/include/Gem/plugins/video.h +++ b/Gem/develop/include/Gem/plugins/video.h @@ -71,7 +71,7 @@ namespace gem { namespace plugins { * the default implementation (which you normally shouldn't need to override) * will simply set m_devicename and clear m_devicenum */ - virtual bool setDevice(const std::string) = 0; + virtual bool setDevice(const std::string&) = 0; //! open the device (calls openDevice()) @@ -164,8 +164,6 @@ namespace gem { namespace plugins { - - /** * returns TRUE if the object can be used in a thread or FALSE otherwise * if a backend implements threading itself, it should return FALSE @@ -177,7 +175,7 @@ namespace gem { namespace plugins { /** turn on/off "asynchronous"-grabbing * default is "true" * "asynchronous" means, that the device is constantly grabbing, and grabFrame() returns the current frame - * non-"continuous" means, that the device will only issue a new grab when a frame has read + * non-"asynchronous" means, that the device will only issue a new grab when a frame has read * (thus potentially reducing the CPU-load to what is needed, at the cost of slightly outdated images * returns: the old state */ @@ -194,7 +192,7 @@ namespace gem { namespace plugins { // for pix_video: query whether this backend provides access to this class of devices // (e.g. "dv") - virtual bool provides(const std::string) = 0; + virtual bool provides(const std::string&) = 0; // get a list of all provided devices virtual std::vector<std::string>provides(void) = 0; diff --git a/Gem/examples/02.advanced/18.gl_shading_language.pd b/Gem/examples/02.advanced/18.gl_shading_language.pd index 2562b27..2953738 100644 --- a/Gem/examples/02.advanced/18.gl_shading_language.pd +++ b/Gem/examples/02.advanced/18.gl_shading_language.pd @@ -77,7 +77,7 @@ ID has changed \, we trigger the linking of the 2 modules; #X text 264 441 order of module IDs does not matter...; #X text 96 487 after linking \, click "print" to get some info about the compiled shader program; -#X text 330 550 the Toon-shader has a unifom variable "Phong" (see +#X text 330 550 the Toon-shader has a uniform variable "Phong" (see "print") \, which we can change to modify the effect.; #X text 213 264 pd's search path is searched for the given filename \; just add the examples/data folder to your path options and this diff --git a/Gem/examples/02.advanced/20.double-gemhead_vs_repeat.pd b/Gem/examples/02.advanced/20.double-gemhead_vs_repeat.pd index 518e853..364f002 100644 --- a/Gem/examples/02.advanced/20.double-gemhead_vs_repeat.pd +++ b/Gem/examples/02.advanced/20.double-gemhead_vs_repeat.pd @@ -54,7 +54,7 @@ similar to combining [separator] and [pix_separator]. (cc); #X obj 199 312 spigot 0; #X obj 278 276 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0 1; -#X text 311 274 <- if you reset the random at the begining of each +#X text 311 274 <- if you reset the random at the beginning of each frame \, then all frames look the same.; #X obj 21 101 scaleXYZ 1 1 1; #X floatatom 52 80 5 0 0 0 - - -; diff --git a/Gem/examples/02.advanced/21.basic_LSystem.pd b/Gem/examples/02.advanced/21.basic_LSystem.pd index 301b09a..f1b399f 100644 --- a/Gem/examples/02.advanced/21.basic_LSystem.pd +++ b/Gem/examples/02.advanced/21.basic_LSystem.pd @@ -35,7 +35,7 @@ it to the corresponding primitives; #X text 397 502 <- size of the system; #X msg 15 164 F \, [ \, - \, F \, ] \, F \, [ \, + \, F \, ] \, F; #X text 12 640 This is a basic implementation of Lindenmayer System -(LSystem) in GEM. Wikipedia is a good place for informations about +(LSystem) in GEM. Wikipedia is a good place for information about Lsystems; #X obj 15 351 gemlist; #X obj 47 110 s \$0-gemlist; diff --git a/Gem/examples/04.pix/05.film.pd b/Gem/examples/04.pix/05.film.pd index 601dd7b..8332716 100644 --- a/Gem/examples/04.pix/05.film.pd +++ b/Gem/examples/04.pix/05.film.pd @@ -19,7 +19,7 @@ or less) native color-space. most of the times \, this will probably be not RGBA but RGB or BGR (on windows machines).; #X text 48 153 do not worry about this. however \, most of the pix-manips will only work correctly on RGBA-pixes. if this is the case and you -send it a non-RGBA pixture it will say something like "pix_object cannot +send it a non-RGBA picture it will say something like "pix_object cannot handle gray image".; #X text 49 226 to avoid this \, you can convert your pix-buff to RGBA using "pix_rgba". this will be a no-cost operation if the pix_buf already @@ -80,7 +80,7 @@ very fast.; #X restore 25 93 pd gemwin; #X msg 25 69 create; #X text 21 49 Create window and render; -#X text 358 91 linux \, os-X:; +#X text 358 91 linux \, OSX:; #X text 363 140 linux \, ??:; #X obj 345 181 t a; #X msg 410 207 open \$1; diff --git a/Gem/examples/04.pix/07.PixSet.pd b/Gem/examples/04.pix/07.PixSet.pd index b6deab3..19aca07 100644 --- a/Gem/examples/04.pix/07.PixSet.pd +++ b/Gem/examples/04.pix/07.PixSet.pd @@ -6,7 +6,7 @@ #X obj 149 343 loadbang; #X text 101 487 maybe have a look at; #X text 101 24 pix_set; -#X text 246 23 set the pixles of the image; +#X text 246 23 set the pixels of the image; #X msg 279 165 rgb; #X msg 279 141 rgba; #X msg 279 189 grey; diff --git a/Gem/examples/04.pix/12.blending.pd b/Gem/examples/04.pix/12.blending.pd index 473c48e..5f8f982 100644 --- a/Gem/examples/04.pix/12.blending.pd +++ b/Gem/examples/04.pix/12.blending.pd @@ -86,7 +86,7 @@ #X text 26 39 pix1; #X text 176 269 pix2; #X obj 350 56 symbol; -#X text 99 232 we need an alpha componenct for 'composite'; +#X text 99 232 we need an alpha component for 'composite'; #X text 85 115 [pix_add] and friends will overwrite the original (left) image with the blend. [pix_buf] holds a local copy of the original image and will refresh the output when banged.; diff --git a/Gem/examples/04.pix/17.pix_gain.pd b/Gem/examples/04.pix/17.pix_gain.pd index 3b6ae5e..3149650 100644 --- a/Gem/examples/04.pix/17.pix_gain.pd +++ b/Gem/examples/04.pix/17.pix_gain.pd @@ -20,7 +20,7 @@ #X text 632 121 color-wise factor; #X text 103 453 using [pix_gain] is probably very expensive (since it does operations on your CPU). Try using [color] if your card has -openGL-hw-accleration...; +openGL-hardware-acceleration...; #X obj 20 69 cnv 15 220 70 empty empty empty 20 12 0 14 -195568 -66577 0; #N canvas 0 22 454 304 gemwin 0; diff --git a/Gem/examples/04.pix/26.framebuffer_readback.pd b/Gem/examples/04.pix/26.framebuffer_readback.pd index 3f49f1e..696793d 100644 --- a/Gem/examples/04.pix/26.framebuffer_readback.pd +++ b/Gem/examples/04.pix/26.framebuffer_readback.pd @@ -45,7 +45,7 @@ pix (where you can apply effects and all kind of weird things); #X text 562 308 fetch framebuffer-pix; #X text 535 379 apply some nifty FX; #X text 73 597 note \, that there are more efficient ways to apply -FX to framebuffers (noteably openGL-shaders: see examples/10.glsl/ +FX to framebuffers (notably openGL-shaders: see examples/10.glsl/ for more information); #X obj 425 358 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1 1; diff --git a/Gem/examples/04.pix/27.bitmap_font.pd b/Gem/examples/04.pix/27.bitmap_font.pd index c6b182d..0d8c9d6 100644 --- a/Gem/examples/04.pix/27.bitmap_font.pd +++ b/Gem/examples/04.pix/27.bitmap_font.pd @@ -60,7 +60,7 @@ #X text 485 241 - space bar add a space...; #X text 485 251 - enter reset all; #X text 520 283 purpose :; -#X text 495 299 - orginally design to drive a LED matrix; +#X text 495 299 - originally design to drive a LED matrix; #X msg 260 298 roi \$1 \$2 \$3 \$4; #X obj 260 211 t f f; #X obj 260 253 pack 0 0 0 8; diff --git a/Gem/examples/04.video/03.movement_detection.pd b/Gem/examples/04.video/03.movement_detection.pd index 34efdef..ef800d7 100644 --- a/Gem/examples/04.video/03.movement_detection.pd +++ b/Gem/examples/04.video/03.movement_detection.pd @@ -12,8 +12,8 @@ #X obj 201 434 cube 0.5; #X obj 227 304 * 8; #X obj 227 326 - 4; -#X obj 280 304 * 8; -#X obj 280 326 - 4; +#X obj 280 304 * -8; +#X obj 280 326 + 4; #X obj 339 325 * 2; #X obj 44 117 pix_video; #X text 57 40 a very simple movement detector; diff --git a/Gem/examples/04.video/04.videoRTX.pd b/Gem/examples/04.video/04.videoRTX.pd index 6d71805..7f5bb44 100644 --- a/Gem/examples/04.video/04.videoRTX.pd +++ b/Gem/examples/04.video/04.videoRTX.pd @@ -13,7 +13,7 @@ on the fly; #X text 42 447 upper-picture; #X text 198 448 lower-picture; #X text 38 465 NO transformation; -#X text 198 467 RTX-tranformed; +#X text 198 467 RTX-transformed; #X text 46 24 =======; #X text 380 248 lock time on x-axis; #X text 376 272 lock x on x-axis; diff --git a/Gem/examples/07.texture/11.multiples_gemhead_in_a_framebuffer.pd b/Gem/examples/07.texture/11.multiples_gemhead_in_a_framebuffer.pd index 69ef470..6738415 100644 --- a/Gem/examples/07.texture/11.multiples_gemhead_in_a_framebuffer.pd +++ b/Gem/examples/07.texture/11.multiples_gemhead_in_a_framebuffer.pd @@ -33,7 +33,7 @@ #X text 201 238 (it change even after a new gemhead \, this is not very intuitive); #X text 323 283 <- continue the render chain. The gemhead did not start -a new gemchain \, because it is banged during a frambuffer rendering +a new gemchain \, because it is banged during a framebuffer rendering ; #X text 113 10 This example show how to draw multiples gemhead in a single framebuffer; diff --git a/Gem/examples/10.glsl/02.primitive_distortion.pd b/Gem/examples/10.glsl/02.primitive_distortion.pd index 9b93121..dd3ca85 100644 --- a/Gem/examples/10.glsl/02.primitive_distortion.pd +++ b/Gem/examples/10.glsl/02.primitive_distortion.pd @@ -41,7 +41,7 @@ #X msg 292 277 0.1; #X obj 74 428 pix_image img3.jpg; #X text 69 627 this shader create a dirty pseudo random value \, and -move all vertices separatly; +move all vertices separately; #N canvas 87 154 247 179 Gem.init 0; #X obj 118 46 loadbang; #X msg 118 81 reset; diff --git a/Gem/examples/10.glsl/05.multitexture.pd b/Gem/examples/10.glsl/05.multitexture.pd index d80c9a4..58a507d 100644 --- a/Gem/examples/10.glsl/05.multitexture.pd +++ b/Gem/examples/10.glsl/05.multitexture.pd @@ -72,7 +72,7 @@ #X obj 220 569 loadbang; #X obj 716 388 loadbang; #X obj 687 229 gemhead 22; -#X text 187 360 2) change shader texuinit; +#X text 187 360 2) change shader texunit; #X msg 482 320 open img2.jpg; #X obj 463 349 pix_image img2.jpg; #X obj 687 346 pix_image img3.jpg; diff --git a/Gem/examples/10.glsl/05.multitexture_bis.pd b/Gem/examples/10.glsl/05.multitexture_bis.pd index 63652ff..a727b04 100644 --- a/Gem/examples/10.glsl/05.multitexture_bis.pd +++ b/Gem/examples/10.glsl/05.multitexture_bis.pd @@ -59,7 +59,7 @@ #X obj 907 285 loadbang; #X obj 919 379 loadbang; #X obj 890 220 gemhead 22; -#X text 187 360 2) change shader texuinit; +#X text 187 360 2) change shader texunit; #X msg 685 311 open img2.jpg; #X obj 666 340 pix_image img2.jpg; #X obj 890 337 pix_image img3.jpg; diff --git a/Gem/examples/10.glsl/06.rectangle_multitexture.pd b/Gem/examples/10.glsl/06.rectangle_multitexture.pd index 48e6600..235e888 100644 --- a/Gem/examples/10.glsl/06.rectangle_multitexture.pd +++ b/Gem/examples/10.glsl/06.rectangle_multitexture.pd @@ -132,12 +132,12 @@ for crossfading); #X connect 6 0 4 0; #X connect 7 0 6 0; #X restore 106 559 pd onebang; -#X text 206 357 <- 2 : test differents mix; +#X text 206 357 <- 2 : test different mix; #X obj 459 167 pix_resize 512 512; #X obj 279 167 pix_resize 234 543; #X obj 279 147 pix_image img3.jpg; #X obj 459 147 pix_image img2.jpg; -#X text 292 186 images have diferents sizes; +#X text 292 186 images have different sizes; #X msg 139 507 mix_factor \$1; #X obj 37 646 square 4; #X connect 0 0 61 0; diff --git a/Gem/examples/10.glsl/08.multi_pass_rendering.pd b/Gem/examples/10.glsl/08.multi_pass_rendering.pd index 5ada6be..18892da 100644 --- a/Gem/examples/10.glsl/08.multi_pass_rendering.pd +++ b/Gem/examples/10.glsl/08.multi_pass_rendering.pd @@ -36,7 +36,7 @@ #X connect 1 0 2 0; #X connect 2 0 0 0; #X restore 373 156 pd init; -#X text 6 4 first input \, render whatever in a frambuffer; +#X text 6 4 first input \, render whatever in a framebuffer; #X obj 691 357 loadbang; #X obj 42 222 pix_image img1.jpg; #X obj 42 54 gemhead 11; @@ -225,7 +225,7 @@ #X msg 141 88 K1 \$1; #X text 183 69 change effect; #X text 347 1 second input : same as 1st.; -#X text 7 22 put framebuffer as texunit 1 \, for futur use; +#X text 7 22 put framebuffer as texunit 1 \, for future use; #X text 348 17 render an image in framebuffer.; #X text 350 31 put framebuffer in texunit 2; #X text 632 8 finally :; @@ -235,7 +235,7 @@ #X msg 449 98 K \$1; #X msg 449 58 0.1; #X text 161 433 <-------------------; -#X text 569 442 draw the final frambuffer (without shader); +#X text 569 442 draw the final framebuffer (without shader); #X obj 671 335 rotateXYZ -20 0 0; #N canvas 87 154 247 179 Gem.init 0; #X obj 58 46 loadbang; diff --git a/Gem/examples/10.glsl/09.vertex_texture_fetching.pd b/Gem/examples/10.glsl/09.vertex_texture_fetching.pd index e1439c4..74542ef 100644 --- a/Gem/examples/10.glsl/09.vertex_texture_fetching.pd +++ b/Gem/examples/10.glsl/09.vertex_texture_fetching.pd @@ -39,15 +39,15 @@ #X obj 28 388 pix_image img1.jpg; #X msg 46 363 open img2.jpg; #X text 137 11 This patch need a glsl 3 compliant hardware; -#X text 26 535 draw an image in a frambuffer; +#X text 26 535 draw an image in a framebuffer; #X text 49 274 this configuration is very important to have full hardware support for vertex texture fetching; #X text 306 603 this example uses the framebuffer image in the vertex shader in the same way you can do in the pixel shader. This is only possible in this specific configuration (it's a hardware limitation) ; -#X text 137 56 (nvidia 7000 and 8000 serie should work \, ati X1000 -serie does not \, but later should); +#X text 137 56 (nvidia 7000 and 8000 series should work \, ati X1000 +series does not \, but later should); #X obj 504 579 mesh_square 200; #X text 138 28 As in 2007 \, only good (and new) graphic cards are able to run this patch.; diff --git a/Gem/examples/10.glsl/10.GPGPU_Physical_model.pd b/Gem/examples/10.glsl/10.GPGPU_Physical_model.pd index 6d44970..e5e0bfe 100644 --- a/Gem/examples/10.glsl/10.GPGPU_Physical_model.pd +++ b/Gem/examples/10.glsl/10.GPGPU_Physical_model.pd @@ -1228,7 +1228,7 @@ y0(0:90)(0:90) x0(0:90)(10:100) y0(0:90)(10:100) x0(0:90)(0:90) y0(0:90)(10:100) on other OS/hardware.; #X text 29 72 This patch is quite huge. the GPU compute the position of 64x92 masses \, and 64x92x12 links at 50x20 Hz. (about 7e+07 links/sec -\, so about 100 time faster than what is curently possible with MSD +\, so about 100 time faster than what is currently possible with MSD on a CPU) (My GPU is old \, this patch performs 10 to 50 times faster on a good GPU); #X obj 606 346 s qqt_noise; diff --git a/Gem/examples/10.glsl/11.geometry.pd b/Gem/examples/10.glsl/11.geometry.pd index 1851c8a..2782494 100644 --- a/Gem/examples/10.glsl/11.geometry.pd +++ b/Gem/examples/10.glsl/11.geometry.pd @@ -27,7 +27,7 @@ #X obj 44 576 circle; #X obj 182 176 t b b; #X text 184 7 geometry shader; -#X text 48 28 The geometry shader is usefull to create new geometry +#X text 48 28 The geometry shader is useful to create new geometry ; #X text 51 47 Here is an example where 40 circles are draw with 1 single primitive.; diff --git a/Gem/examples/10.glsl/12.tri2fan.pd b/Gem/examples/10.glsl/12.tri2fan.pd index 5437d4b..69827bb 100644 --- a/Gem/examples/10.glsl/12.tri2fan.pd +++ b/Gem/examples/10.glsl/12.tri2fan.pd @@ -82,7 +82,7 @@ #X restore 421 253 pd light; #X obj 161 595 rotateXYZ -55 20 0; #X floatatom 298 537 5 0 0 0 - - -; -#X text 235 13 replace triangle with 3 triangles thoses orientation +#X text 235 13 replace triangle with 3 triangles the orientations of which depend on the normal of the original primitive; #X obj 161 554 scaleXYZ 0.2 0.2 0.2; #X msg 172 129 auto 1; diff --git a/Gem/examples/10.glsl/13.panoramique.pd b/Gem/examples/10.glsl/13.panoramique.pd index c483a4c..5ab624f 100644 --- a/Gem/examples/10.glsl/13.panoramique.pd +++ b/Gem/examples/10.glsl/13.panoramique.pd @@ -387,12 +387,12 @@ #X obj 552 -4 scaleXYZ 4 4 1; #X obj 747 -5 scaleXYZ 4 4 1; #X text 21 548 This patch allow multiples images to be assembled in -order to dreate a panoramic image.; +order to create a panoramic image.; #X text 20 575 A shader distord the image to correct distance distortion \, and allow a fade between 2 images; #X text 17 602 "dz" depend on the angles between images.; #X text 462 579 copyright cyrille Henry and iem.; -#X text 463 596 This developement was suported by the COMEDIA project +#X text 463 596 This development was supported by the COMEDIA project ; #X floatatom 18 354 5 0 0 0 - - -; #X msg 18 373 dZ \$1; diff --git a/Gem/examples/10.glsl/_glsl.pd b/Gem/examples/10.glsl/_glsl.pd index de6228c..aa82e05 100644 --- a/Gem/examples/10.glsl/_glsl.pd +++ b/Gem/examples/10.glsl/_glsl.pd @@ -31,7 +31,7 @@ #X msg 287 598 0; #X obj 15 65 t b b b; #X obj 140 199 symbol \$1; -#X text 270 193 This abstraction can be usefull to load shader. Shader +#X text 270 193 This abstraction can be useful to load shader. Shader location is relative to this abstraction path.; #X connect 0 0 9 0; #X connect 0 1 6 0; diff --git a/Gem/examples/11.obj-exporter/obj_cube.pd b/Gem/examples/11.obj-exporter/obj_cube.pd index d874dc6..0d069e7 100644 --- a/Gem/examples/11.obj-exporter/obj_cube.pd +++ b/Gem/examples/11.obj-exporter/obj_cube.pd @@ -31,7 +31,7 @@ #X obj 50 509 translateXYZ; #X obj 104 467 r \$0-size; #X obj 50 121 t a b; -#X text 150 143 create new groupe; +#X text 150 143 create new group; #X obj 104 488 * 2; #X obj 50 594 t b; #X msg 131 232 v \$1 \$2 \$3; diff --git a/Gem/examples/11.obj-exporter/obj_exporter.pd b/Gem/examples/11.obj-exporter/obj_exporter.pd index 5a4b08f..d233d50 100644 --- a/Gem/examples/11.obj-exporter/obj_exporter.pd +++ b/Gem/examples/11.obj-exporter/obj_exporter.pd @@ -52,8 +52,9 @@ #X connect 8 0 6 1; #X connect 9 0 6 2; #X restore 90 380 pd remove_cam_offset; -#X obj 90 30 route save groupe triangulate; +#X obj 90 30 route save group triangulate; #X obj 223 51 s global_obj_triangulate; +#X obj 309 30 route groupe; #X connect 0 0 29 0; #X connect 1 0 5 0; #X connect 2 0 6 0; @@ -94,3 +95,5 @@ #X connect 29 0 15 0; #X connect 29 1 26 0; #X connect 29 2 30 0; +#X connect 29 3 31 0; +#X connect 31 0 26 0; diff --git a/Gem/examples/11.obj-exporter/obj_primTri.pd b/Gem/examples/11.obj-exporter/obj_primTri.pd index 2607197..2aee67f 100644 --- a/Gem/examples/11.obj-exporter/obj_primTri.pd +++ b/Gem/examples/11.obj-exporter/obj_primTri.pd @@ -23,7 +23,7 @@ #X obj 55 488 gemlist_info; #X obj 55 467 translateXYZ; #X obj 55 131 t a b; -#X text 171 155 create new groupe; +#X text 171 155 create new group; #X msg 136 257 v \$1 \$2 \$3; #X msg 136 383 v \$1 \$2 \$3; #X msg 136 509 v \$1 \$2 \$3; diff --git a/Gem/examples/11.obj-exporter/obj_rectangle.pd b/Gem/examples/11.obj-exporter/obj_rectangle.pd index 648eddf..c8d9f24 100644 --- a/Gem/examples/11.obj-exporter/obj_rectangle.pd +++ b/Gem/examples/11.obj-exporter/obj_rectangle.pd @@ -30,7 +30,7 @@ #X obj 50 540 gemlist_info; #X obj 50 519 translateXYZ; #X obj 50 131 t a b; -#X text 170 153 create new groupe; +#X text 170 153 create new group; #X text 147 411 3rd vertex of the square; #X obj 104 498 * 2; #X obj 50 604 t b; diff --git a/Gem/examples/11.obj-exporter/obj_square.pd b/Gem/examples/11.obj-exporter/obj_square.pd index c9a18f0..9344081 100644 --- a/Gem/examples/11.obj-exporter/obj_square.pd +++ b/Gem/examples/11.obj-exporter/obj_square.pd @@ -38,7 +38,7 @@ #X obj 50 519 translateXYZ; #X obj 104 477 r \$0-size; #X obj 50 131 t a b; -#X text 150 152 create new groupe; +#X text 150 152 create new group; #X text 147 411 3rd vertex of the square; #X obj 104 498 * 2; #X obj 50 604 t b; diff --git a/Gem/examples/12.multi_screen_projection/01.flat_projection-help.pd b/Gem/examples/12.multi_screen_projection/01.flat_projection-help.pd index eb5b2fc..fbf7189 100644 --- a/Gem/examples/12.multi_screen_projection/01.flat_projection-help.pd +++ b/Gem/examples/12.multi_screen_projection/01.flat_projection-help.pd @@ -18,7 +18,7 @@ the gemchain like in this example.; to the computer.; #X text 306 93 This define the way screen are positioned in space to create a single image.; -#X text 305 159 geometry screen and geometry computer can be diferents +#X text 305 159 geometry screen and geometry computer can be different \, but should define the same number of screen.; #X connect 0 0 10 0; #X connect 1 0 5 0; diff --git a/Gem/examples/14.multiple_windows/01.basic_example.pd b/Gem/examples/14.multiple_windows/01.basic_example.pd index 078ca67..07640dc 100644 --- a/Gem/examples/14.multiple_windows/01.basic_example.pd +++ b/Gem/examples/14.multiple_windows/01.basic_example.pd @@ -11,7 +11,7 @@ #X obj 223 138 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1 -1; #X text 240 136 create window; -#X text 405 85 You can have multiple window and display diffenrents +#X text 405 85 You can have multiple window and display different things on each.; #X obj 268 241 gemwin 20 b; #X text 405 119 Basically \, use [gemwin fps context_name] to create diff --git a/Gem/fragment_program-help.pd b/Gem/fragment_program-help.pd index 90d278e..a1b6362 100644 --- a/Gem/fragment_program-help.pd +++ b/Gem/fragment_program-help.pd @@ -72,7 +72,7 @@ shader.; #X text 11 123 If you want to modify the parameters of the shader-program \, you have to set the modification up yourself \, via [GEMglProgramEnvParameter*] working on GL_FRAGMENT_PROGRAM_ARB.; -#X text 35 358 Inlet 1: messsage: open <filename> : fragment shader +#X text 35 358 Inlet 1: message: open <filename> : fragment shader program to load; #X text 443 406 see also; #X obj 508 406 vertex_program; diff --git a/Gem/gem_filmAVFoundation.so b/Gem/gem_filmAVFoundation.so Binary files differindex 1616494..1f655f2 100755 --- a/Gem/gem_filmAVFoundation.so +++ b/Gem/gem_filmAVFoundation.so diff --git a/Gem/gem_imageJPEG.so b/Gem/gem_imageJPEG.so Binary files differindex 07c0a3e..3a15a73 100755 --- a/Gem/gem_imageJPEG.so +++ b/Gem/gem_imageJPEG.so diff --git a/Gem/gem_imageMAGICK.la b/Gem/gem_imageMAGICK.la index 8806c26..281c4ea 100755 --- a/Gem/gem_imageMAGICK.la +++ b/Gem/gem_imageMAGICK.la @@ -17,7 +17,7 @@ old_library='' inherited_linker_flags=' -pthread' # Libraries that this one depends upon. -dependency_libs=' -L/Users/travis/build/umlaeute/Gem/build/travis-ci/deps/Pd-0.46-5.app/Contents/Resources//bin -L../.. -L/usr/local/Cellar/imagemagick/6.9.7-0/lib /usr/local/Cellar/imagemagick/6.9.7-0/lib/libMagick++-6.Q16.la -L/usr/local/opt/freetype/lib -L/usr/local/Cellar/xz/5.2.2/lib /usr/local/Cellar/imagemagick/6.9.7-0/lib/libMagickWand-6.Q16.la /usr/local/Cellar/imagemagick/6.9.7-0/lib/libMagickCore-6.Q16.la -lfreetype -llzma -lbz2 -lltdl -ldl -lz -lm' +dependency_libs=' -L/Users/travis/build/umlaeute/Gem/build/travis-ci/deps/Pd-0.46-5.app/Contents/Resources//bin -L../.. -L/usr/local/Cellar/imagemagick/7.0.7-13/lib /usr/local/Cellar/imagemagick/7.0.7-13/lib/libMagickCore-7.Q16HDRI.la -L/usr/local/opt/freetype/lib -L/usr/local/Cellar/xz/5.2.3/lib -lfreetype -llzma -lbz2 -lltdl -ldl -lz -lm' # Names of additional weak libraries provided by this library weak_library_names='' diff --git a/Gem/gem_imageMAGICK.so b/Gem/gem_imageMAGICK.so Binary files differindex 95a1d84..d753482 100755 --- a/Gem/gem_imageMAGICK.so +++ b/Gem/gem_imageMAGICK.so diff --git a/Gem/gem_imageSGI.so b/Gem/gem_imageSGI.so Binary files differindex 64a7e3e..1c4ed32 100755 --- a/Gem/gem_imageSGI.so +++ b/Gem/gem_imageSGI.so diff --git a/Gem/gem_imageTIFF.so b/Gem/gem_imageTIFF.so Binary files differindex 9314faa..63c6d00 100755 --- a/Gem/gem_imageTIFF.so +++ b/Gem/gem_imageTIFF.so diff --git a/Gem/gem_modelOBJ.so b/Gem/gem_modelOBJ.so Binary files differindex b8d9fc6..de8caba 100755 --- a/Gem/gem_modelOBJ.so +++ b/Gem/gem_modelOBJ.so diff --git a/Gem/gemcocoawindow.pd_darwin b/Gem/gemcocoawindow.pd_darwin Binary files differindex 0c75a6d..a0edc9a 100755 --- a/Gem/gemcocoawindow.pd_darwin +++ b/Gem/gemcocoawindow.pd_darwin diff --git a/Gem/gemframebuffer-help.pd b/Gem/gemframebuffer-help.pd index 7ab036c..ae0da6e 100644 --- a/Gem/gemframebuffer-help.pd +++ b/Gem/gemframebuffer-help.pd @@ -138,7 +138,7 @@ #X text 60 187 <none>; #X text 102 -1 Synopsis: [gemframebuffer]; #X text 122 15 Class: framebuffer object; -#X text 12 50 Description: Renders a scenne in a texture \, for later +#X text 12 50 Description: Renders a scene in a texture \, for later use.; #X text 12 68 this example renders a scene (pqtorusknots) into a framebuffer \, which is then used as a texture onto a square.; @@ -152,7 +152,7 @@ gfx-card; #X text 26 385 Inlet 1: message: rectangle [0|1]; #X text 103 262 (type of the framebuffer data); #X text 102 330 (dimension of the framebuffer texture); -#X text 106 465 (usefull only with shader); +#X text 106 465 (useful only with shader); #X text 106 448 (change texunit of the texture); #X text 104 402 (texturing mode \; rectangle (1) or normalized (0)) ; diff --git a/Gem/gemglfw2window.pd_darwin b/Gem/gemglfw2window.pd_darwin Binary files differdeleted file mode 100755 index 30cee08..0000000 --- a/Gem/gemglfw2window.pd_darwin +++ /dev/null diff --git a/Gem/gemglfw2window.la b/Gem/gemglfw3window.la index 64cc258..aee9ef5 100755 --- a/Gem/gemglfw2window.la +++ b/Gem/gemglfw3window.la @@ -1,28 +1,28 @@ -# gemglfw2window.la - a libtool library file +# gemglfw3window.la - a libtool library file # Generated by libtool (GNU libtool) 2.4.6 # # Please DO NOT delete this file! # It is necessary for linking the library. # The name that we can dlopen(3). -dlname='gemglfw2window.pd_darwin' +dlname='gemglfw3window.pd_darwin' # Names of this library. -library_names='gemglfw2window.pd_darwin gemglfw2window.pd_darwin' +library_names='gemglfw3window.pd_darwin gemglfw3window.pd_darwin' # The name of the static archive. old_library='' # Linker flags that cannot go in dependency_libs. -inherited_linker_flags=' -framework Cocoa -framework OpenGL -framework IOKit' +inherited_linker_flags=' ' # Libraries that this one depends upon. -dependency_libs=' -L/Users/travis/build/umlaeute/Gem/build/travis-ci/deps/Pd-0.46-5.app/Contents/Resources//bin -L../.. -L/usr/local/Cellar/glfw2/2.7.9/lib -lglfw -ldl -lz -lm' +dependency_libs=' -L/Users/travis/build/umlaeute/Gem/build/travis-ci/deps/Pd-0.46-5.app/Contents/Resources//bin -L../.. -L/usr/local/Cellar/glfw/3.2.1/lib -lglfw -ldl -lz -lm' # Names of additional weak libraries provided by this library weak_library_names='' -# Version information for gemglfw2window. +# Version information for gemglfw3window. current=0 age=0 revision=0 diff --git a/Gem/gemglfw3window.pd_darwin b/Gem/gemglfw3window.pd_darwin Binary files differnew file mode 100755 index 0000000..a41cdec --- /dev/null +++ b/Gem/gemglfw3window.pd_darwin diff --git a/Gem/gemglutwindow.pd_darwin b/Gem/gemglutwindow.pd_darwin Binary files differindex dd8ad34..5a3b4bc 100755 --- a/Gem/gemglutwindow.pd_darwin +++ b/Gem/gemglutwindow.pd_darwin diff --git a/Gem/gemlist_info-help.pd b/Gem/gemlist_info-help.pd index 1a446c7..a2e497f 100644 --- a/Gem/gemlist_info-help.pd +++ b/Gem/gemlist_info-help.pd @@ -40,7 +40,7 @@ #X text 10 414 Create window:; #X text 50 12 Synopsis: [gemlist_info]; #X text 71 31 Class: information object; -#X text 29 77 Description: get curent transformation of a gemlist; +#X text 29 77 Description: get current transformation of a gemlist; #X text 42 94 [gemlist_info] accepts a gemList decompost the transformation matrix in basic transformation (translation \, scale \, shear \, rotation) ; @@ -127,7 +127,7 @@ matrix in basic transformation (translation \, scale \, shear \, rotation) #X obj 178 610 scaleXYZ; #X obj 178 30 loadbang; #X msg 178 55 0; -#X text 50 844 this show the transformation neaded to create a specific +#X text 50 844 this show the transformation needed to create a specific transformation matrix decomposed with gemlist_info; #X connect 0 0 33 0; #X connect 1 0 33 1; diff --git a/Gem/gemlist_matrix-help.pd b/Gem/gemlist_matrix-help.pd index 30b6044..7c1aae3 100644 --- a/Gem/gemlist_matrix-help.pd +++ b/Gem/gemlist_matrix-help.pd @@ -85,7 +85,7 @@ #X obj 101 348 gemlist_info; #X obj 472 320 gemlist_matrix; #X text 14 351 see also :; -#X text 29 77 Description: get curent transformation matrix of a gemlist +#X text 29 77 Description: get current transformation matrix of a gemlist ; #X msg 496 378 \$1 \$2 \$3; #X msg 503 398 \$5 \$6 \$7; diff --git a/Gem/gemmouse.pd b/Gem/gemmouse.pd index e718deb..fa6fdde 100644 --- a/Gem/gemmouse.pd +++ b/Gem/gemmouse.pd @@ -1,6 +1,6 @@ #N canvas 56 51 1068 713 10; -#X obj 114 477 outlet x; -#X obj 183 477 outlet y; +#X obj 114 537 outlet x; +#X obj 183 537 outlet y; #X obj 390 477 outlet Left; #X obj 500 477 outlet Middle; #X obj 610 477 outlet Right; @@ -113,43 +113,89 @@ #X connect 20 0 1 0; #X connect 21 0 15 0; #X connect 21 0 16 0; -#X restore 187 223 pd arguments; -#X obj 169 281 * 1; -#X obj 239 281 * 1; -#X obj 187 198 loadbang; -#X obj 104 31 r __gem; -#X obj 104 52 route mouse dimen; -#X obj 176 148 route motion button; +#X restore 186 303 pd arguments; +#X obj 171 341 * 1; +#X obj 240 341 * 1; +#X obj 186 278 loadbang; +#X obj 110 28 r __gem; +#X obj 110 49 route mouse dimen; +#X obj 171 178 route motion button; #X obj 144 127 t b a; -#X obj 176 171 unpack; -#X obj 144 334 f; -#X obj 144 307 del 0; +#X obj 144 394 f; +#X obj 144 367 del 0; #X obj 390 295 route 0 1 2; -#X obj 104 83 list split 1; +#X obj 110 80 list split 1; #X obj 144 105 list trim; -#X obj 144 393 pack; -#X obj 144 415 unpack; +#X obj 144 453 pack; +#X obj 144 475 unpack; +#N canvas 179 390 849 418 out-of-window 0; +#X obj 336 22 inlet dimen; +#X obj 53 22 inlet XY; +#X obj 134 94 unpack; +#X obj 134 116 t f f; +#X obj 134 138 > 0; +#X obj 134 160 *; +#X obj 161 138 < 500; +#X obj 134 182 *; +#X obj 204 116 t f f; +#X obj 204 138 > 0; +#X obj 204 160 *; +#X obj 231 138 < 500; +#X obj 225 92 unpack; +#X obj 53 207 list prepend 1; +#X obj 53 58 t l l; +#X obj 53 229 route 1 0; +#X obj 53 251 outlet inside; +#X obj 153 251 outlet outside; +#X connect 0 0 12 0; +#X connect 1 0 14 0; +#X connect 2 0 3 0; +#X connect 2 1 8 0; +#X connect 3 0 4 0; +#X connect 3 1 6 0; +#X connect 4 0 5 0; +#X connect 5 0 7 0; +#X connect 6 0 5 1; +#X connect 7 0 13 1; +#X connect 8 0 9 0; +#X connect 8 1 11 0; +#X connect 9 0 10 0; +#X connect 10 0 7 1; +#X connect 11 0 10 1; +#X connect 12 0 6 1; +#X connect 12 1 11 1; +#X connect 13 0 15 0; +#X connect 14 0 13 0; +#X connect 14 1 2 0; +#X connect 15 0 16 0; +#X connect 15 1 17 0; +#X restore 171 231 pd out-of-window; +#X obj 264 207 t l l; +#X obj 171 253 unpack; #X connect 5 0 6 1; #X connect 5 1 7 1; -#X connect 6 0 14 1; -#X connect 7 0 19 1; +#X connect 6 0 13 1; +#X connect 7 0 18 1; #X connect 8 0 5 0; #X connect 9 0 10 0; -#X connect 10 0 17 0; -#X connect 10 1 5 1; -#X connect 11 0 13 0; -#X connect 11 1 16 0; -#X connect 12 0 15 0; +#X connect 10 0 16 0; +#X connect 10 1 21 0; +#X connect 11 0 20 0; +#X connect 11 1 15 0; +#X connect 12 0 14 0; #X connect 12 1 11 0; -#X connect 13 0 6 0; -#X connect 13 1 7 0; -#X connect 14 0 19 0; -#X connect 15 0 14 0; -#X connect 16 0 2 0; -#X connect 16 1 3 0; -#X connect 16 2 4 0; -#X connect 17 1 18 0; -#X connect 18 0 12 0; -#X connect 19 0 20 0; -#X connect 20 0 0 0; -#X connect 20 1 1 0; +#X connect 13 0 18 0; +#X connect 14 0 13 0; +#X connect 15 0 2 0; +#X connect 15 1 3 0; +#X connect 15 2 4 0; +#X connect 16 1 17 0; +#X connect 17 0 12 0; +#X connect 18 0 19 0; +#X connect 19 0 0 0; +#X connect 19 1 1 0; +#X connect 20 0 22 0; +#X connect 21 0 20 1; +#X connect 21 1 5 1; +#X connect 22 0 6 0; +#X connect 22 1 7 0; diff --git a/Gem/gemorb-help.pd b/Gem/gemorb-help.pd index 2894cda..8c74880 100644 --- a/Gem/gemorb-help.pd +++ b/Gem/gemorb-help.pd @@ -1,19 +1,19 @@ #N canvas 293 148 600 556 10; #X text 135 37 part of GEM; #X obj 157 187 gemorb 1; -#X text 69 93 respond to events of a SpaceOrb on a specified commport. +#X text 69 93 respond to events of a SpaceOrb on a specified comport. ; #X msg 157 290 (X Y Z) Position; #X msg 182 255 (X Y Z) Rotation; #X msg 208 219 (a b c d e f g) Button; #X text 152 70 [gemorb]; -#X text 67 326 [gemorb] connects to a SpaceOrb onthe commport specified +#X text 67 326 [gemorb] connects to a SpaceOrb on the comport specified as the creation-argument.; #X text 70 358 You have to have a SpaceOrb to make serious use of [gemorb] ; #X text 66 389 Position and Rotation give you float-triplets specifying the position/rotation at/for the 3 axis; -#X text 66 426 Button gives a 9tupel with the state \, each button +#X text 66 426 Button gives a 9tuple with the state \, each button is in; #X msg 180 118 reset; #X msg 180 140 timer <time>; diff --git a/Gem/gemsdlwindow.pd_darwin b/Gem/gemsdlwindow.pd_darwin Binary files differindex f31fa97..458af75 100755 --- a/Gem/gemsdlwindow.pd_darwin +++ b/Gem/gemsdlwindow.pd_darwin diff --git a/Gem/gemvertexbuffer-help.pd b/Gem/gemvertexbuffer-help.pd index fe1f6ad..1c5814c 100644 --- a/Gem/gemvertexbuffer-help.pd +++ b/Gem/gemvertexbuffer-help.pd @@ -177,7 +177,7 @@ #X obj 276 164 loadbang; #X text 329 108 This is an example of how fexpr~ could be used for solving differential equations \, in this case the lorenz equations -which generate chotic signals; +which generate chaotic signals; #X text 577 390 Note the following shorthands:; #X text 576 406 $y1 -> $y1[-1] \, $y2 -> $y2[-1] \, .....; #X text 464 344 the 'set' commands sets the initial previous values @@ -471,8 +471,8 @@ which generate chotic signals; #X obj 440 31 t b b b; #X text 162 619 color and position are updated at every frame. you just have to change array value....; -#X text 156 504 replace this with iem_tab_* stuf in order to increase -performances if you wish to update point position at every frame; +#X text 156 504 replace this with iem_tab_* stuff in order to increase +performance if you wish to update point positions at every frame; #X obj 36 -2 inlet; #X obj 123 122 f; #X obj 279 120 f; @@ -869,7 +869,7 @@ for partial draw.; #X floatatom 719 113 5 0 0 0 - - -, f 5; #X text 27 479 Inlet 1: message: program float : set the id for glsl program.; -#X text 27 409 Inlet 1: message: postion_enable float \, color_enable +#X text 27 409 Inlet 1: message: position_enable float \, color_enable float \, texture_enable float \, normal_enable float \, attribute_enable float : enable/disable the use of this data; #X text 27 507 Inlet 1: message: attribute name table (offset) : add diff --git a/Gem/gemwin-help.pd b/Gem/gemwin-help.pd index 2edbc7f..a460fec 100644 --- a/Gem/gemwin-help.pd +++ b/Gem/gemwin-help.pd @@ -459,7 +459,7 @@ window, f 32; #X floatatom 66 234 5 0 0 0 - - -, f 5; #X obj 80 283 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0 1; -#X text 174 297 turn the seperation-line between the 2 screens in stereo-mode +#X text 174 297 turn the separation-line between the 2 screens in stereo-mode 1 on/off; #X msg 79 344 0 \, destroy; #X msg 79 369 create \, 1; diff --git a/Gem/gemwin.pd b/Gem/gemwin.pd index d40c288..21e9a55 100644 --- a/Gem/gemwin.pd +++ b/Gem/gemwin.pd @@ -227,8 +227,12 @@ GEM \, buffer 2 \, cursor 1 \, topmost 0; #X obj 59 102 r \$0-buffer; #X obj 59 219 outlet; #X msg 59 124 buffer \$1; +#X msg 203 121 FSAA \$1; +#X obj 203 99 r \$0-FSAA; #X connect 0 0 2 0; #X connect 2 0 1 0; +#X connect 3 0 1 0; +#X connect 4 0 3 0; #X restore 126 291 pd rendercontext; #X connect 0 0 30 0; #X connect 1 0 33 0; diff --git a/Gem/light-help.pd b/Gem/light-help.pd index c135e39..04ff855 100644 --- a/Gem/light-help.pd +++ b/Gem/light-help.pd @@ -58,7 +58,7 @@ if you don't mind parallel light rays.; #X msg 527 184 debug \$1; #X text 19 219 Keep in mind that the attributes have to be set before rendering the vertices \, so if you are trying for frame accurate rendering -\, you will want to set the gemhead order to a low nuber so that all +\, you will want to set the gemhead order to a low number so that all of the values of the light get set first.; #X obj 472 296 sphere; #X floatatom 563 78 5 0 0 0 - - -; diff --git a/Gem/mesh_line-help.pd b/Gem/mesh_line-help.pd index ff3fce9..19a1502 100644 --- a/Gem/mesh_line-help.pd +++ b/Gem/mesh_line-help.pd @@ -52,14 +52,14 @@ #X obj 478 292 t a; #X obj 476 167 t a; #X text 7 69 Description: Renders a mesh; -#X text 27 247 Inlet 1: message: draw [line|defaulf|point]; +#X text 27 247 Inlet 1: message: draw [line|default|point]; #X text 27 261 Inlet 1: list: grid float : change the grid resolution ; #X obj 544 340 mesh_line 3; #X text 32 14 Synopsis: [mesh_line]; #X text 16 86 The [mesh_line] object renders a mesh in a line at the current position with current color. The size of the line can be changed -via the second inlet. This object is usefull when working with vertex_shader +via the second inlet. This object is useful when working with vertex_shader ; #X text 63 186 resolution of the line mesh; #X text 575 107 (draw line); diff --git a/Gem/mesh_square-help.pd b/Gem/mesh_square-help.pd index 582690b..28809ff 100644 --- a/Gem/mesh_square-help.pd +++ b/Gem/mesh_square-help.pd @@ -59,7 +59,7 @@ #X obj 476 167 t a; #X text 7 69 Description: Renders a mesh; #X text 63 186 resolution of the mesh; -#X text 27 247 Inlet 1: message: draw [line|defaulf|point]; +#X text 27 247 Inlet 1: message: draw [line|default|point]; #X text 27 261 Inlet 1: list: grid float : change the grid resolution ; #X text 27 274 Inlet 1: list: gridX float : change the X grid resolution @@ -68,7 +68,7 @@ ; #X text 16 86 The [mesh_square] object renders a mesh in a square at the current position with current color. The size of the square can -be changed via the second inlet. This object is usefull when working +be changed via the second inlet. This object is useful when working with vertex_shader; #X connect 3 0 4 0; #X connect 4 0 3 0; diff --git a/Gem/model-help.pd b/Gem/model-help.pd index 27b937d..815b41f 100644 --- a/Gem/model-help.pd +++ b/Gem/model-help.pd @@ -95,7 +95,7 @@ to be displayed.; \, 1==sphere mapping \, 2==UV-mapping (default); #X obj 574 254 hradio 15 1 0 3 empty empty empty 0 -6 0 8 -262144 -1 -1 0; -#X text 17 210 Images can be applied either as linear \, spheric or +#X text 17 210 Images can be applied either as linear \, spherical or UV textures.; #X msg 511 351 backends OBJ; #X msg 521 371 backends ASSIMP3; diff --git a/Gem/newWave-help.pd b/Gem/newWave-help.pd index 157bdbb..8034c2c 100644 --- a/Gem/newWave-help.pd +++ b/Gem/newWave-help.pd @@ -112,7 +112,7 @@ factors (defaults: K1=0.05 D1=0.1 K2=K3=D2=D3=0); #X msg 502 146 texture 0; #X msg 591 389 force 15 5 -0.5; #X obj 494 115 rotateXYZ 135 0 0; -#X text 24 290 Inlet 1: message: force (X Y val): aply a force of value +#X text 24 290 Inlet 1: message: force (X Y val): apply a force of value "val" onto the wave at position (X Y); #X text 63 159 1 : X grid-resolution \, default : 3; #X text 63 171 2 : Y grid resolution \, default : X value; diff --git a/Gem/part_head-help.pd b/Gem/part_head-help.pd index a2290f2..c80b9e9 100644 --- a/Gem/part_head-help.pd +++ b/Gem/part_head-help.pd @@ -15,7 +15,7 @@ the speed-message.; #X text 44 380 [part_head] takes the number of particles that can exist in one instance of time as a creation-argument. (default=1000); #X text 53 424 if your particles do not die (e.g.: because the are -killed wiht [part_killold]) \, your particle source will stop emitting +killed with [part_killold]) \, your particle source will stop emitting particles after some time.; #X connect 0 0 3 0; #X connect 3 0 2 0; diff --git a/Gem/pix_biquad-help.pd b/Gem/pix_biquad-help.pd index f8c48f6..a392626 100644 --- a/Gem/pix_biquad-help.pd +++ b/Gem/pix_biquad-help.pd @@ -63,7 +63,7 @@ #X text 505 77 open a supported; #X text 506 88 movie-clip; #X text 523 114 macOS: quicktime; -#X text 516 104 windos: *.AVI; +#X text 516 104 MS Windows: *.AVI; #X text 523 124 linux: depends...; #X text 29 57 Description: timebased IIR-filter; #X floatatom 457 191 3 0 1 2 fb0 - -; diff --git a/Gem/pix_blob-help.pd b/Gem/pix_blob-help.pd index 69fec29..285e9c0 100644 --- a/Gem/pix_blob-help.pd +++ b/Gem/pix_blob-help.pd @@ -27,7 +27,7 @@ of the blob.; <color-weights>. pE: "1 0 2" will give more weight to the blue-channel than to the red-channel \, green- and alpha-values will be ignored. ; -#X text 56 617 Specifing only one single color-weight <w> \, is the +#X text 56 617 Specifying only one single color-weight <w> \, is the same as "<w> <w> <w> 0"; #X connect 0 0 5 0; #X connect 5 0 1 0; diff --git a/Gem/pix_blobtracker-help.pd b/Gem/pix_blobtracker-help.pd index c715fa7..ce72326 100644 --- a/Gem/pix_blobtracker-help.pd +++ b/Gem/pix_blobtracker-help.pd @@ -61,7 +61,7 @@ #X text 505 77 open a supported; #X text 506 88 movie-clip; #X text 523 114 macOS: quicktime; -#X text 516 104 windos: *.AVI; +#X text 516 104 MS Windows: *.AVI; #X text 523 124 linux: depends...; #X floatatom 463 190 3 0 100 2 threshold - -; #X obj 463 207 / 100; @@ -387,7 +387,7 @@ #X restore 541 301 pd showblobs; #X text 17 78 [pix_blobtracker] is able to detect multiple blobs within an image and tries to keep track of which blob is which to keep indices -consistant while the blobs are moving.; +consistent while the blobs are moving.; #X text 16 127 [pix_blobtracker] is an abstraction based on [pix_multiblob] for blob-detection and some mtx-objects from "iemmatrix" (which you need to have installed on your system!) to do the actual tracking. diff --git a/Gem/pix_blobtracker.pd b/Gem/pix_blobtracker.pd index dcdbf20..b496ad0 100644 --- a/Gem/pix_blobtracker.pd +++ b/Gem/pix_blobtracker.pd @@ -68,7 +68,7 @@ trace of the result!; #X restore 61 221 pd mtx_rowpermutate; #X text 34 383 this algorithm is _far_ from being perfect! the [mtx_rowpermutate] does not really guarantee that the trace of the result is a global -mimimum \; if it is not \, than the match will be sub-optimal! this +minimum \; if it is not \, than the match will be sub-optimal! this will be even worse \, if there are several _equal_ (sub)minima in the distance-matrix.; #X text 158 194 greater distances have an extra penalty (^2) \; is diff --git a/Gem/pix_buffer-help.pd b/Gem/pix_buffer-help.pd index 2e2701d..4597446 100644 --- a/Gem/pix_buffer-help.pd +++ b/Gem/pix_buffer-help.pd @@ -22,7 +22,7 @@ have a look at it's contents).; #X text 23 281 Inlet 1: bang: get the size of the buffer in frames ; #X text 12 123 The images stored in the [pix_buffer] can have different -dimensions and coulorspaces. Memory is reserved on demand \, but you +dimensions and colourspaces. Memory is reserved on demand \, but you can preallocate memory with the [allocate( message.; #X text 23 481 Outlet 1: int: size of the buffer; #X msg 464 128 bang; diff --git a/Gem/pix_buffer_filmopen-help.pd b/Gem/pix_buffer_filmopen-help.pd index 2fcbdf0..16a3faf 100644 --- a/Gem/pix_buffer_filmopen-help.pd +++ b/Gem/pix_buffer_filmopen-help.pd @@ -54,7 +54,7 @@ buffer.; in the [pix_buffer] object \, starting at an (optional) bufferindex (defaults to 0). The film is read as fast as possible and the entire film is read \, so you might get clicks.; -#X text 13 151 This object is meant to be used at initialzation time. +#X text 13 151 This object is meant to be used at initialization time. ; #X text 26 280 Inlet 1: message: open <filename> <bufferindex>: read a filename into buffer starting at index.; diff --git a/Gem/pix_buffer_write-help.pd b/Gem/pix_buffer_write-help.pd index 1537ba0..53a2595 100644 --- a/Gem/pix_buffer_write-help.pd +++ b/Gem/pix_buffer_write-help.pd @@ -61,7 +61,7 @@ #X text 505 77 open a supported; #X text 506 88 movie-clip; #X text 523 114 macOS: quicktime; -#X text 516 104 windos: *.AVI; +#X text 516 104 MS Windows: *.AVI; #X text 523 124 linux: depends...; #X floatatom 560 196 3 0 9 2 index - -; #X text 50 12 Synopsis: [pix_buffer_write]; diff --git a/Gem/pix_colorreduce-help.pd b/Gem/pix_colorreduce-help.pd index 254a06a..9c34b53 100644 --- a/Gem/pix_colorreduce-help.pd +++ b/Gem/pix_colorreduce-help.pd @@ -65,7 +65,7 @@ #X text 42 95 [pix_colorreduce] will reduce the number of colours in a pixImage \, based on statistical information of the image.; #X text 64 232 Inlet 2: float: number of colours; -#X text 64 247 Inlet 3: float: perisistency of the palette; +#X text 64 247 Inlet 3: float: persistency of the palette; #X text 64 262 Inlet 4: float: edge smoothing; #X floatatom 464 178 5 0 255 2 number - -; #X floatatom 516 178 5 0 1 2 persist - -; diff --git a/Gem/pix_coordinate-help.pd b/Gem/pix_coordinate-help.pd index 7928558..0f18a93 100644 --- a/Gem/pix_coordinate-help.pd +++ b/Gem/pix_coordinate-help.pd @@ -33,7 +33,7 @@ #X connect 6 0 0 0; #X connect 7 0 0 0; #X restore 479 383 pd gemwin; -#X msg 479 364 destroy; +#X msg 479 364 create; #X text 475 343 Create window:; #X obj 450 188 cnv 15 160 100 empty empty empty 20 12 0 14 -24198 -66577 0; @@ -69,30 +69,30 @@ the texture S \, T values from 1 \, 1 to 2 \, 2 (See the examples). #X text 63 367 Inlet 2: list: 8 values (4 (s \, t)-pairs); #X obj 538 144 loadbang; #X msg 461 237 \$1 \$1 0 \$1 0 0 \$1 0; -#X floatatom 461 220 3 0 256 0 - - -; +#X floatatom 461 220 3 0 256 0 - - -, f 3; #X obj 451 136 pix_texture; #X text 14 159 IMPORTANT NOTE-1: [pix_texture] sets the texture-coordinates to "appropriate" values \, so you probably want to use [pix_coordinate] afterwards; -#X obj 10 207 cnv 15 420 70 empty empty empty 20 12 0 14 -225280 -66577 +#X obj 10 201 cnv 15 420 45 empty empty empty 20 12 0 14 -225280 -66577 0; -#X text 14 209 IMPORTANT NOTE-2: if your hardware supports it \, Gem -tries to use "rectangle-texturing". This means that normal texture-coordinates -range from 0..xsize (resp. 0..ysize). If it is not supported (or forced-off -with "mode 0" to [pix_texture]) texture-coordinates range from 0..1 -; #X obj 451 266 pix_coordinate; #X msg 459 193 0 0 1 0 1 1 0 1; #X msg 468 167 rectangle 0 \, repeat 1; +#X text 14 248 IMPORTANT NOTE-3: Images with dimensions that are not +powers-of-2 \, will not "repeat" properly in any case., f 60; +#X text 14 203 IMPORTANT NOTE-2: if your hardware supports it \, Gem +tries to use "rectangle-texturing"\\\, which does not support "repeat" +mode. This is an OpenGL limitation; #X connect 10 0 11 0; #X connect 11 0 10 0; #X connect 14 0 17 0; #X connect 16 0 17 1; #X connect 17 0 31 0; -#X connect 28 0 37 0; -#X connect 29 0 35 1; +#X connect 28 0 36 0; +#X connect 29 0 34 1; #X connect 30 0 29 0; -#X connect 31 0 35 0; -#X connect 35 0 23 0; -#X connect 36 0 35 1; -#X connect 37 0 31 0; +#X connect 31 0 34 0; +#X connect 34 0 23 0; +#X connect 35 0 34 1; +#X connect 36 0 31 0; diff --git a/Gem/pix_crop-help.pd b/Gem/pix_crop-help.pd index 51deaac..634f718 100644 --- a/Gem/pix_crop-help.pd +++ b/Gem/pix_crop-help.pd @@ -71,7 +71,7 @@ #X floatatom 556 177 5 0 0 1 offY - -; #X text 29 77 Description: get a subimage of an image; #X text 12 91 [pix_crop]: only passes the selected rectangle further -on. The slection is made by the dimension of the subimage in pixels +on. The selection is made by the dimension of the subimage in pixels and the offset (in pixels) from the lower left corner.; #X text 516 105 open an image; #X text 509 118 (JPEG \, TIFF \, ..); diff --git a/Gem/pix_delay-help.pd b/Gem/pix_delay-help.pd index 9600757..8dfc7f9 100644 --- a/Gem/pix_delay-help.pd +++ b/Gem/pix_delay-help.pd @@ -67,7 +67,7 @@ #X text 505 77 open a supported; #X text 506 88 movie-clip; #X text 505 109 macOS: quicktime; -#X text 498 99 windos: *.AVI; +#X text 498 99 MS Windows: *.AVI; #X text 505 119 linux: depends...; #X text 528 198 scrub me!; #X text 64 195 int: max.number of delayed frames; diff --git a/Gem/pix_diff-help.pd b/Gem/pix_diff-help.pd index 5b8f8d2..2c71f56 100644 --- a/Gem/pix_diff-help.pd +++ b/Gem/pix_diff-help.pd @@ -82,7 +82,7 @@ #X text 50 12 Synopsis: [pix_diff]; #X text 29 67 Description: get the difference between 2 pixes; #X text 24 94 [pix_diff] will get the absolute value of the difference -between 2 images (in contrastg to [pix_subtract]); +between 2 images (in contrast to [pix_subtract]); #X obj 450 187 pix_diff; #X text 32 353 see also:; #X obj 100 353 pix_subtract; diff --git a/Gem/pix_drum-help.pd b/Gem/pix_drum-help.pd index 1ea6a59..b4f76b3 100644 --- a/Gem/pix_drum-help.pd +++ b/Gem/pix_drum-help.pd @@ -24,7 +24,7 @@ #X obj 160 298 outlet; #X text 41 190 mode; #X text 169 14 first inlet takes the threshold value (0-1); -#X text 240 190 min_wid; +#X text 233 190 min_width; #X text 290 190 dist_ctr; #X msg 144 106 12; #X msg 222 108 0.12; @@ -142,7 +142,7 @@ #X connect 6 0 3 0; #X restore 409 52 pd presets; #X text 292 269 bottom \, top \, right \, left; -#X text 57 83 mode: selescts mode of operation (0 \, 1 or 2); +#X text 57 83 mode: selects mode of operation (0 \, 1 or 2); #X text 56 121 thresh: threshold for contrast (0-1); #X text 6 494 pix_drum looks for black pixels incoming from the top a video frame.; @@ -162,7 +162,7 @@ graph \, values higher than this scaled height are part of a peak; than scaled height to report a peak; #X text 57 213 dist_ctr: minimum distance from primary peak to report a secondary peak.; -#X text 265 257 INLET 2: defines the bounds of the anrea of analysis +#X text 265 257 INLET 2: defines the bounds of the area of analysis ; #X text 56 68 INLET 1: Analysis Parameters; #X text 6 471 INFORMATION; @@ -173,7 +173,7 @@ the primary peak.; #X text 9 660 where (x) is a deviation from the center (i). If the line is straight y=0 \, if it is concave or convex \, hey are negative or positive.; -#X text 11 699 The results of this test are recroded in a graph. secondary +#X text 11 699 The results of this test are recoded in a graph. secondary peaks are the point where two concave curves meet \, which therefore has a higher value for y in the concavity text.; #N canvas 0 0 450 300 print 0; @@ -213,7 +213,7 @@ has a higher value for y in the concavity text.; #X text 188 337 outlet 1: primary peak information; #X text 211 368 Areas are normalized; #X text 189 383 outlet 2: secondary peak information; -#X text 212 415 side: At which side of the 1ry preak is the secondary +#X text 212 415 side: At which side of the primary peak is the secondary peak.; #X text 246 427 Left = 0 \, Right = 1; #X text 220 353 [x coord. \, y coord. \, Left Area \, Right Area]; @@ -225,7 +225,7 @@ peak.; #X text 249 837 joliverl-2010 v0.01; #X text 193 454 outlets 3 and 4 are currently not supported; #X text 12 756 This object was programmed as part of the Silent Percussion -Proect \, for use in the Silent Drum Controller. For more infomation: +Project \, for use in the Silent Drum Controller. For more information: http://www.jaimeoliver.pe/drum; #X connect 0 0 1 0; #X connect 0 1 29 0; diff --git a/Gem/pix_drum.pd_darwin b/Gem/pix_drum.pd_darwin Binary files differindex 34aa451..9a6ab34 100755 --- a/Gem/pix_drum.pd_darwin +++ b/Gem/pix_drum.pd_darwin diff --git a/Gem/pix_dump-help.pd b/Gem/pix_dump-help.pd index 9e28fa3..91b78ac 100644 --- a/Gem/pix_dump-help.pd +++ b/Gem/pix_dump-help.pd @@ -63,7 +63,7 @@ #X obj 502 213 print DATA; #X msg 487 162 bang; #X text 29 76 Description: dump all the pixel-data of an image; -#X text 21 111 [pix_dump] will output one long list of (m*n) Pixel-Tupel. +#X text 21 111 [pix_dump] will output one long list of (m*n) pixel-tuples. ; #X text 22 142 For a RGBA-image the list will have the form:; #X text 42 162 R1 G1 B1 A1 R2 G2 B2 A2 R3 G3 ... B(m*n) A(m*n); @@ -76,7 +76,7 @@ #X obj 451 245 pix_texture; #X obj 451 267 rectangle 3 3; #X msg 530 186 bytemode \$1; -#X text 63 286 Inlet 1: bytemode: set normlisation on or off; +#X text 63 286 Inlet 1: bytemode: set normalization on or off; #X connect 10 0 11 0; #X connect 11 0 10 0; #X connect 14 0 17 0; diff --git a/Gem/pix_fiducialtrack.pd_darwin b/Gem/pix_fiducialtrack.pd_darwin Binary files differindex 6200752..0a643aa 100755 --- a/Gem/pix_fiducialtrack.pd_darwin +++ b/Gem/pix_fiducialtrack.pd_darwin diff --git a/Gem/pix_film-help.pd b/Gem/pix_film-help.pd index da39b97..9a2c16d 100644 --- a/Gem/pix_film-help.pd +++ b/Gem/pix_film-help.pd @@ -57,8 +57,8 @@ #X msg 463 136 open \$1; #X obj 451 432 rectangle 4 3; #X text 50 12 Synopsis: [pix_film]; -#X text 15 78 [pix_film] loads in a preproducecd digital-video to be -used aas a texture \, bitblit or something else.; +#X text 15 78 [pix_film] loads in a preproduced digital-video to be +used as a texture \, bitblit or something else.; #X text 64 249 symbol: file to load initially; #X text 18 303 Inlet 1: message: open <filename> [RGBA|YUV|Grey]: opens the movie <filename> and decodes it into the specified color-space. @@ -90,7 +90,7 @@ to zero when the end of the film is reached.; #N canvas 18 78 928 614 :: 0; #X text 24 16 the format [pix_film] is able to decode depends on the system you are running Gem.; -#X text 33 52 basically Gem's decoding capabailities are handled by +#X text 33 52 basically Gem's decoding capabilities are handled by plugins. You should see \, which plugins are loaded \, when instantiating the first [pix_film] object: a line "[pix_film]: foo support" means \, that the 'foo' plugin has been loaded.; @@ -149,7 +149,7 @@ to decode MPEG-streams; #X text 473 512 outputs test images rather than decoding real media files; #X text 270 194 available film decoding plugins; -#X text 260 210 (recommended plugins are highlighed); +#X text 260 210 (recommended plugins are highlighted); #X text 474 452 an alternative implementation of the QuickTime plugin for OS-X only; #X restore 455 484 pd :: FORMATS; diff --git a/Gem/pix_freeframe-help.pd b/Gem/pix_freeframe-help.pd index 64f62a5..c0e8b7c 100644 --- a/Gem/pix_freeframe-help.pd +++ b/Gem/pix_freeframe-help.pd @@ -67,7 +67,7 @@ domain and commercial plugin-packs at http://freeframe.org; #X text 505 77 open a supported; #X text 506 88 movie-clip; #X text 523 114 macOS: quicktime; -#X text 516 104 windos: *.AVI; +#X text 516 104 MS Windows: *.AVI; #X text 523 124 linux: depends...; #X obj 450 227 cnv 15 160 85 empty empty empty 20 12 0 14 -24198 -66577 0; @@ -90,7 +90,7 @@ domain and commercial plugin-packs at http://freeframe.org; you cannot change it (apart from deleting the object and creating a new one); #X text 13 154 However \, if you only create an object [pix_freeframe] -(without specifying the pugin \, you will get a dynamic version \, +(without specifying the plugin \, you will get a dynamic version \, where you can load in a plugin using the "load" message.; #X text 12 308 Plugins are searched in all the paths that Pd searches for abstractions \, ...!; diff --git a/Gem/pix_frei0r-help.pd b/Gem/pix_frei0r-help.pd index 34a8a1e..27300de 100644 --- a/Gem/pix_frei0r-help.pd +++ b/Gem/pix_frei0r-help.pd @@ -74,7 +74,7 @@ for abstractions \, ...!; #X text 505 77 open a supported; #X text 506 88 movie-clip; #X text 523 114 macOS: quicktime; -#X text 516 104 windos: *.AVI; +#X text 516 104 MS Windows: *.AVI; #X text 523 124 linux: depends...; #X obj 450 227 cnv 15 160 85 empty empty empty 20 12 0 14 -24198 -66577 0; @@ -96,7 +96,7 @@ for abstractions \, ...!; [pix_frei0r bw0r] or [pix_bw0r] \, the plugin is fixed and you cannot change it (apart from deleting the object and creating a new one); #X text 13 163 However \, if you only create an object [pix_frei0r] -(without specifying the pugin \, you will get a dynamic version \, +(without specifying the plugin \, you will get a dynamic version \, where you can load in a plugin using the "load" message.; #X text 12 202 Most plugins have a number of parameters which you can use to change the behaviour of the effect while it runs. For each parameter diff --git a/Gem/pix_gain-help.pd b/Gem/pix_gain-help.pd index e543861..810b57a 100644 --- a/Gem/pix_gain-help.pd +++ b/Gem/pix_gain-help.pd @@ -66,16 +66,16 @@ #X floatatom 476 151 5 0 0 1 common - -; #X msg 527 179 1 0.5 0; #X msg 528 201 0 0.4 0.8 1; -#X text 10 93 pix_gain applies a gain multipler to each pixel in a +#X text 10 93 pix_gain applies a gain multiplier to each pixel in a pix. The float is a constant modifier applied to all color components. -If you use just R G B \, it asumes an alpha of 1.0.; +If you use just R G B \, it assumes an alpha of 1.0.; #X text 13 152 NOTE: while you can use this \, remember that you can -often acchieve the very same thing using the [color]-object for coloring +often achieve the very same thing using the [color]-object for coloring the Geo onto which the image data is textured \, which could be done on the gfx-card (very efficient!) \, while [pix_gain] is always(!) done on the CPU!!!; -#X text 23 305 Inlet 1: <float>: multiplyer for all channels; -#X text 23 321 Inlet 2: list: 3 (RGB) or 4 (RGBA) values as multiplyers +#X text 23 305 Inlet 1: <float>: multiplier for all channels; +#X text 23 321 Inlet 2: list: 3 (RGB) or 4 (RGBA) values as multipliers for each channels; #X connect 10 0 11 0; #X connect 11 0 10 0; diff --git a/Gem/pix_hit-help.pd b/Gem/pix_hit-help.pd index d7e2901..a4e574b 100644 --- a/Gem/pix_hit-help.pd +++ b/Gem/pix_hit-help.pd @@ -62,7 +62,7 @@ #X text 511 56 open a supported; #X text 512 67 movie-clip; #X text 529 93 macOS: quicktime; -#X text 522 83 windos: *.AVI; +#X text 522 83 MS Windows: *.AVI; #X text 529 103 linux: depends...; #X floatatom 469 166 3 0 100 2 threshold - -; #X obj 469 180 / 100; @@ -92,7 +92,7 @@ whether blob is within rectangle at x/y with dimension w/h; #X text 24 381 Inlet 1: show <bool>: whether to mark hit blobs in the output image or not (default: 0); #X text 17 447 Outlet 2: hit info: "list <ID:int> <hit:bool>" that -indicates which tests were successfull.; +indicates which tests were successful.; #X text 12 71 [pix_hit] detects whether a "min" number of pixels is over a given "threshold" within a given test area. You can add up to 256 (currently this is a hardcoded limit) test areas \, each of them diff --git a/Gem/pix_hit.pd_darwin b/Gem/pix_hit.pd_darwin Binary files differindex 1d98754..0be6cee 100755 --- a/Gem/pix_hit.pd_darwin +++ b/Gem/pix_hit.pd_darwin diff --git a/Gem/pix_hsv2rgb-help.pd b/Gem/pix_hsv2rgb-help.pd index a54634f..ca22b54 100644 --- a/Gem/pix_hsv2rgb-help.pd +++ b/Gem/pix_hsv2rgb-help.pd @@ -63,7 +63,7 @@ #X obj 451 186 pix_hsv2rgb; #X obj 468 165 tgl 15 1 empty empty empty 0 -6 0 8 -262144 -1 -1 1 1; -#X text 63 275 Inlet 1: 0|1 : apply/don't apply; +#X text 63 275 Inlet 1: 1|0 : apply/don't apply; #X text 50 12 Synopsis: [pix_hsv2rgb]; #X text 29 76 Description: convert HSV into RGB; #X text 25 104 [pix_hsv2rgb] will (virtually) transform an HSV(hue diff --git a/Gem/pix_indycam-help.pd b/Gem/pix_indycam-help.pd index 79ec54c..297feeb 100644 --- a/Gem/pix_indycam-help.pd +++ b/Gem/pix_indycam-help.pd @@ -7,7 +7,7 @@ the camera (especially to create an image with dimensions a power of 2!); #X text 45 373 dimen x y : set the x y dimensions in pixels; #X text 45 393 zoom x y : set the zoom factor (1.0 is nominal); -#X text 46 417 bright value : set the brightnes factor; +#X text 46 417 bright value : set the brightness factor; #X text 47 441 contrast value : set the contrast factor; #X text 47 459 hue value : set the hue factor; #X text 47 478 sat value : set the saturation; @@ -16,6 +16,6 @@ the camera (especially to create an image with dimensions a power of #X text 45 240 [pix_indycam] creates pixes from a SGI video camera. ; #X text 41 264 [pix_indycam] obviously only works with SGI video workstations. -The name inidicates that it likes SGI-indy's the most.; +The name indicates that it likes SGI-indy's the most.; #X connect 0 0 10 0; #X connect 10 0 1 0; diff --git a/Gem/pix_info-help.pd b/Gem/pix_info-help.pd index 145cc8a..6336619 100644 --- a/Gem/pix_info-help.pd +++ b/Gem/pix_info-help.pd @@ -82,7 +82,7 @@ YUV (not standardized); ; #X obj 451 166 pix_info . . . .; #X text 57 380 Outlet 8: pointer: image-data; -#X text 57 349 Outlet 6: list: <type> <upsidedown> <notowed>; +#X text 57 349 Outlet 6: list: <type> <upsidedown> <notowned>; #X text 57 366 Outlet 7: list: <newimage> <newfilm>; #X connect 10 0 11 0; #X connect 11 0 10 0; diff --git a/Gem/pix_invert-help.pd b/Gem/pix_invert-help.pd index 2ff8832..60e57ec 100644 --- a/Gem/pix_invert-help.pd +++ b/Gem/pix_invert-help.pd @@ -62,7 +62,7 @@ #X text 509 118 (JPEG \, TIFF \, ..); #X obj 468 165 tgl 15 1 empty empty empty 0 -6 0 8 -262144 -1 -1 1 1; -#X text 63 275 Inlet 1: 0|1 : apply/don't apply; +#X text 63 275 Inlet 1: 1|0 : apply/don't apply; #X obj 451 186 pix_invert; #X text 29 76 Description: invert an image; #X text 16 126 [pix_invert] will invert your image. Thus all black diff --git a/Gem/pix_mano-help.pd b/Gem/pix_mano-help.pd index 5359bbb..4f1de5a 100644 --- a/Gem/pix_mano-help.pd +++ b/Gem/pix_mano-help.pd @@ -322,7 +322,7 @@ as a hand; #X text 460 449 outlet 4: valleys found in the contour; #X text 460 491 outlet 5: contours found; #X text 461 542 outlet 6: end of algorithm report; -#X text 457 148 inlet 2: defines the bounds of the anrea of analysis +#X text 457 148 inlet 2: defines the bounds of the area of analysis ; #X text 484 160 bottom \, top \, right \, left; #X text 457 181 inlet 3: parameters of contour analysis; @@ -342,20 +342,20 @@ pix_samp; (eg. hands) over a light absorbing background (eg. black cloth). Light reflecting objects need to enter the video frame from one of the sides to be recognized. For example \, a white circle in the center will -not be recognized as there is no entry pount in the borders of the +not be recognized as there is no entry point in the borders of the frame.; #X text 58 426 Roughly \, the object works by setting a threshold to -discriminate bewteen black and white pixels. shapes formed of white +discriminate between black and white pixels. shapes formed of white pixels are analyzed in the order of largest entry section.; #X text 581 628 support information in www.jaimeoliver.pe; #X text 59 483 For each object an analysis of its contour is achieved. (see graph option in outlet two while entering your hand into the frame). The contours formed by a hand are averaged for smoothing and sampled \, and then are plotted as x \, y coordinates and variation in angle -with respect to the previous sampled point. Ana analysis of this contour +with respect to the previous sampled point. An analysis of this contour provides tips (positive peaks) and valleys (negative peaks); #X text 76 576 This object was programmed as part of the Silent Percussion -Proect \, for use in the MANO Controller. For more infomation: http://www.jaimeoliver.pe +Project \, for use in the MANO Controller. For more information: http://www.jaimeoliver.pe ; #X obj 117 47 pack f f f f; #X text 695 642 jaime.oliver@gmail.com; diff --git a/Gem/pix_mano.pd_darwin b/Gem/pix_mano.pd_darwin Binary files differindex 91b596f..f0b89df 100755 --- a/Gem/pix_mano.pd_darwin +++ b/Gem/pix_mano.pd_darwin diff --git a/Gem/pix_metaimage-help.pd b/Gem/pix_metaimage-help.pd index 4633ce3..cf6f855 100644 --- a/Gem/pix_metaimage-help.pd +++ b/Gem/pix_metaimage-help.pd @@ -60,7 +60,7 @@ #X obj 451 253 pix_draw; #X text 516 105 open an image; #X text 509 118 (JPEG \, TIFF \, ..); -#X text 63 335 Inlet 1: 0|1 : apply/don't apply; +#X text 63 335 Inlet 1: 1|0 : apply/don't apply; #X obj 451 226 pix_metaimage; #X floatatom 537 159 3 0 1 1 size - -; #X obj 457 178 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 @@ -70,7 +70,7 @@ 1; #X msg 521 196 distance \$1; #X text 29 76 Description: display a pix by itself; -#X text 49 12 Synopsis: [pix_metaimate]; +#X text 49 12 Synopsis: [pix_metaimage]; #X text 22 103 The output image is composed of many smaller versions of the input image \, altered to match the colors of the area they cover in the original image.; diff --git a/Gem/pix_mix-help.pd b/Gem/pix_mix-help.pd index 49c8b76..9ea0717 100644 --- a/Gem/pix_mix-help.pd +++ b/Gem/pix_mix-help.pd @@ -100,7 +100,7 @@ You can supply mixing factors A and B \, and the result will be out=in1*A+in2*B. If you supply only one factor A \, the result will be out=in1*(1-A)+in2*A. ; #X text 22 255 Inlet 3: float: weight for left image. right weight -will be the reciproque value (for crossfading); +will be the reciprocal value (for crossfading); #X connect 10 0 11 0; #X connect 11 0 10 0; #X connect 14 0 17 0; diff --git a/Gem/pix_motionblur-help.pd b/Gem/pix_motionblur-help.pd index 025c347..13538fa 100644 --- a/Gem/pix_motionblur-help.pd +++ b/Gem/pix_motionblur-help.pd @@ -64,7 +64,7 @@ #X text 505 77 open a supported; #X text 506 88 movie-clip; #X text 505 109 macOS: quicktime; -#X text 498 99 windos: *.AVI; +#X text 498 99 MS Windows: *.AVI; #X text 505 119 linux: depends...; #X obj 451 238 pix_motionblur; #X text 50 12 Synopsis: [pix_motionblur]; diff --git a/Gem/pix_movement-help.pd b/Gem/pix_movement-help.pd index 83baff8..59b3ec0 100644 --- a/Gem/pix_movement-help.pd +++ b/Gem/pix_movement-help.pd @@ -63,7 +63,7 @@ #X text 505 77 open a supported; #X text 506 88 movie-clip; #X text 523 114 macOS: quicktime; -#X text 516 104 windos: *.AVI; +#X text 516 104 MS Windows: *.AVI; #X text 523 124 linux: depends...; #X text 29 57 Description: timebased IIR-filter; #X floatatom 527 191 3 0 100 2 threshold - -; diff --git a/Gem/pix_movement2-help.pd b/Gem/pix_movement2-help.pd index 9a10050..a9fda39 100644 --- a/Gem/pix_movement2-help.pd +++ b/Gem/pix_movement2-help.pd @@ -63,7 +63,7 @@ #X text 505 77 open a supported; #X text 506 88 movie-clip; #X text 523 114 macOS: quicktime; -#X text 516 104 windos: *.AVI; +#X text 516 104 MS Windows: *.AVI; #X text 523 124 linux: depends...; #X floatatom 495 190 3 0 100 2 lo_threshold - -; #X obj 494 206 / 100; diff --git a/Gem/pix_movie-help.pd b/Gem/pix_movie-help.pd index 25ad1c1..6cab430 100644 --- a/Gem/pix_movie-help.pd +++ b/Gem/pix_movie-help.pd @@ -76,7 +76,7 @@ used as a texture \, bitblit or something else.; #N canvas 830 50 450 300 demo 0; #X obj 23 26 inlet; #X text 126 127 win32:; -#X text 116 190 linux \, os-X:; +#X text 116 190 linux \, OSX:; #X obj 79 257 outlet; #X obj 20 50 bng 17 250 50 0 empty empty empty 17 7 0 10 -262144 -1 -1; diff --git a/Gem/pix_multiblob-help.pd b/Gem/pix_multiblob-help.pd index e9f04fc..03fa1f2 100644 --- a/Gem/pix_multiblob-help.pd +++ b/Gem/pix_multiblob-help.pd @@ -76,7 +76,7 @@ minimum size of a blob that is needed to be detected.; #X text 511 56 open a supported; #X text 512 67 movie-clip; #X text 529 93 macOS: quicktime; -#X text 522 83 windos: *.AVI; +#X text 522 83 MS Windows: *.AVI; #X text 529 103 linux: depends...; #X floatatom 469 169 3 0 100 2 threshold - -; #X obj 469 186 / 100; diff --git a/Gem/pix_multiply-help.pd b/Gem/pix_multiply-help.pd index 47eca68..c38ce59 100644 --- a/Gem/pix_multiply-help.pd +++ b/Gem/pix_multiply-help.pd @@ -82,7 +82,7 @@ #X text 50 12 Synopsis: [pix_multiply]; #X text 29 67 Description: multiply 2 images; #X obj 451 198 pix_multiply; -#X text 29 91 [pix_mutltiply] simply multiplies two pixes together. +#X text 29 91 [pix_multiply] simply multiplies two pixes together. E.g: where either of the pixels is black \, the resulting image will be black too. Thus it is simple to get black images.; #X connect 10 0 11 0; diff --git a/Gem/pix_multitexture-help.pd b/Gem/pix_multitexture-help.pd index 8544548..4ca2da8 100644 --- a/Gem/pix_multitexture-help.pd +++ b/Gem/pix_multitexture-help.pd @@ -10,10 +10,10 @@ 0; #X text 71 27 Class: pix object; #X text 50 8 Synopsis: [pix_multitexture]; -#X text 29 53 Description: apply multiple texture mappings to the curent +#X text 29 53 Description: apply multiple texture mappings to the current network; #X text 13 86 [pix_multitexture] uses different texture information -\, and attaches them to the curent chain. This is most useful when +\, and attaches them to the current chain. This is most useful when working with shaders.; #X obj 8 388 cnv 15 430 235 empty empty empty 20 12 0 14 -233017 -66577 0; diff --git a/Gem/pix_noise-help.pd b/Gem/pix_noise-help.pd index ac55ef2..e5c3cbd 100644 --- a/Gem/pix_noise-help.pd +++ b/Gem/pix_noise-help.pd @@ -83,7 +83,7 @@ It defaults to 64*64. It can be dynamically changed by the set message. #X text 41 163 Each time you send a bang \, a new noise is generated. You can send an [auto 1( message to generate a noise for each render frame.; -#X text 42 453 seed <int> : change the initalization of the random +#X text 42 453 seed <int> : change the initialization of the random function; #X connect 8 0 9 0; #X connect 9 0 8 0; diff --git a/Gem/pix_normalize-help.pd b/Gem/pix_normalize-help.pd index 4d2ffab..8098f2c 100644 --- a/Gem/pix_normalize-help.pd +++ b/Gem/pix_normalize-help.pd @@ -70,7 +70,7 @@ #X text 509 118 (JPEG \, TIFF \, ..); #X obj 468 165 tgl 15 1 empty empty empty 0 -6 0 8 -262144 -1 -1 1 1; -#X text 63 275 Inlet 1: 0|1 : apply/don't apply; +#X text 63 275 Inlet 1: 1|0 : apply/don't apply; #X obj 451 186 pix_normalize; #X text 29 76 Description: normalize an image; #X text 29 123 [pix_normalize] will normalize your image \, so that diff --git a/Gem/pix_offset-help.pd b/Gem/pix_offset-help.pd index 3564d4b..a96be1d 100644 --- a/Gem/pix_offset-help.pd +++ b/Gem/pix_offset-help.pd @@ -60,7 +60,7 @@ #X obj 451 233 pix_draw; #X text 516 105 open an image; #X text 509 118 (JPEG \, TIFF \, ..); -#X text 63 275 Inlet 1: 0|1 : apply/don't apply; +#X text 63 275 Inlet 1: 1|0 : apply/don't apply; #X obj 451 196 pix_offset; #X floatatom 483 171 5 0 1 0 - - -; #X msg 531 166 0.5 -0.5 0; diff --git a/Gem/pix_puzzle-help.pd b/Gem/pix_puzzle-help.pd index cfe8fca..27368c2 100644 --- a/Gem/pix_puzzle-help.pd +++ b/Gem/pix_puzzle-help.pd @@ -60,7 +60,7 @@ #X obj 451 263 pix_draw; #X text 516 105 open an image; #X text 509 118 (JPEG \, TIFF \, ..); -#X text 63 375 Inlet 1: 0|1 : apply/don't apply; +#X text 63 375 Inlet 1: 1|0 : apply/don't apply; #X msg 463 146 bang; #X text 50 12 Synopsis: [pix_puzzle]; #X text 63 77 Description: shuffle an image; @@ -77,7 +77,7 @@ Fukuchi (http://effectv.sourceforge.net); #X msg 509 145 size 4 3; #X msg 551 212 move \$1; #X floatatom 551 193 5 0 0 0 - - -; -#X text 63 433 Inlet 1: movee <int>: move the empty field; +#X text 63 433 Inlet 1: move <int>: move the empty field; #X text 192 238 8; #X text 175 253 4; #X text 209 254 6; diff --git a/Gem/pix_rectangle-help.pd b/Gem/pix_rectangle-help.pd index 05a94b3..e9c27eb 100644 --- a/Gem/pix_rectangle-help.pd +++ b/Gem/pix_rectangle-help.pd @@ -68,10 +68,10 @@ rectangle: <x1> <y1> <x2> <y2>; #X msg 494 151 40 10 100 200; #X text 13 305 Inlet 3: list : 3(RGB) or 4(RGBA) float-values defining -the color of the rectangle (defaut: 1 1 1 1); +the color of the rectangle (default: 1 1 1 1); #X text 21 111 pix_rectangle renders a rectangle onto a pix-buffer. This means that you have to have an image already loaded to render -into. Set the positione and size with the two corners of the rectangle. +into. Set the position and size with the two corners of the rectangle. ; #X connect 10 0 11 0; #X connect 11 0 10 0; diff --git a/Gem/pix_refraction-help.pd b/Gem/pix_refraction-help.pd index 2315e08..aa2b2b7 100644 --- a/Gem/pix_refraction-help.pd +++ b/Gem/pix_refraction-help.pd @@ -60,7 +60,7 @@ #X obj 451 253 pix_draw; #X text 516 105 open an image; #X text 509 118 (JPEG \, TIFF \, ..); -#X text 63 365 Inlet 1: 0|1 : apply/don't apply; +#X text 63 365 Inlet 1: 1|0 : apply/don't apply; #X floatatom 464 177 3 0.01 16 1 - - -; #X obj 35 477 cnv 15 375 20 empty empty empty 20 12 0 14 -260818 -66577 0; diff --git a/Gem/pix_rgb2hsv-help.pd b/Gem/pix_rgb2hsv-help.pd index 2e736b3..12cdc4e 100644 --- a/Gem/pix_rgb2hsv-help.pd +++ b/Gem/pix_rgb2hsv-help.pd @@ -62,7 +62,7 @@ #X text 509 118 (JPEG \, TIFF \, ..); #X obj 468 165 tgl 15 1 empty empty empty 0 -6 0 8 -262144 -1 -1 1 1; -#X text 63 275 Inlet 1: 0|1 : apply/don't apply; +#X text 63 275 Inlet 1: 1|0 : apply/don't apply; #X text 94 340 see also:; #X obj 186 338 pix_hsv2rgb; #X text 50 12 Synopsis: [pix_rgb2hsv]; diff --git a/Gem/pix_rtx-help.pd b/Gem/pix_rtx-help.pd index 06ef5ed..f203a96 100644 --- a/Gem/pix_rtx-help.pd +++ b/Gem/pix_rtx-help.pd @@ -63,7 +63,7 @@ #X text 505 77 open a supported; #X text 506 88 movie-clip; #X text 523 114 macOS: quicktime; -#X text 516 104 windos: *.AVI; +#X text 516 104 MS Windows: *.AVI; #X text 523 124 linux: depends...; #X obj 451 232 pix_rtx; #X text 50 12 Synopsis: [pix_rtx]; diff --git a/Gem/pix_set-help.pd b/Gem/pix_set-help.pd index 0bedafb..11cbc66 100644 --- a/Gem/pix_set-help.pd +++ b/Gem/pix_set-help.pd @@ -49,7 +49,7 @@ #X msg 460 140 RGB; #X text 63 296 <width> <height>; #X text 21 79 [pix_set] will allow you to set the image-data of a pixel -with one long list of (m*n) Pixel-Tupel.; +with one long list of (m*n) pixel-tuples.; #X text 22 109 The size of the image can be set with creation-arguments. It defaults to 64*64.; #X text 22 143 How the list is interpreted depends on the mode \, [pix_set] diff --git a/Gem/pix_sig2pix~-help.pd b/Gem/pix_sig2pix~-help.pd index 0873c6b..8c7e0b4 100644 --- a/Gem/pix_sig2pix~-help.pd +++ b/Gem/pix_sig2pix~-help.pd @@ -71,7 +71,7 @@ factor with [block~] to get decent framerates.; #X msg 525 214 dimen 512 4; #X obj 451 270 pix_texture; #X obj 451 236 pix_sig2pix~ 64 64; -#X text 12 74 [pix_sig2pix~] will interprete the 4 incoming audio-streams +#X text 12 74 [pix_sig2pix~] will interpret the 4 incoming audio-streams as values for the red \, green \, blue and alpha channel of an image. Each image corresponds to an audio-block (signal-vector). The default blocksize in Pd is 64 samples. If you want images with more than 64 diff --git a/Gem/pix_tIIR-help.pd b/Gem/pix_tIIR-help.pd index 949efcf..e2f40f4 100644 --- a/Gem/pix_tIIR-help.pd +++ b/Gem/pix_tIIR-help.pd @@ -63,7 +63,7 @@ #X text 505 77 open a supported; #X text 506 88 movie-clip; #X text 523 114 macOS: quicktime; -#X text 516 104 windos: *.AVI; +#X text 516 104 MS Windows: *.AVI; #X text 523 124 linux: depends...; #X text 50 12 Synopsis: [pix_tIIR]; #X text 29 57 Description: timebased IIR-filter; diff --git a/Gem/pix_texture-help.pd b/Gem/pix_texture-help.pd index 3cbd1f4..5304b22 100644 --- a/Gem/pix_texture-help.pd +++ b/Gem/pix_texture-help.pd @@ -131,7 +131,7 @@ color.; #X text 57 700 Outlet 2: texture info : <id> <width> <height> <type> <upsidedown flag>; #X text 32 576 Inlet 1: message: texunit <f>; -#X text 112 611 (usefull only with shader); +#X text 112 611 (useful only with shader); #X text 112 594 (change texunit of the texture); #X floatatom 463 286 5 0 0 0 - - -; #X msg 463 305 texunit \$1; diff --git a/Gem/pix_video-help.pd b/Gem/pix_video-help.pd index 75ae276..f03967b 100644 --- a/Gem/pix_video-help.pd +++ b/Gem/pix_video-help.pd @@ -323,7 +323,7 @@ empty 0 -8 0 14 -204786 -1 -1 0 256; ; #X text 161 372 set a (writable) property via a message "set <prop> <value>"; -#X text 70 224 this will return 2 lists of readable and writeable properties +#X text 70 224 this will return 2 lists of readable and writable properties through the "info" outlet of [pix_video].; #X text 72 257 NOTE that propertynames are always single symbols that might contain spaces (and other weird characters); diff --git a/Gem/pix_write-help.pd b/Gem/pix_write-help.pd index 802b4ca..5fb3ded 100644 --- a/Gem/pix_write-help.pd +++ b/Gem/pix_write-help.pd @@ -96,7 +96,7 @@ to [pix_write] \, that is the moment that something is captured from the current frame buffer. When grabbing \, be sure that something is in the rendering-buffer \, else you will get a black texture. color_mode let you grab 1 (only red channel) \, 3 (RGB) or 4 (RGBA) byte per pixel. -RGBA mode is usefull with framebufer.; +RGBA mode is useful with framebuffer.; #X msg 480 182 color_format 4; #X connect 15 0 16 0; #X connect 16 0 15 0; diff --git a/Gem/render_trigger-help.pd b/Gem/render_trigger-help.pd index 0056e35..5713a27 100644 --- a/Gem/render_trigger-help.pd +++ b/Gem/render_trigger-help.pd @@ -28,10 +28,10 @@ #X text 54 30 Class: control object; #X text 7 69 Description: triggers on rendering; #X text 29 85 render_trigger allows you to know when the actual rendering -is occuring in a gemList. If you think of the gemList as a list of +is occurring in a gemlist. If you think of the gemlist as a list of actions which occur \, the pre-bang outlet sends a bang out before -any of the actions below the render_trigger in the gemList. The post-bang -sends out a bang after all of the actions have occured.; +any of the actions below the render_trigger in the gemlist. The post-bang +sends out a bang after all of the actions have occurred.; #X text 72 225 (none); #X text 21 316 Outlet 2: bang : pre-render; #X text 21 330 Outlet 2: bang : post-render; diff --git a/Gem/sphere-help.pd b/Gem/sphere-help.pd index 9122e86..d49f23d 100644 --- a/Gem/sphere-help.pd +++ b/Gem/sphere-help.pd @@ -53,7 +53,7 @@ #X text 27 272 Inlet 3: int: number of segments; #X text 33 14 Synopsis: [sphere]; #X text 16 69 Description: Renders a sphere.; -#X text 30 85 The sphere object renders a segemented sphere at the +#X text 30 85 The sphere object renders a segmented sphere at the current position with current color. The look of the sphere can be changed with the draw message \, its size can be changed via the second inlet.; diff --git a/Gem/sphere3d-help.pd b/Gem/sphere3d-help.pd index b1d3ab7..4fb5a35 100644 --- a/Gem/sphere3d-help.pd +++ b/Gem/sphere3d-help.pd @@ -51,7 +51,7 @@ #X text 27 318 Inlet 3: int: number of segments; #X text 33 14 Synopsis: [sphere3d]; #X text 7 65 Description: Renders a sphere3d.; -#X text 14 82 The sphere3d object renders a segemented sphere3d at +#X text 14 82 The sphere3d object renders a segmented sphere3d at the current position with current color. The look of the sphere3d can be changed with the draw message \, its size can be changed via the second inlet.; diff --git a/Gem/surface3d-help.pd b/Gem/surface3d-help.pd index c2e0373..306aec4 100644 --- a/Gem/surface3d-help.pd +++ b/Gem/surface3d-help.pd @@ -1578,7 +1578,7 @@ the displayed curve (X Y are 2 int); #X text 53 349 This message can be use to set the position of a control point. (Mx \, My : position of the point in the matrix. X \, Y \, Z : position of this control point; -#X text 21 507 exemples :; +#X text 21 507 examples :; #X obj 494 520 surface3d 5 5; #X obj 504 561 r curve3d; #X obj 494 585 surface3d 5 5; diff --git a/Gem/text2d-help.pd b/Gem/text2d-help.pd index ec0145a..10777c8 100644 --- a/Gem/text2d-help.pd +++ b/Gem/text2d-help.pd @@ -41,7 +41,7 @@ #X obj 468 112 cnv 15 150 220 empty empty empty 20 12 0 14 -24198 -66577 0; #X obj 479 68 gemhead; -#X floatatom 516 287 5 0 100 1 size - -; +#X floatatom 516 287 5 0 100 1 size - -, f 5; #X msg 489 152 font \$1; #X obj 489 133 openpanel; #X obj 489 116 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 @@ -62,8 +62,8 @@ #X text 10 94 [text2d] renders one line of a text with the current color \, but without(!) 3D-transformation; #X obj 479 89 translateXYZ; -#X floatatom 583 72 5 -10 10 0 - - -; -#X floatatom 542 67 3 -3.5 3.5 0 - - -; +#X floatatom 583 72 5 -10 10 0 - - -, f 5; +#X floatatom 542 67 3 -3.5 3.5 0 - #0-X -, f 3; #X text 27 366 Inlet 1: message: font <.TTF-file> : load a TrueType-font ; #X text 27 380 Inlet 1: message: text [<blah>] : render the given text @@ -84,11 +84,46 @@ rendering ON before loading a font.; "vera.ttf" is searched in the paths. If it is not found you will not see anything unless you load a valid font via the "font"-message. The font-loader uses Pd's search-paths \, so you could specify your path -aon the command-line and load fonts with just "font times.ttf".; +on the command-line and load fonts with just "font times.ttf".; #X obj 538 420 text3d; #X text 468 419 see also:; #X obj 538 443 textextruded; #X obj 538 466 textoutline; +#X obj 30 591 cnv 15 400 40 empty empty empty 20 12 0 14 -260097 -66577 +0; +#X text 43 595 Note2: The text will disappear completely once the pivot +point of the text moves out of the window; +#X obj 459 591 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0 +1; +#N canvas 69 240 450 369 disappearing 0; +#X obj 43 27 inlet; +#X obj 43 266 s \$0-X; +#X obj 43 92 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0 1 +; +#X obj 43 116 pack 0 1000; +#X obj 43 238 line; +#X obj 43 70 metro 1000; +#X obj 43 138 t f f; +#X obj 43 208 pack 0 1000; +#X obj 43 160 * 1; +#X obj 43 183 - 4.2; +#X obj 43 49 t f f; +#X obj 127 70 select 0; +#X msg 127 92 0; +#X connect 0 0 10 0; +#X connect 2 0 3 0; +#X connect 3 0 6 0; +#X connect 4 0 1 0; +#X connect 5 0 2 0; +#X connect 6 0 8 0; +#X connect 7 0 4 0; +#X connect 8 0 9 0; +#X connect 9 0 7 0; +#X connect 10 0 5 0; +#X connect 10 1 11 0; +#X connect 11 0 12 0; +#X connect 12 0 7 0; +#X restore 459 611 pd disappearing text; #X connect 3 0 4 0; #X connect 4 0 3 0; #X connect 17 0 33 0; @@ -104,3 +139,4 @@ aon the command-line and load fonts with just "font times.ttf".; #X connect 33 0 41 0; #X connect 34 0 33 3; #X connect 35 0 33 1; +#X connect 53 0 54 0; diff --git a/Gem/text3d-help.pd b/Gem/text3d-help.pd index adff690..0431c31 100644 --- a/Gem/text3d-help.pd +++ b/Gem/text3d-help.pd @@ -83,7 +83,7 @@ text \, given as a list of unicode code points (similar to ASCII); "vera.ttf" is searched in the paths. If it is not found you will not see anything unless you load a valid font via the "font"-message. The font-loader uses Pd's search-paths \, so you could specify your path -aon the command-line and load fonts with just "font times.ttf".; +on the command-line and load fonts with just "font times.ttf".; #X obj 541 419 text2d; #X text 470 417 see also:; #X obj 541 442 textextruded; diff --git a/Gem/textextruded-help.pd b/Gem/textextruded-help.pd index 0df1078..80c51e3 100644 --- a/Gem/textextruded-help.pd +++ b/Gem/textextruded-help.pd @@ -54,7 +54,7 @@ "vera.ttf" is searched in the paths. If it is not found you will not see anything unless you load a valid font via the "font"-message. The font-loader uses Pd's search-paths \, so you could specify your path -aon the command-line and load fonts with just "font times.ttf".; +on the command-line and load fonts with just "font times.ttf".; #X text 7 208 Justification:; #X text 32 223 horizontal justification can be one of "left" \, "right" \, "center"(default) and "base"(none); @@ -88,7 +88,7 @@ the current color \, and all 3D-transformation; 0; #X text 22 573 Note: GEM needs to be compiled with FTGL-support for this to work; -#X text 472 418 siehe auch:; +#X text 472 418 see also:; #X obj 545 418 text2d; #X obj 592 418 text3d; #X connect 3 0 4 0; diff --git a/Gem/textoutline-help.pd b/Gem/textoutline-help.pd index c16b1e5..6d4ba06 100644 --- a/Gem/textoutline-help.pd +++ b/Gem/textoutline-help.pd @@ -54,7 +54,7 @@ "vera.ttf" is searched in the paths. If it is not found you will not see anything unless you load a valid font via the "font"-message. The font-loader uses Pd's search-paths \, so you could specify your path -aon the command-line and load fonts with just "font times.ttf".; +on the command-line and load fonts with just "font times.ttf".; #X text 7 208 Justification:; #X text 32 223 horizontal justification can be one of "left" \, "right" \, "center"(default) and "base"(none); diff --git a/Gem/tube-help.pd b/Gem/tube-help.pd index 5690938..36cf8ac 100644 --- a/Gem/tube-help.pd +++ b/Gem/tube-help.pd @@ -69,9 +69,9 @@ #X text 63 181 2 : 2nd circle diameter; #X text 26 373 Inlet 3: 2nd circle diameter; #X text 27 359 Inlet 2: 1st circle diameter; -#X text 26 387 Inlet 4: hight of the tube; -#X text 26 403 Inlet 5: X tanslation of 1st circle; -#X text 26 418 Inlet 6: Y tanslation of 1st circle; +#X text 26 387 Inlet 4: height of the tube; +#X text 26 403 Inlet 5: X translation of 1st circle; +#X text 26 418 Inlet 6: Y translation of 1st circle; #X text 26 433 Inlet 7: X rotation of 1st circle; #X text 26 448 Inlet 8: Y rotation of 1st circle; #X text 26 480 Inlet 10: Y rotation of 2nd circle; @@ -81,8 +81,8 @@ #X msg 558 278 numslices \$1; #X floatatom 558 257 5 0 100 1 - - -; #X text 26 338 Inlet 1: message: numslices <#>; -#X text 7 72 The tube object generats a shape defined by 2 circles. -These 2 circles can be rotated and translated independantly to create +#X text 7 72 The tube object generates a shape defined by 2 circles. +These 2 circles can be rotated and translated independently to create different shapes.; #X text 63 217 4 : number of segments; #X text 63 199 3 : height of the tube; diff --git a/Gem/vertex_program-help.pd b/Gem/vertex_program-help.pd index 18f9a18..2b397b0 100644 --- a/Gem/vertex_program-help.pd +++ b/Gem/vertex_program-help.pd @@ -159,7 +159,7 @@ driver \, ...) has to support either (or both) the ARB shader extensions or the NV shader extensions in order to make use of this object.; #X text 10 176 Of course \, you also have to supply anything else needed for the shader to work (like textures \, ...); -#X text 35 362 Inlet 1: messsage: open <filename> : vertex shader program +#X text 35 362 Inlet 1: message: open <filename> : vertex shader program to load; #X obj 451 296 teapot; #X obj 453 422 fragment_program; diff --git a/Gem/world_light-help.pd b/Gem/world_light-help.pd index 7c5566b..8a803ae 100644 --- a/Gem/world_light-help.pd +++ b/Gem/world_light-help.pd @@ -52,7 +52,7 @@ #X msg 495 178 debug \$1; #X text 19 189 Keep in mind that the attributes have to be set before rendering the vertices \, so if you are trying for frame accurate rendering -\, you will want to set the gemhead order to a low nuber so that all +\, you will want to set the gemhead order to a low number so that all of the values of the light get set first.; #X obj 480 264 sphere; #X floatatom 561 88 5 0 0 0 - - -; |