Skip to content
This repository was archived by the owner on May 3, 2020. It is now read-only.

Commit 67b62e8

Browse files
Updated submodules & Traycer website
1 parent 6fe16f4 commit 67b62e8

File tree

3,480 files changed

+49
-582747
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,480 files changed

+49
-582747
lines changed

.DS_Store

0 Bytes
Binary file not shown.

Application/main.cpp

+11-8
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,17 @@ void Scene1(int width, int height, float fov, int samples) {
5858

5959
Scene scene = Scene();
6060

61-
Sphere s0 = Sphere( Vector3(0, -10008, 20), 10000, Color(20, 120, 100), 0.2, 0.5, 0.0, 128.0, 0.0);
62-
Sphere s1 = Sphere( Vector3(0, 0, 20), 4, Color(165, 10, 14), 0.3, 0.8, 0.5, 128.0, 0.4);
63-
Sphere s2 = Sphere( Vector3(5, -1, 15), 2, Color(235, 179, 41), 0.4, 0.6, 0.4, 128.0, 0.4);
64-
Sphere s3 = Sphere( Vector3(5, 0, 25), 3, Color(6, 72, 111), 0.3, 0.8, 0.1, 128.0, 0.4);
61+
Sphere s0 = Sphere( Vector3(0, -10008, 20), 10000, Color(0x00, 0x6A, 0x80), 0.2, 0.5, 0.0, 128.0, 0.0);
62+
Sphere s1 = Sphere( Vector3(0, 0, 20), 4, Color(0x1E, 0x88, 0xE5), 0.3, 0.8, 0.5, 128.0, 0.2, 0.45);
63+
s1.setGlossiness(0.05);
64+
s1.setGlossyTransparency(0.02);
65+
Sphere s2 = Sphere( Vector3(5, -1, 15), 2, Color(0xFD, 0xD8, 0x35), 0.4, 0.6, 0.4, 128.0, 0.4);
66+
s2.setGlossiness(0.2);
67+
Sphere s3 = Sphere( Vector3(5, 0, 25), 3, Color(0x5D, 0x40, 0x37), 0.3, 0.8, 0.1, 128.0, 0.4);
6568
s3.setGlossiness(0.1);
66-
Sphere s4 = Sphere( Vector3(-3.5, -1, 10), 2, Color(8, 88, 56), 0.4, 0.6, 0.5, 64.0, 0.4);
67-
Sphere s5 = Sphere( Vector3(-5.5, 0, 15), 3, Color(51, 51, 51), 0.3, 0.8, 0.25, 32.0, 0.0);
69+
Sphere s4 = Sphere( Vector3(-3.5, -1, 10), 2, Color(0xFF, 0xAB, 0x91), 0.4, 0.6, 0.5, 64.0, 0.4);
70+
s4.setGlossiness(0.4);
71+
Sphere s5 = Sphere( Vector3(-5.5, 0, 15), 3, Color(0x30, 0x30, 0x30), 0.3, 0.8, 0.25, 32.0, 0.0);
6872

6973
scene.addObject( &s0 );
7074
scene.addObject( &s1 );
@@ -81,8 +85,7 @@ void Scene1(int width, int height, float fov, int samples) {
8185
scene.addLight( &l1 );
8286

8387
// Add camera
84-
Camera camera = Camera( Vector3(0,0,-20), width, height, fov);
85-
camera.setPosition(Vector3(0, 20, -20));
88+
Camera camera = Camera( Vector3(0, 20, -20), width, height, fov);
8689
camera.setAngleX(30 * M_PI / 180.0);
8790

8891
// Create Renderer

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ Mac OS | [![Build Status](https://travis-ci.com/matthieu-locussol/Traycer.svg?br
1414

1515
## Description
1616

17-
Traycer is a little raytracer written in C++ using SFML and TGUI libraries.
17+
Traycer is a little Ray-Tracer written in C++.

Submodules/SFML/.editorconfig

-18
This file was deleted.

Submodules/SFML/.editorconfig 2

-18
This file was deleted.

Submodules/SFML/.git 2

-1
This file was deleted.

Submodules/SFML/.gitattributes

-13
This file was deleted.

Submodules/SFML/.gitattributes 2

-13
This file was deleted.

Submodules/SFML/.github/ISSUE_TEMPLATE 2.md

-54
This file was deleted.

Submodules/SFML/.github/ISSUE_TEMPLATE.md

-54
This file was deleted.

Submodules/SFML/.github/PULL_REQUEST_TEMPLATE 2.md

-51
This file was deleted.

Submodules/SFML/.github/PULL_REQUEST_TEMPLATE.md

-51
This file was deleted.

0 commit comments

Comments
 (0)