Skip to content
This repository was archived by the owner on Dec 24, 2019. It is now read-only.

Commit 1ea8d43

Browse files
masus04masus04
committed
initialized series 4
1 parent b3350e1 commit 1ea8d43

185 files changed

Lines changed: 4071587 additions & 22 deletions

File tree

Some content is hidden

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

‎Serie 3.zip‎

38.8 MB
Binary file not shown.

‎Serie 3/Computergrafik-Basecode/jrtr/src/main/java/jrtr/SWRenderContext.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ private void draw(RenderItem renderItem) {
8787
extractTriangles(renderItem);
8888
initTransformationMatrix(renderItem);
8989

90-
int task = 1;
90+
int task = 0;
9191

9292
if (task == 0) { // put all vertices in triangles for transformation
9393
drawVertices(renderItem);

‎Serie 3/Computergrafik-Basecode/jrtr/src/main/java/jrtr/Triangle.java‎

Lines changed: 25 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -179,27 +179,31 @@ private float max(float a, float b, float c) {
179179
* @return calculates the color to the pixel p inside the triangle
180180
*/
181181
public Color colorAt(Vector4f pixel) {
182-
Vector3d tmpColor;
183-
Vector4f tmp = new Vector4f();
184-
185-
tmpColor = new Vector3d(distance(p2, pixel) / distance(p2, p1) * c1.x + distance(pixel, p1) / distance(p2, p1)
186-
* c2.x, distance(p2, pixel) / distance(p2, p1) * c1.y + distance(pixel, p1) / distance(p2, p1) * c2.y,
187-
distance(p2, pixel) / distance(p2, p1) * c1.z + distance(pixel, p1) / distance(p2, p1) * c2.z);
188-
189-
// Project pixel to p2-p1 line
190-
Vector4f projPixelX = new Vector4f();
191-
projPixelX.sub(p2, p1);
192-
tmp = new Vector4f(pixel);
193-
tmp.normalize();
194-
projPixelX.dot(tmp);
195-
projPixelX.dot(tmp);
196-
197-
tmpColor = new Vector3d(distance(p3, pixel) / distance(p3, projPixelX) * tmpColor.x + distance(pixel, projPixelX)
198-
/ distance(p3, projPixelX) * c3.x, distance(p3, pixel) / distance(p3, projPixelX) * tmpColor.y
199-
+ distance(pixel, projPixelX) / distance(p3, projPixelX) * c3.y, distance(p3, pixel)
200-
/ distance(p3, projPixelX) * tmpColor.z + distance(pixel, projPixelX) / distance(p3, projPixelX) * c3.z);
201-
202-
return new Color((float) tmpColor.x, (float) tmpColor.y, (float) tmpColor.z);
182+
if (isInside(pixel)) {
183+
Vector3d tmpColor;
184+
Vector4f tmp = new Vector4f();
185+
186+
tmpColor = new Vector3d(distance(p2, pixel) / distance(p2, p1) * c1.x + distance(pixel, p1) / distance(p2, p1)
187+
* c2.x, distance(p2, pixel) / distance(p2, p1) * c1.y + distance(pixel, p1) / distance(p2, p1) * c2.y,
188+
distance(p2, pixel) / distance(p2, p1) * c1.z + distance(pixel, p1) / distance(p2, p1) * c2.z);
189+
190+
// Project pixel to p2-p1 line
191+
Vector4f projPixelX = new Vector4f();
192+
projPixelX.sub(p2, p1);
193+
tmp = new Vector4f(pixel);
194+
tmp.normalize();
195+
projPixelX.dot(tmp);
196+
projPixelX.dot(tmp);
197+
198+
tmpColor = new Vector3d(distance(p3, pixel) / distance(p3, projPixelX) * tmpColor.x
199+
+ distance(pixel, projPixelX) / distance(p3, projPixelX) * c3.x, distance(p3, pixel)
200+
/ distance(p3, projPixelX) * tmpColor.y + distance(pixel, projPixelX) / distance(p3, projPixelX) * c3.y,
201+
distance(p3, pixel) / distance(p3, projPixelX) * tmpColor.z + distance(pixel, projPixelX)
202+
/ distance(p3, projPixelX) * c3.z);
203+
204+
return new Color((float) tmpColor.x, (float) tmpColor.y, (float) tmpColor.z);
205+
}
206+
return null;
203207
}
204208

205209
private float distance(Vector4f pixel, Vector4f tmp) {

‎Serie 4/Computergrafik-Basecode/doc/allclasses-frame.html‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
2+
<!-- NewPage -->
3+
<html lang="en">
4+
<head>
5+
<!-- Generated by javadoc (version 1.7.0_25) on Fri Sep 13 13:53:20 CEST 2013 -->
6+
<title>All Classes</title>
7+
<meta name="date" content="2013-09-13">
8+
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
9+
</head>
10+
<body>
11+
<h1 class="bar">All Classes</h1>
12+
<div class="indexContainer">
13+
<ul>
14+
<li><a href="jrtr/Camera.html" title="class in jrtr" target="classFrame">Camera</a></li>
15+
<li><a href="jrtr/Frustum.html" title="class in jrtr" target="classFrame">Frustum</a></li>
16+
<li><a href="jrtr/GLRenderContext.html" title="class in jrtr" target="classFrame">GLRenderContext</a></li>
17+
<li><a href="jrtr/GLRenderPanel.html" title="class in jrtr" target="classFrame">GLRenderPanel</a></li>
18+
<li><a href="jrtr/GLShader.html" title="class in jrtr" target="classFrame">GLShader</a></li>
19+
<li><a href="jrtr/GLTexture.html" title="class in jrtr" target="classFrame">GLTexture</a></li>
20+
<li><a href="jrtr/GLVertexArrayObject.html" title="class in jrtr" target="classFrame">GLVertexArrayObject</a></li>
21+
<li><a href="jrtr/GLVertexData.html" title="class in jrtr" target="classFrame">GLVertexData</a></li>
22+
<li><a href="jrtr/Light.html" title="class in jrtr" target="classFrame">Light</a></li>
23+
<li><a href="jrtr/Light.Type.html" title="enum in jrtr" target="classFrame">Light.Type</a></li>
24+
<li><a href="jrtr/Material.html" title="class in jrtr" target="classFrame">Material</a></li>
25+
<li><a href="jrtr/ObjReader.html" title="class in jrtr" target="classFrame">ObjReader</a></li>
26+
<li><a href="jrtr/RenderContext.html" title="interface in jrtr" target="classFrame"><i>RenderContext</i></a></li>
27+
<li><a href="jrtr/RenderItem.html" title="class in jrtr" target="classFrame">RenderItem</a></li>
28+
<li><a href="jrtr/RenderPanel.html" title="interface in jrtr" target="classFrame"><i>RenderPanel</i></a></li>
29+
<li><a href="jrtr/SceneManagerInterface.html" title="interface in jrtr" target="classFrame"><i>SceneManagerInterface</i></a></li>
30+
<li><a href="jrtr/SceneManagerIterator.html" title="interface in jrtr" target="classFrame"><i>SceneManagerIterator</i></a></li>
31+
<li><a href="jrtr/Shader.html" title="interface in jrtr" target="classFrame"><i>Shader</i></a></li>
32+
<li><a href="jrtr/Shape.html" title="class in jrtr" target="classFrame">Shape</a></li>
33+
<li><a href="simple/simple.html" title="class in simple" target="classFrame">simple</a></li>
34+
<li><a href="simple/simple.AnimationTask.html" title="class in simple" target="classFrame">simple.AnimationTask</a></li>
35+
<li><a href="simple/simple.SimpleKeyListener.html" title="class in simple" target="classFrame">simple.SimpleKeyListener</a></li>
36+
<li><a href="simple/simple.SimpleMouseListener.html" title="class in simple" target="classFrame">simple.SimpleMouseListener</a></li>
37+
<li><a href="simple/simple.SimpleRenderPanel.html" title="class in simple" target="classFrame">simple.SimpleRenderPanel</a></li>
38+
<li><a href="jrtr/SimpleSceneManager.html" title="class in jrtr" target="classFrame">SimpleSceneManager</a></li>
39+
<li><a href="jrtr/SWJPanel.html" title="class in jrtr" target="classFrame">SWJPanel</a></li>
40+
<li><a href="jrtr/SWRenderContext.html" title="class in jrtr" target="classFrame">SWRenderContext</a></li>
41+
<li><a href="jrtr/SWRenderPanel.html" title="class in jrtr" target="classFrame">SWRenderPanel</a></li>
42+
<li><a href="jrtr/SWShader.html" title="class in jrtr" target="classFrame">SWShader</a></li>
43+
<li><a href="jrtr/SWTexture.html" title="class in jrtr" target="classFrame">SWTexture</a></li>
44+
<li><a href="jrtr/SWVertexData.html" title="class in jrtr" target="classFrame">SWVertexData</a></li>
45+
<li><a href="jrtr/Texture.html" title="interface in jrtr" target="classFrame"><i>Texture</i></a></li>
46+
<li><a href="jrtr/VertexData.html" title="class in jrtr" target="classFrame">VertexData</a></li>
47+
<li><a href="jrtr/VertexData.Semantic.html" title="enum in jrtr" target="classFrame">VertexData.Semantic</a></li>
48+
</ul>
49+
</div>
50+
</body>
51+
</html>

‎Serie 4/Computergrafik-Basecode/doc/allclasses-noframe.html‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
2+
<!-- NewPage -->
3+
<html lang="en">
4+
<head>
5+
<!-- Generated by javadoc (version 1.7.0_25) on Fri Sep 13 13:53:20 CEST 2013 -->
6+
<title>All Classes</title>
7+
<meta name="date" content="2013-09-13">
8+
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
9+
</head>
10+
<body>
11+
<h1 class="bar">All Classes</h1>
12+
<div class="indexContainer">
13+
<ul>
14+
<li><a href="jrtr/Camera.html" title="class in jrtr">Camera</a></li>
15+
<li><a href="jrtr/Frustum.html" title="class in jrtr">Frustum</a></li>
16+
<li><a href="jrtr/GLRenderContext.html" title="class in jrtr">GLRenderContext</a></li>
17+
<li><a href="jrtr/GLRenderPanel.html" title="class in jrtr">GLRenderPanel</a></li>
18+
<li><a href="jrtr/GLShader.html" title="class in jrtr">GLShader</a></li>
19+
<li><a href="jrtr/GLTexture.html" title="class in jrtr">GLTexture</a></li>
20+
<li><a href="jrtr/GLVertexArrayObject.html" title="class in jrtr">GLVertexArrayObject</a></li>
21+
<li><a href="jrtr/GLVertexData.html" title="class in jrtr">GLVertexData</a></li>
22+
<li><a href="jrtr/Light.html" title="class in jrtr">Light</a></li>
23+
<li><a href="jrtr/Light.Type.html" title="enum in jrtr">Light.Type</a></li>
24+
<li><a href="jrtr/Material.html" title="class in jrtr">Material</a></li>
25+
<li><a href="jrtr/ObjReader.html" title="class in jrtr">ObjReader</a></li>
26+
<li><a href="jrtr/RenderContext.html" title="interface in jrtr"><i>RenderContext</i></a></li>
27+
<li><a href="jrtr/RenderItem.html" title="class in jrtr">RenderItem</a></li>
28+
<li><a href="jrtr/RenderPanel.html" title="interface in jrtr"><i>RenderPanel</i></a></li>
29+
<li><a href="jrtr/SceneManagerInterface.html" title="interface in jrtr"><i>SceneManagerInterface</i></a></li>
30+
<li><a href="jrtr/SceneManagerIterator.html" title="interface in jrtr"><i>SceneManagerIterator</i></a></li>
31+
<li><a href="jrtr/Shader.html" title="interface in jrtr"><i>Shader</i></a></li>
32+
<li><a href="jrtr/Shape.html" title="class in jrtr">Shape</a></li>
33+
<li><a href="simple/simple.html" title="class in simple">simple</a></li>
34+
<li><a href="simple/simple.AnimationTask.html" title="class in simple">simple.AnimationTask</a></li>
35+
<li><a href="simple/simple.SimpleKeyListener.html" title="class in simple">simple.SimpleKeyListener</a></li>
36+
<li><a href="simple/simple.SimpleMouseListener.html" title="class in simple">simple.SimpleMouseListener</a></li>
37+
<li><a href="simple/simple.SimpleRenderPanel.html" title="class in simple">simple.SimpleRenderPanel</a></li>
38+
<li><a href="jrtr/SimpleSceneManager.html" title="class in jrtr">SimpleSceneManager</a></li>
39+
<li><a href="jrtr/SWJPanel.html" title="class in jrtr">SWJPanel</a></li>
40+
<li><a href="jrtr/SWRenderContext.html" title="class in jrtr">SWRenderContext</a></li>
41+
<li><a href="jrtr/SWRenderPanel.html" title="class in jrtr">SWRenderPanel</a></li>
42+
<li><a href="jrtr/SWShader.html" title="class in jrtr">SWShader</a></li>
43+
<li><a href="jrtr/SWTexture.html" title="class in jrtr">SWTexture</a></li>
44+
<li><a href="jrtr/SWVertexData.html" title="class in jrtr">SWVertexData</a></li>
45+
<li><a href="jrtr/Texture.html" title="interface in jrtr"><i>Texture</i></a></li>
46+
<li><a href="jrtr/VertexData.html" title="class in jrtr">VertexData</a></li>
47+
<li><a href="jrtr/VertexData.Semantic.html" title="enum in jrtr">VertexData.Semantic</a></li>
48+
</ul>
49+
</div>
50+
</body>
51+
</html>

‎Serie 4/Computergrafik-Basecode/doc/constant-values.html‎

Lines changed: 144 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,144 @@
1+
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
2+
<!-- NewPage -->
3+
<html lang="en">
4+
<head>
5+
<!-- Generated by javadoc (version 1.7.0_25) on Fri Sep 13 13:53:20 CEST 2013 -->
6+
<title>Constant Field Values</title>
7+
<meta name="date" content="2013-09-13">
8+
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
9+
</head>
10+
<body>
11+
<script type="text/javascript"><!--
12+
if (location.href.indexOf('is-external=true') == -1) {
13+
parent.document.title="Constant Field Values";
14+
}
15+
//-->
16+
</script>
17+
<noscript>
18+
<div>JavaScript is disabled on your browser.</div>
19+
</noscript>
20+
<!-- ========= START OF TOP NAVBAR ======= -->
21+
<div class="topNav"><a name="navbar_top">
22+
<!-- -->
23+
</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
24+
<!-- -->
25+
</a>
26+
<ul class="navList" title="Navigation">
27+
<li><a href="overview-summary.html">Overview</a></li>
28+
<li>Package</li>
29+
<li>Class</li>
30+
<li>Use</li>
31+
<li><a href="overview-tree.html">Tree</a></li>
32+
<li><a href="deprecated-list.html">Deprecated</a></li>
33+
<li><a href="index-files/index-1.html">Index</a></li>
34+
<li><a href="help-doc.html">Help</a></li>
35+
</ul>
36+
</div>
37+
<div class="subNav">
38+
<ul class="navList">
39+
<li>Prev</li>
40+
<li>Next</li>
41+
</ul>
42+
<ul class="navList">
43+
<li><a href="index.html?constant-values.html" target="_top">Frames</a></li>
44+
<li><a href="constant-values.html" target="_top">No Frames</a></li>
45+
</ul>
46+
<ul class="navList" id="allclasses_navbar_top">
47+
<li><a href="allclasses-noframe.html">All Classes</a></li>
48+
</ul>
49+
<div>
50+
<script type="text/javascript"><!--
51+
allClassesLink = document.getElementById("allclasses_navbar_top");
52+
if(window==top) {
53+
allClassesLink.style.display = "block";
54+
}
55+
else {
56+
allClassesLink.style.display = "none";
57+
}
58+
//-->
59+
</script>
60+
</div>
61+
<a name="skip-navbar_top">
62+
<!-- -->
63+
</a></div>
64+
<!-- ========= END OF TOP NAVBAR ========= -->
65+
<div class="header">
66+
<h1 title="Constant Field Values" class="title">Constant Field Values</h1>
67+
<h2 title="Contents">Contents</h2>
68+
<ul>
69+
<li><a href="#jrtr">jrtr.*</a></li>
70+
</ul>
71+
</div>
72+
<div class="constantValuesContainer"><a name="jrtr">
73+
<!-- -->
74+
</a>
75+
<h2 title="jrtr">jrtr.*</h2>
76+
<ul class="blockList">
77+
<li class="blockList">
78+
<table border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
79+
<caption><span>jrtr.<a href="jrtr/SWJPanel.html" title="class in jrtr">SWJPanel</a></span><span class="tabEnd">&nbsp;</span></caption>
80+
<tr>
81+
<th class="colFirst" scope="col">Modifier and Type</th>
82+
<th scope="col">Constant Field</th>
83+
<th class="colLast" scope="col">Value</th>
84+
</tr>
85+
<tbody>
86+
<tr class="altColor">
87+
<td class="colFirst"><a name="jrtr.SWJPanel.serialVersionUID">
88+
<!-- -->
89+
</a><code>static&nbsp;final&nbsp;long</code></td>
90+
<td><code><a href="jrtr/SWJPanel.html#serialVersionUID">serialVersionUID</a></code></td>
91+
<td class="colLast"><code>0L</code></td>
92+
</tr>
93+
</tbody>
94+
</table>
95+
</li>
96+
</ul>
97+
</div>
98+
<!-- ======= START OF BOTTOM NAVBAR ====== -->
99+
<div class="bottomNav"><a name="navbar_bottom">
100+
<!-- -->
101+
</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
102+
<!-- -->
103+
</a>
104+
<ul class="navList" title="Navigation">
105+
<li><a href="overview-summary.html">Overview</a></li>
106+
<li>Package</li>
107+
<li>Class</li>
108+
<li>Use</li>
109+
<li><a href="overview-tree.html">Tree</a></li>
110+
<li><a href="deprecated-list.html">Deprecated</a></li>
111+
<li><a href="index-files/index-1.html">Index</a></li>
112+
<li><a href="help-doc.html">Help</a></li>
113+
</ul>
114+
</div>
115+
<div class="subNav">
116+
<ul class="navList">
117+
<li>Prev</li>
118+
<li>Next</li>
119+
</ul>
120+
<ul class="navList">
121+
<li><a href="index.html?constant-values.html" target="_top">Frames</a></li>
122+
<li><a href="constant-values.html" target="_top">No Frames</a></li>
123+
</ul>
124+
<ul class="navList" id="allclasses_navbar_bottom">
125+
<li><a href="allclasses-noframe.html">All Classes</a></li>
126+
</ul>
127+
<div>
128+
<script type="text/javascript"><!--
129+
allClassesLink = document.getElementById("allclasses_navbar_bottom");
130+
if(window==top) {
131+
allClassesLink.style.display = "block";
132+
}
133+
else {
134+
allClassesLink.style.display = "none";
135+
}
136+
//-->
137+
</script>
138+
</div>
139+
<a name="skip-navbar_bottom">
140+
<!-- -->
141+
</a></div>
142+
<!-- ======== END OF BOTTOM NAVBAR ======= -->
143+
</body>
144+
</html>

0 commit comments

Comments
 (0)