Added commit guidelines to CONTRIBUTING.md to aid people in writing proper commits.
10 KiB
Contributing to Darkflame Universe
This document outlines how to contribute to Darkflame Universe as well as guidelines and rules for contribution.
Filing Issues
Issues should be used to report problems with the project, request a new feature, or to discuss potential changes before a PR is created.
If you find an Issue that addresses the problem you're having, please add your own reproduction information to the existing issue rather than creating a new one.
Issues should include (when applicable):
- Expected Behavior
- Current Behavior
- Possible Solution
- Steps to Reproduce
- Your Enviorment
Pull Requests
PRs to this project are always welcome and can be a quick way to get your fix or improvement slated for the next release. In general, PRs should:
- Only fix/add the functionality in question OR address wide-spread whitespace/style issues, not both.
- Address a single concern in the least number of changed lines as possible.
- Include documentation in the repo.
For changes that address core functionality or would require breaking changes (e.g. a major release), it's best to open an Issue to discuss your proposal first. This is not required but can save time creating and reviewing changes.
In general, we follow the "fork-and-pull" Git workflow
- Fork the repository to your own Github account
- Clone the project to your machine
- Create a branch locally with a succinct but descriptive name
- Commit changes to the branch
- Following any formatting and testing guidelines specific to this repo
- Push changes to your fork
- Open a PR in our repository.
PRs should include (when applicable):
- A descriptive title that covers the entire content of the pull request
- Description
- Motivation and Context
- Type of Changes
- How Has This Been Tested?
- Screenshots
Commits
Commits to this project should be concise, descriptive and to the point. Writing proper commits helps define a clear project history and makes it easier to browse the source and pinpoint issues. Although this might seem trivial, a pull request with improperly formatted commits will not be accepted. An overview of good commit practices can be found in this article. In a nutshell, a good commit has:
one conceptual change with a subject line that reflects it
The subject line of the commit is what you specify when doing git commit -m "<subject-line>"
. When making commit, make sure that you create it for one conceptual change. E.g. do not use a commit to dump all the changes you have locally, but split your changes into commits that conceptually make sense and use the subject line to refelct that. Some examples:
Bad:
Commit message: Document MovementAIComponent and add Avant Gardens Mech Scripts and fix Entity.cpp bug causing infinite loops
Changed files:
- MovementAIComponent.cpp
- AgMechScript.cpp
- Entity.cpp
Good:
Commit message: Document MovementAIComponent
Changed files:
- MovementAIComponent.cpp
Commit message: Add Avant Gardens Mech Scripts
Changed files:
- AgMechScript.cpp
Commit message: Fix Entity.cpp bug causing infinite loops
Changed files:
- Entity.cpp
Not only does this logically make more sense, it'll make it easier to revert a conceptual change once something wrong with it. If you commit using the bad example but your bugfix turned out to introduce an even worse bug, all your changes have to be reverted, even though your other changes might not be broken. Splitting your commits into conceptually unique commits makes it easier to find and revert issues.
an imperative subject line
In the subject line it's also important to have an imperative writing style that covers the contents of your commit so that it easily reflects what it'll do when applied. We pick an imperative writing style so that all commits have equal tonality. An easy check for this is placing When applied, this commit will ...
in front of your commit message and checking if that makes sense. Some examples:
Bad:
Nice commit :) -> "When applied, this commit will nice commit :)"
Bad:
fixed bug -> "When applied, this commit will fixed bug"
Good:
Fix Entity.cpp bug causing infinite loop -> "When applied, this commit will fix Entity.cpp bug causing infinite loop"
Good:
Add Avant Gardens mech scripts -> "When applied, this commit will add Avant Gardens mech scripts"
a subject line and a body
A good commit has a subject line that summarizes the change and a body that further describes the context required to understand the change. In this body you don't have to explain what the change was, as the code should reflect that, but why a change was made. Some examples:
Bad:
Add Avant Gardens mech scripts
Added the Avant Gardens mech scripts by creaing a new file called
AgMechScripts.cpp and then adding the proper event handlers to that
to send events to the client regarding changes of the mech.
Good:
Add Avant Gardens mech scripts
Added the Avant Gardens mech scripts as they were previously not
added, which produced InvalidScript errors.
Development Resources
Check out a compiled list of development resources and tools here.
Coding Style
This project has gone through multiple iterations of coding style. In the code you'll find a number of different coding styles in use. What follows is the preferred style for this project.
General
Never use spaces instead of tabs. 1 Tab = 4 space character's width by default.
Use typically trailing braces everywhere (if, else, functions, structures, typedefs, class definitions, etc.)
if (x) {
}
The else statement starts on the same line as the last closing brace.
if (x) {
} else {
}
Do not pad parenthesized expressions with spaces
if (x) {
}
Instead of
if ( x ) {
}
And
x = (y * 0.5f);
Instead of
x = ( y * 0.5f );
Use precision specification for floating point values unless there is an explicit need for a double.
float f = 0.5f;
Instead of
float f = 0.5;
And
float f = 1.0f;
Instead of
float f = 1.f;
Function names start with an upper case:
void Function();
In multi-word function names each word starts with an upper case:
void ThisFunctionDoesSomething();
The standard header for functions is:
/**
* Function description
* @param param1 Description of param1
* @return Description of return value
*/
Variable names start with a lower case character.
float x;
In multi-word variable names the first word starts with a lower case character and each successive word starts with an upper case.
float maxDistanceFromPlane;
Typedef names use the same naming convention as variables, however they always end with _t
.
typedef int fileHandle_t;
Do not use C style enums, instead use enum classes.
enum class Contact {
None,
Edge,
ModelVertex
};
Instead of
enum Contact {
CONTACT_NONE,
CONTACT_EDGE,
CONTACT_MODELVERTEX,
CONTACT_TRMVERTEX
};
Never use ambiguous integer types.
uint16_t myInteger = 0;
Instead of
unsigned short myInteger = 0;
Defined names use all upper case characters. Multiple words are separated with an underscore.
#define SIDE_FRONT 0
Use const
as much as possible.
Use:
const int* p; // pointer to const int
int* const p; // const pointer to int
const int* const p; // const pointer to const int
Don’t use:
int const* p;
Classes
The standard header for a class is:
/**
* Class description
*/
Class names should not start with a prefix and each successive word starts with an upper case.
class Vec3;
Class variables start with m
and each successive word starts with an upper case.
class Vec3 {
float m_X;
float m_Y;
float m_Z;
}
Class methods have the same naming convention as functions.
class Vec3 {
float Length() const;
}
Ordering of class variables and methods should be as follows:
- constructor and destructor (followed by a line break)
- list of friend classes
- public variables
- public methods
- protected variables
- protected methods
- private variables
- private methods
This allows the public interface to be easily found at the beginning of the class.
Always make class methods const
when they do not modify any class variables.
Avoid use of const_cast
. When object is needed to be modified, but only const versions are accessible, create a function that clearly gives an editable version of the object. This keeps the control of the "const-ness" in the hands of the object and not the user.
Return const
objects unless the general usage of the object is to change its state.
Function overloading should be used in most cases. For example, instead of:
const Anim* GetAnimByIndex(int index) const;
const Anim* GetAnimByName(const char* name) const;
const Anim* GetRandomAnim(float randomDiversity) const;
Use:
const Anim* GetAnim(int index) const;
const Anim* GetAnim(const char* name) const;
const Anim* GetAnim(float randomDiversity) const;
Header Files
At the beginning of all header files, there should be a #pragma once
to prevent circular includes.
Ordering of includes should be as follows, with each section getting a line break:
- relevant header file (example:
Vec3.h
forVec3.cpp
) - c system headers (use angle brackets)
- c++ standard library headers (use angle brackets)
- third party library headers
- internal headers
For example, Vec3.cpp
's includes may look like:
#include "Vec3.h"
#include <math.h>
#include <cstdint>
#include <vector>
#include "BitStream.h"
#include "dCommonVars.h"
Use forward declarations to your advantage, they decrease compile time.
Use:
class Vec3;
class Player {
Vec3 m_Position;
}
Don't use:
#include "Vec3.h"
class Player {
Vec3 m_Position;
}
File Names
Each class should be in a separate source file unless it makes sense to group several smaller classes.
All source files should use the .cpp
extension and all header files should use the .h
extension.
The file name can be the same as the name of the class.
class Winding;
files:
Winding.cpp
Winding.h