DHBW_AI_16/Computergraphik_Hopp
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

[Scripts] Add clang-format

Browse source
This commit is contained in:
Andre Meyering 2018-10-31 14:45:06 +01:00
parent 8c992e539e
commit 96a0749d91
4 changed files with 173 additions and 168 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Code/.clang-format
View file

@ -1,6 +1,6 @@
---
Language: Cpp
BasedOnStyle: WebKit
ColumnLimit: 100
ColumnLimit: 0
FixNamespaceComments: true
...

16
Code/scripts/run_clang_format.sh Normal file
View file

@ -0,0 +1,16 @@
#!/usr/bin/env bash
SCRIPT_PATH="$( cd "$(dirname "$0")" ; pwd -P )"
pushd "${SCRIPT_PATH}/.." > /dev/null
echo "Format all files using clang-format"
# We currently don't format test files
find . ! -path "./build/*" ! -path "./test/*" \
-type f \( -name "*.c" \
-o -name "*.hpp" \) \
-exec clang-format \
-i -style=file {} \;
popd > /dev/null

34
Code/template_culling.c
View file

@ -4,19 +4,19 @@
int width = 800;
int height = 600;
void init(int argc, char** argv) {
void init(int argc, char** argv)
{
glutInit(&argc, argv);
glutInitDisplayMode(GLUT_SINGLE);
glutInitWindowSize(width, height);
glutInitWindowPosition(100, 100);
glViewport(0,0,width,height);
glViewport(0, 0, width, height);
glutCreateWindow("Culling");
glMatrixMode(GL_PROJECTION);
glLoadIdentity();
glMatrixMode(GL_MODELVIEW);
glOrtho(-2.0, 2.0,-2.0, 2.0, -2.0, 2.0);
gluLookAt(0.25,0.5,0.1,0,0,0,0,1,0);
glOrtho(-2.0, 2.0, -2.0, 2.0, -2.0, 2.0);
gluLookAt(0.25, 0.5, 0.1, 0, 0, 0, 0, 1, 0);
////////////////////////////////////////////////////////////////////
@ -26,7 +26,6 @@ void init(int argc, char** argv) {
////////////////////////////////////////////////////////////////////
}
void display(void)
{
@ -40,14 +39,14 @@ void display(void)
glColor3f(1.0f, 0.0f, 0.0f);
// FRONT
glVertex3f(-0.5f, -0.5f, 0.5f);
glVertex3f( 0.5f, -0.5f, 0.5f);
glVertex3f( 0.5f, 0.5f, 0.5f);
glVertex3f(0.5f, -0.5f, 0.5f);
glVertex3f(0.5f, 0.5f, 0.5f);
glVertex3f(-0.5f, 0.5f, 0.5f);
// BACK
glVertex3f(-0.5f, -0.5f, -0.5f);
glVertex3f(-0.5f, 0.5f, -0.5f);
glVertex3f( 0.5f, 0.5f, -0.5f);
glVertex3f( 0.5f, -0.5f, -0.5f);
glVertex3f(0.5f, 0.5f, -0.5f);
glVertex3f(0.5f, -0.5f, -0.5f);
glColor3f(0.0f, 1.0f, 0.0f);
// LEFT
@ -56,23 +55,22 @@ void display(void)
glVertex3f(-0.5f, 0.5f, -0.5f);
glVertex3f(-0.5f, -0.5f, -0.5f);
// RIGHT
glVertex3f( 0.5f, -0.5f, -0.5f);
glVertex3f( 0.5f, 0.5f, -0.5f);
glVertex3f( 0.5f, 0.5f, 0.5f);
glVertex3f( 0.5f, -0.5f, 0.5f);
glVertex3f(0.5f, -0.5f, -0.5f);
glVertex3f(0.5f, 0.5f, -0.5f);
glVertex3f(0.5f, 0.5f, 0.5f);
glVertex3f(0.5f, -0.5f, 0.5f);
glColor3f(0.0f, 0.0f, 1.0f);
// BOTTOM
glVertex3f(-0.5f, -0.5f, 0.5f);
glVertex3f(-0.5f, -0.5f, -0.5f);
glVertex3f( 0.5f, -0.5f, -0.5f);
glVertex3f( 0.5f, -0.5f, 0.5f);
glVertex3f(0.5f, -0.5f, -0.5f);
glVertex3f(0.5f, -0.5f, 0.5f);
glEnd();
glFlush();
}
int main(int argc, char** argv)
{
init(argc, argv);
@ -80,5 +78,3 @@ int main(int argc, char** argv)
glutMainLoop();
return 0;
}

35
Code/template_koordinatensystemUndPunkte.c
View file

@ -1,7 +1,7 @@
#include <GL/glut.h>
#include <string.h>
#include <math.h>
#include <stdio.h>
#include <string.h>
#define PI 3.14159265358979323846
#define PIf 3.14159265358979323846f
@ -9,7 +9,8 @@
static int width = 800;
static int height = 600;
void init(int argc, char** argv) {
void init(int argc, char** argv)
{
glutInit(&argc, argv);
glutInitDisplayMode(GLUT_SINGLE);
glutInitWindowSize(width, height);
@ -25,10 +26,12 @@ void init(int argc, char** argv) {
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
}
void drawCoordinateSystem(float* origin, int xLength, int yLength, int numTicksX, int numTicksY, float minX, float maxX, float minY, float maxY) {
void drawCoordinateSystem(float* origin, int xLength, int yLength, int numTicksX, int numTicksY,
float minX, float maxX, float minY, float maxY)
{
float xTickDistance = (float) xLength / (float) numTicksX;
float yTickDistance = (float) yLength / (float) numTicksY;
float xTickDistance = (float)xLength / (float)numTicksX;
float yTickDistance = (float)yLength / (float)numTicksY;
char label[10];
@ -62,8 +65,8 @@ void drawCoordinateSystem(float* origin, int xLength, int yLength, int numTicksX
glVertex2f(origin[0] + j, origin[1] - 5);
glVertex2f(origin[0] + j, origin[1] + 5);
glEnd();
sprintf(label, "%5.2f", minX + (j*resX));
glRasterPos2i((int) round(origin[0] + j - (8 * 5)), (int) round(origin[1] - 13 - 10));
sprintf(label, "%5.2f", minX + (j * resX));
glRasterPos2i((int)round(origin[0] + j - (8 * 5)), (int)round(origin[1] - 13 - 10));
for (int k = 0; k < 5; k++) {
glutBitmapCharacter(GLUT_BITMAP_8_BY_13, label[k]);
}
@ -75,15 +78,14 @@ void drawCoordinateSystem(float* origin, int xLength, int yLength, int numTicksX
glVertex2f(origin[0] - 5, origin[1] + j);
glVertex2f(origin[0] + 5, origin[1] + j);
glEnd();
sprintf(label, "%5.2f", minY + (j*resY));
glRasterPos2i((int) round(origin[0] - (8 * 5) - 10), (int) round(origin[1] + j - 13 / 2));
sprintf(label, "%5.2f", minY + (j * resY));
glRasterPos2i((int)round(origin[0] - (8 * 5) - 10), (int)round(origin[1] + j - 13 / 2));
for (int k = 0; k < 5; k++) {
glutBitmapCharacter(GLUT_BITMAP_8_BY_13, label[k]);
}
}
}
void drawCircle(float origin[2], float center[2], float radius, GLint numPoints)
{
//////////////////////////////////////////////////////////////////////////////////////////////
@ -93,7 +95,7 @@ void drawCircle(float origin[2], float center[2], float radius, GLint numPoints)
// - draw the points by OpenGL commands
glBegin(GL_POINTS);
for (float i = 0.0f; i < 2*PIf; i += (2*PIf)/numPoints) {
for (float i = 0.0f; i < 2 * PIf; i += (2 * PIf) / numPoints) {
float x = origin[0] + center[0] + cosf(i) + radius * cosf(i);
float y = origin[1] + center[1] + sinf(i) + radius * sinf(i);
glVertex2f(x, y);
@ -103,9 +105,6 @@ void drawCircle(float origin[2], float center[2], float radius, GLint numPoints)
//////////////////////////////////////////////////////////////////////////////////////////////
}
void display(void)
{
int n;
@ -115,12 +114,11 @@ void display(void)
float radius[] = { 50, 100, 150 };
float center[] = { 300, 200 };
float origin[] = { 100, 100 };
GLfloat c[] = { 0.0,0.0,0.0 };
GLfloat c[] = { 0.0, 0.0, 0.0 };
int xLength = 600;
int yLength = 400;
float size = 2;
/* settings for the coordinate system */
int numTicksX = 6;
int numTicksY = 4;
@ -135,7 +133,6 @@ void display(void)
drawCoordinateSystem(origin, xLength, yLength, numTicksX, numTicksY, minX, maxX, minY, maxY);
for (n = 0; n < 3; n++) {
///////////////////////////////////////////////////////////////////////////////
@ -157,11 +154,9 @@ void display(void)
drawCircle(origin, center, radius[n], numPoints);
}
glFlush();
}
int main(int argc, char** argv)
{
init(argc, argv);
@ -170,5 +165,3 @@ int main(int argc, char** argv)
glutMainLoop();
return 0;
}