conflicts resolved

This commit is contained in:
tejasjokin 2023-10-20 01:33:18 +05:30
commit 20a74cbefb
2 changed files with 24 additions and 5 deletions

View File

@ -6,11 +6,6 @@ This repository contains notes and codes for **Computer Graphics.**
## Index
### Notes
1. [Unit 1 - Graphics Primitives and Scan Conversion Algorithms](https://git.kska.io/sppu-se-comp-codes/CG/src/branch/main/notes/Unit%201)
2. [Unit 2 - Polygon, Windowing and Clipping](https://git.kska.io/sppu-se-comp-codes/CG/src/branch/main/notes/Unit%202)
### Codes
#### Digital Differential Analyzer (DDA)
> Digital Differential Analyzer (DDA) is a line-drawing algorithm for digital displays, using incremental calculations to plot points between endpoints.
@ -19,9 +14,33 @@ This repository contains notes and codes for **Computer Graphics.**
2. [Triangle](https://git.kska.io/sppu-se-comp-codes/CG/src/branch/main/DDA-triangle.cpp)
3. [Circle](https://git.kska.io/sppu-se-comp-codes/CG/src/branch/main/DDA-circle.cpp)
### Notes
1. [Unit 1 - Graphics Primitives and Scan Conversion Algorithms](https://git.kska.io/sppu-se-comp-codes/CG/src/branch/main/notes/Unit%201)
2. [Unit 2 - Polygon, Windowing and Clipping](https://git.kska.io/sppu-se-comp-codes/CG/src/branch/main/notes/Unit%202)
3. [Unit 3 - 2D, 3D Transformations and Projections](https://git.kska.io/sppu-se-comp-codes/CG/src/branch/main/notes/Unit%203)
<<<<<<< HEAD
### Codes
#### Digital Differential Analyzer (DDA)
> Digital Differential Analyzer (DDA) is a line-drawing algorithm for digital displays, using incremental calculations to plot points between endpoints.
1. [Line](https://git.kska.io/sppu-se-comp-codes/CG/src/branch/main/DDA-line.cpp)
2. [Triangle](https://git.kska.io/sppu-se-comp-codes/CG/src/branch/main/DDA-triangle.cpp)
3. [Circle](https://git.kska.io/sppu-se-comp-codes/CG/src/branch/main/DDA-circle.cpp)
=======
### Question Papers
1. [IN-SEM](https://git.kska.io/sppu-se-comp-codes/CG/src/branch/main/question-papers/IN-SEM)
2. END-SEM - _NOT ADDED YET_
>>>>>>> ca4f920322ce1d39f2c2399efd6c4453d4dfb603
---
Maintained by [notkshitij](https://git.kska.io/notkshitij) and [TanmaySpamzzz](https://git.kska.io/TanmaySpamzzz)
<<<<<<< HEAD
Contributor: [Kalaskar_admin03](https://git.kska.io/Kalaskar_admin03/)
=======
Contributor: [Kalaskar_admin03](https://git.kska.io/Kalaskar_admin03/)
>>>>>>> ca4f920322ce1d39f2c2399efd6c4453d4dfb603

Binary file not shown.