Merge branch 'master' into cleanup_calcForcesEulerCompute

sta1216 · Feb 23, 2015 · 2f26462 · 2f26462
2 parents d3ffea0 + 570d85c
commit 2f26462
Show file tree

Hide file tree

Showing 13 changed files with 1,027 additions and 498 deletions.
diff --git a/AUTHORS.md b/AUTHORS.md
@@ -0,0 +1,55 @@
+# Authors of Rigs of Rods
+Rigs of Rods is licensed under GPLv3 or later by the following authors (in no particular order) if not stated otherwise. A copy of the license can be found in [LICENSE.txt](LICENSE.txt) or online at http://www.gnu.org/licenses/gpl-3.0.en.html
+
+##### Previous authors of the source code
+
+| GitHub nickname                | RoR forum nickname      | real name              | email                          |
+|--------------------------------|-------------------------|------------------------|--------------------------------|
+| ?                              | pricorde                | ?                      | ?                              |
+| tdev                           | tdev                    | Thomas Fischer         | tfischer{at}beamng{dot}com     | 
+| ?                              | estama                  | ?                      | ?                              |
+| ?                              | Lifter                  | ?                      | ?                              |
+| ?                              | FlyPiper                | ?                      | ?                              |
+| ?                              | knied                   | ?                      | ?                              |
+| ?                              | neorej16                | ?                      | ?                              |
+| ?                              | 88Toyota                | ?                      | ?                              |
+| ?                              | synthead                | ?                      | ?                              |
+| ?                              | ulteq                   | ?                      | ?                              |
+| ?                              | theshark                | ?                      | ?                              |
+
+
+##### Additional authors not found on the Rigs of Rods forum
+
+| Alias                | real name              | email                          |
+|----------------------|------------------------|--------------------------------|
+| altren               | ?                      | ?                              |
+| petern               | ?                      | ?                              |
+| imprenagy            | ?                      | ?                              |
+| priotr               | ?                      | ?                              |
+| cptf                 | ?                      | ?                              |
+
+If you are one of the previous authors and happen to come across this list please complete your entry.
+
+
+##### Authors of assets used by Rigs of Rods
+
+| GitHub nickname                | RoR forum nickname      | real name              | email                          |
+|--------------------------------|-------------------------|------------------------|--------------------------------|
+| ?                              | donoteat                | ?                      | ?                              |
+| ?                              | kevinmce                | ?                      | ?                              |
+| ?                              | 09Challenger            | ?                      | ?                              |
+
+
+##### authors of the source code since reboot (move to git)
+| GitHub nickname                | RoR forum nickname      | real name              | email                          |
+|--------------------------------|-------------------------|------------------------|--------------------------------|
+| Hiradur                        | Hiradur                 | Niklas Kersten         | n\<surname\>[email protected]     |
+| only-a-ptr                     | only_a_ptr              | Petr Ohlídal           | [email protected]          |
+| Aperion                        | Aperion                 | <uncompleted>          | <uncompleted>                 |
+| Max98                          | max98                   | Moncef Ben Slimane     | moncefbenslimane{at}yahoo{dot}fr |
+
+If you are a first time commiter please add yourself to this list for legal reasons. You may want to disguise your email adress to prevent crawlers from detecting it. If you do so make sure it does not leave room for different interpretations.
+
+A list of recent Rigs of Rods authors ("contributors") can also be determined from the VCS, e.g. via ```git shortlog -sne```, or conveniently looked up on [the GitHub web interface](https://github.com/RigsOfRods/rigs-of-rods/graphs/contributors). This does not contain all contributors however since the source code moved from SVN to Hg to git repositories.
+
+Details on individual authorships of files can be obtained via the VCS, e.g. via ```git blame```, or the GitHub web interface. Again, this does not display all authors.
diff --git a/DEPENDENCIES.md b/DEPENDENCIES.md
diff --git a/source/main/datatypes/beam.h b/source/main/datatypes/beam.h
@@ -0,0 +1,76 @@
+/*
+ * beam.h
+ *
+ *  Created on: Dec 29, 2012
+ *      Author: chris
+ */
+
+#ifndef BEAM_H_
+#define BEAM_H_
+
+#include "RoRPrerequisites.h"
+#include "OgrePrerequisites.h"
+
+/**
+* SIM-CORE; Beam data.
+*/
+struct beam_t
+{
+	node_t *p1;
+	node_t *p2;
+	Beam *p2truck; //!< in case p2 is on another truck
+	bool disabled;
+	Ogre::Real k; //!< tensile spring
+	Ogre::Real d; //!< damping factor
+	Ogre::Real L; //!< length
+	Ogre::Real minmaxposnegstress;
+
+	//! Beam type (unnamed enum) { BEAM_NORMAL=0, BEAM_HYDRO=1, BEAM_VIRTUAL=2, BEAM_MARKED=3, BEAM_INVISIBLE=4, BEAM_INVISIBLE_HYDRO=5 }
+	int type;
+
+	Ogre::Real maxposstress;
+	Ogre::Real maxnegstress;
+	Ogre::Real shortbound;
+	Ogre::Real longbound;
+	Ogre::Real strength;
+	Ogre::Real stress;
+
+	//! Values (unnamed enum) { SHOCK1=1, SHOCK2=2, SUPPORTBEAM=3, ROPE=4 }
+	int bounded;
+
+	bool broken;
+	Ogre::Real plastic_coef;
+	Ogre::Real refL;       //!< reference length
+	Ogre::Real Lhydro;     //!< hydro reference len
+	Ogre::Real hydroRatio; //!< hydro rotation ratio
+	int hydroFlags;
+	int animFlags;
+	float animOption;
+	Ogre::Real commandRatioLong;
+	Ogre::Real commandRatioShort;
+	Ogre::Real commandShort; //<! Max. contraction; proportional to orig. length
+	Ogre::Real commandLong;  //<! Max. extension; proportional to orig. length
+	Ogre::Real commandEngineCoupling;
+	Ogre::Real maxtiestress;
+	Ogre::Real diameter;
+	bool commandNeedsEngine;
+	int detacher_group;	//!< Attribute: detacher group number (integer)
+	Ogre::Vector3 lastforce;
+	bool isCentering;
+	int isOnePressMode;
+	bool isForceRestricted;
+	float iStrength; //!< initial strength
+	Ogre::Real default_deform;
+	Ogre::Real default_plastic_coef;
+	int autoMovingMode;
+	bool autoMoveLock;
+	bool pressedCenterMode;
+	float centerLength;
+	float minendmass;
+	float scale;
+	shock_t *shock;
+	Ogre::SceneNode *mSceneNode; //!< visual
+	Ogre::Entity *mEntity; //!< visual
+};
+
+#endif /* BEAM_H_ */
diff --git a/source/main/datatypes/node.h b/source/main/datatypes/node.h
@@ -0,0 +1,65 @@
+/*
+ * node.h
+ *
+ *  Created on: Dec 29, 2012
+ *      Author: chris
+ */
+
+#ifndef NODE_H_
+#define NODE_H_
+
+#include "OgrePrerequisites.h"
+
+/**
+* SIM-CORE; Node.
+*/
+struct node_t
+{
+	Ogre::Vector3 RelPosition; //!< relative to the local physics origin (one origin per truck) (shaky)
+	Ogre::Vector3 AbsPosition; //!< absolute position in the world (shaky)
+	Ogre::Vector3 Velocity;
+	Ogre::Vector3 Forces;
+	Ogre::Real inverted_mass;
+	Ogre::Real mass;
+	Ogre::Vector3 lastNormal;
+	int locked;
+	int iswheel; //!< 0=no, 1, 2=wheel1  3,4=wheel2, etc...
+	int wheelid; //!< Wheel index
+	int masstype; //!< Loaded (by vehicle cargo)? {0/1}
+	int wetstate; //!< {DRY | DRIPPING | WET}
+	int contactless; //!< Bool{0/1}
+	int lockednode;
+	int lockgroup;
+	Ogre::Vector3 lockedPosition; //!< absolute
+	Ogre::Vector3 lockedForces;
+	Ogre::Vector3 lockedVelocity;
+	int contacted; //!< Boolean
+	Ogre::Real friction_coef;
+	Ogre::Real buoyancy;
+	Ogre::Real volume_coef;
+	Ogre::Real surface_coef;
+	Ogre::Vector3 lastdrag;
+	Ogre::Vector3 gravimass;
+	float wettime; //!< Cumulative time this node has been in contact with water. When wet, produces dripping particles.
+	bool isHot; //!< Makes this node emit vapour particles when in contact with water.
+	bool overrideMass;
+	bool disable_particles;
+	bool disable_sparks;
+	Ogre::Vector3 buoyanceForce;
+	int id; //!< Numeric identifier assigned in rig-definition file (if used), or -1 if the node was generated dynamically.
+	int collisionBoundingBoxID;
+	float collRadius;
+	float collTestTimer;
+	Ogre::Vector3 iPosition; //!< initial position, absolute
+	Ogre::Real    iDistance; //!< initial distance from node0 during loading - used to check for loose parts
+	Ogre::Vector3 smoothpos; //!< absolute, per-frame smooth, must be used for visual effects only
+	bool iIsSkin;
+	bool isSkin;
+	bool contacter;
+	int mouseGrabMode;           //!< { 0=Mouse grab, 1=No mouse grab, 2=Mouse grab with force display}
+	int pos;                     //!< This node's index in rig_t::nodes array.
+	Ogre::SceneNode *mSceneNode; //!< visual
+};
+
+
+#endif /* NODE_H_ */