Skip to content

Lib/use viron #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dmccoystephenson merged 5 commits into from
May 27, 2025
Merged

Lib/use viron #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
15e12cf
chore: update subproject commit reference in Viron
dmccoystephenson May 26, 2025
9e64e93
fix: remove unnecessary location object creation in drawEnvironment f…
dmccoystephenson May 26, 2025
fbb364b
refactor: remove unused import of Location model in main.py
dmccoystephenson May 26, 2025
2ec87e3
fix: adjust rectangle drawing logic in drawEnvironment function for c…
dmccoystephenson May 27, 2025
b40db2b
chore: update subproject commit reference in Viron
dmccoystephenson May 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Viron
Open in desktop
Submodule Viron updated 24 files
+8 −6 compose.yml
+4 −5 pom.xml
+13 −5 sample.env
+1 −1 src/main/java/preponderous/viron/config/DbConfig.java
+1 −1 src/main/java/preponderous/viron/config/ServiceConfig.java
+16 −23 src/main/java/preponderous/viron/controllers/DebugController.java
+1 −1 src/main/java/preponderous/viron/exceptions/EntityServiceException.java
+1 −1 src/main/java/preponderous/viron/exceptions/NotFoundException.java
+8 −7 src/main/java/preponderous/viron/services/EnvironmentService.java
+5 −4 src/main/java/preponderous/viron/services/GridService.java
+0 −15 src/main/python/preponderous/viron/__init__.py
+5 −5 src/main/python/preponderous/viron/models/location.py
+0 −15 src/main/python/preponderous/viron/services/__init__.py
+5 −5 src/main/python/preponderous/viron/services/locationService.py
+5 −5 src/main/resources/application.properties
+1 −5 src/test/java/preponderous/viron/controllers/DebugControllerTest.java
+1 −1 src/test/python/preponderous/viron/models/test_entity.py
+4 −4 src/test/python/preponderous/viron/models/test_environment.py
+1 −1 src/test/python/preponderous/viron/models/test_grid.py
+2 −2 src/test/python/preponderous/viron/models/test_location.py
+2 −2 src/test/python/preponderous/viron/services/test_entityService.py
+4 −4 src/test/python/preponderous/viron/services/test_environmentService.py
+2 −2 src/test/python/preponderous/viron/services/test_gridService.py
+10 −17 src/test/python/preponderous/viron/services/test_locationService.py
7 changes: 3 additions & 4 deletions main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
from operator import truediv
import random
import pygame
from Viron.src.main.python.preponderous.viron.models.location import Location
from Viron.src.main.python.preponderous.viron.services.environmentService import EnvironmentService
from Viron.src.main.python.preponderous.viron.services.locationService import LocationService
from graphik import Graphik
Expand Down Expand Up @@ -40,11 +38,12 @@ def log(message):
exit_after_create = True
def drawEnvironment(locations, graphik, locationWidth, locationHeight):
for location in locations:
location = Location(location_id=location['locationId'], x=location['x'], y=location['y'])
red = random.randrange(50, 200)
green = random.randrange(50, 200)
blue = random.randrange(50, 200)
graphik.drawRectangle(location.get_x() * locationWidth, location.get_y() * locationHeight, locationWidth, locationHeight, (red,green,blue))
x = location.get_x() * locationWidth
y = location.get_y() * locationHeight
graphik.drawRectangle(x - 1, y - 1, locationWidth * 1.5, locationHeight * 1.5, (red,green,blue))

def main():
pygame.init()
Expand Down