Skip to content

Commit 94ad279

Browse files
committed
- Added files needed for Tp3
1 parent d3032db commit 94ad279

10 files changed

+1132
-0
lines changed

build/vss9/GameEngine.sln

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tp1", "Tp1.vcproj", "{BB8A5
99
EndProject
1010
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tp2", "Tp2.vcproj", "{F0D04A91-A101-4A5B-87AE-81D8D7A2372D}"
1111
EndProject
12+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tp3", "Tp3.vcproj", "{D741AE7D-170D-4DF5-8C68-DC32D3720C3F}"
13+
EndProject
1214
Global
1315
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1416
Debug|Win32 = Debug|Win32
@@ -31,6 +33,10 @@ Global
3133
{F0D04A91-A101-4A5B-87AE-81D8D7A2372D}.Debug|Win32.Build.0 = Debug|Win32
3234
{F0D04A91-A101-4A5B-87AE-81D8D7A2372D}.Release|Win32.ActiveCfg = Release|Win32
3335
{F0D04A91-A101-4A5B-87AE-81D8D7A2372D}.Release|Win32.Build.0 = Release|Win32
36+
{D741AE7D-170D-4DF5-8C68-DC32D3720C3F}.Debug|Win32.ActiveCfg = Debug|Win32
37+
{D741AE7D-170D-4DF5-8C68-DC32D3720C3F}.Debug|Win32.Build.0 = Debug|Win32
38+
{D741AE7D-170D-4DF5-8C68-DC32D3720C3F}.Release|Win32.ActiveCfg = Release|Win32
39+
{D741AE7D-170D-4DF5-8C68-DC32D3720C3F}.Release|Win32.Build.0 = Release|Win32
3440
EndGlobalSection
3541
GlobalSection(SolutionProperties) = preSolution
3642
HideSolutionNode = FALSE

build/vss9/Tp3.vcproj

Lines changed: 217 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,217 @@
1+
<?xml version="1.0" encoding="Windows-1252"?>
2+
<VisualStudioProject
3+
ProjectType="Visual C++"
4+
Version="9,00"
5+
Name="Tp3"
6+
ProjectGUID="{D741AE7D-170D-4DF5-8C68-DC32D3720C3F}"
7+
RootNamespace="Tp3"
8+
TargetFrameworkVersion="196613"
9+
>
10+
<Platforms>
11+
<Platform
12+
Name="Win32"
13+
/>
14+
</Platforms>
15+
<ToolFiles>
16+
</ToolFiles>
17+
<Configurations>
18+
<Configuration
19+
Name="Debug|Win32"
20+
OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)"
21+
IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
22+
ConfigurationType="1"
23+
CharacterSet="2"
24+
>
25+
<Tool
26+
Name="VCPreBuildEventTool"
27+
/>
28+
<Tool
29+
Name="VCCustomBuildTool"
30+
/>
31+
<Tool
32+
Name="VCXMLDataGeneratorTool"
33+
/>
34+
<Tool
35+
Name="VCWebServiceProxyGeneratorTool"
36+
/>
37+
<Tool
38+
Name="VCMIDLTool"
39+
/>
40+
<Tool
41+
Name="VCCLCompilerTool"
42+
Optimization="0"
43+
AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\src\&quot;;&quot;$(SolutionDir)..\..\lib\glew\include&quot;"
44+
MinimalRebuild="true"
45+
BasicRuntimeChecks="3"
46+
RuntimeLibrary="3"
47+
WarningLevel="3"
48+
DebugInformationFormat="4"
49+
/>
50+
<Tool
51+
Name="VCManagedResourceCompilerTool"
52+
/>
53+
<Tool
54+
Name="VCResourceCompilerTool"
55+
/>
56+
<Tool
57+
Name="VCPreLinkEventTool"
58+
/>
59+
<Tool
60+
Name="VCLinkerTool"
61+
AdditionalDependencies="opengl32.lib glu32.lib glew32.lib"
62+
AdditionalLibraryDirectories="&quot;$(SolutionDir)..\..\lib\glew\bin&quot;"
63+
GenerateDebugInformation="true"
64+
TargetMachine="1"
65+
/>
66+
<Tool
67+
Name="VCALinkTool"
68+
/>
69+
<Tool
70+
Name="VCManifestTool"
71+
/>
72+
<Tool
73+
Name="VCXDCMakeTool"
74+
/>
75+
<Tool
76+
Name="VCBscMakeTool"
77+
/>
78+
<Tool
79+
Name="VCFxCopTool"
80+
/>
81+
<Tool
82+
Name="VCAppVerifierTool"
83+
/>
84+
<Tool
85+
Name="VCPostBuildEventTool"
86+
Description="Copy resources to output folder"
87+
CommandLine="copy /Y &quot;$(SolutionDir)..\..\res\tp3\*&quot; &quot;$(SolutionDir)..\..\bin&quot; &amp;&amp; copy &quot;$(OutDir)\$(ProjectName).exe&quot; &quot;$(SolutionDir)..\..\bin&quot; "
88+
/>
89+
</Configuration>
90+
<Configuration
91+
Name="Release|Win32"
92+
OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)"
93+
IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
94+
ConfigurationType="1"
95+
CharacterSet="2"
96+
WholeProgramOptimization="1"
97+
>
98+
<Tool
99+
Name="VCPreBuildEventTool"
100+
/>
101+
<Tool
102+
Name="VCCustomBuildTool"
103+
/>
104+
<Tool
105+
Name="VCXMLDataGeneratorTool"
106+
/>
107+
<Tool
108+
Name="VCWebServiceProxyGeneratorTool"
109+
/>
110+
<Tool
111+
Name="VCMIDLTool"
112+
/>
113+
<Tool
114+
Name="VCCLCompilerTool"
115+
Optimization="2"
116+
EnableIntrinsicFunctions="true"
117+
RuntimeLibrary="2"
118+
EnableFunctionLevelLinking="true"
119+
WarningLevel="3"
120+
DebugInformationFormat="3"
121+
/>
122+
<Tool
123+
Name="VCManagedResourceCompilerTool"
124+
/>
125+
<Tool
126+
Name="VCResourceCompilerTool"
127+
/>
128+
<Tool
129+
Name="VCPreLinkEventTool"
130+
/>
131+
<Tool
132+
Name="VCLinkerTool"
133+
GenerateDebugInformation="true"
134+
OptimizeReferences="2"
135+
EnableCOMDATFolding="2"
136+
TargetMachine="1"
137+
/>
138+
<Tool
139+
Name="VCALinkTool"
140+
/>
141+
<Tool
142+
Name="VCManifestTool"
143+
/>
144+
<Tool
145+
Name="VCXDCMakeTool"
146+
/>
147+
<Tool
148+
Name="VCBscMakeTool"
149+
/>
150+
<Tool
151+
Name="VCFxCopTool"
152+
/>
153+
<Tool
154+
Name="VCAppVerifierTool"
155+
/>
156+
<Tool
157+
Name="VCPostBuildEventTool"
158+
/>
159+
</Configuration>
160+
</Configurations>
161+
<References>
162+
<ProjectReference
163+
ReferencedProjectIdentifier="{243001E1-7F74-470B-84C8-E5F24386E911}"
164+
RelativePathToProject=".\GameEngine.vcproj"
165+
/>
166+
</References>
167+
<Files>
168+
<Filter
169+
Name="Source Files"
170+
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
171+
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
172+
>
173+
<File
174+
RelativePath="..\..\src\tp3\main.cpp"
175+
>
176+
</File>
177+
<File
178+
RelativePath="..\..\src\tp3\tp3_application.cpp"
179+
>
180+
</File>
181+
<File
182+
RelativePath="..\..\src\tp3\tp3_shader_program.cpp"
183+
>
184+
</File>
185+
</Filter>
186+
<Filter
187+
Name="Header Files"
188+
Filter="h;hpp;hxx;hm;inl;inc;xsd"
189+
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
190+
>
191+
<File
192+
RelativePath="..\..\src\tp3\tp3_application.h"
193+
>
194+
</File>
195+
<File
196+
RelativePath="..\..\src\tp3\tp3_shader_program.h"
197+
>
198+
</File>
199+
</Filter>
200+
<Filter
201+
Name="Resource Files"
202+
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
203+
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
204+
>
205+
<File
206+
RelativePath="..\..\res\tp3\tp3_fragment_shader.glsl"
207+
>
208+
</File>
209+
<File
210+
RelativePath="..\..\res\tp3\tp3_vertex_shader.glsl"
211+
>
212+
</File>
213+
</Filter>
214+
</Files>
215+
<Globals>
216+
</Globals>
217+
</VisualStudioProject>

res/tp3/scene1.dat

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
* --- fichier test pour Ray-Tracer ---
2+
3+
* --- GENERAL ------------------------
4+
* --- back-ground color: R G B ---
5+
* --- pos camera ---
6+
background: 0 0 150
7+
origin: 100.0 30.0 400.0
8+
9+
* --- un plan au sol (y = -45) ---
10+
* --- Ax + By + Cz -D = 0 ---
11+
Plane: plane_1
12+
v_linear: 0.0 1.0 0.0
13+
v_const: 45.0
14+
color: 10 255 11
15+
ambient: 0.3
16+
diffus: 0.7
17+
18+
* --- un cube a gauche: cote = 60, pos = -70, 10, 10 ---
19+
Poly: polygon_1
20+
point: 0 -80.0 20.0 80.0
21+
point: 1 -80.0 -40.0 80.0
22+
point: 2 -20.0 -40.0 80.0
23+
color: 255 255 20
24+
25+
* --- une tube a gauche: rayon = 40, pos = -100, 0, 0 ---
26+
* --- fact quad: A x**2 + B y**2 + C z**2 ---
27+
* --- fact lin: + D x + E y + F z ---
28+
* --- fact cst: + G = 0 ---
29+
Quad: tube_1
30+
v_quad: 1.0 0.0 1.0
31+
v_linear: 200.0 0.0 0.0
32+
v_const: 8400.0
33+
color: 200 10 200
34+
35+
36+
* --- un ellipsoid au centre: a=40, b=20, c=200, pos = 0, 0, 0 ---
37+
* (x-xo)^2/a^2 + (y-yo)^2/b^2 + (z-zo)^2/c^2 = 1
38+
* --- fact quad: A x**2 + B y**2 + C z**2 ---
39+
* --- fact lin: + D x + E y + F z ---
40+
* --- fact cst: + G = 0 ---
41+
Quad: ellipse_3
42+
v_quad: 0.000625 0.0025 0.000025
43+
v_linear: 0.0 0.0 0.0
44+
v_const: -1.0
45+
color: 20 200 200
46+
47+
* --- une sphere au centre: rayon = 40, pos = 0, 0, 0 ---
48+
* (x-xo)^2 + (y-yo)^2 + (z-zo)^2 = R^2
49+
* --- fact quad: A x**2 + B y**2 + C z**2 ---
50+
* --- fact lin: + D x + E y + F z ---
51+
* --- fact cst: + G = 0 ---
52+
Quad: sphere_2
53+
v_quad: 1.0 1.0 1.0
54+
v_linear: -200.0 0.0 0.0
55+
v_const: 8400.0
56+
color: 200 10 10
57+
58+
* --- lumiere ---
59+
Lumiere: light_1
60+
position: 200.0 400.0 600.0
61+
intens: 1.0

0 commit comments

Comments
 (0)