Revision: 76985
http://sourceforge.net/p/brlcad/code/76985
Author: starseeker
Date: 2020-08-28 13:06:52 +0000 (Fri, 28 Aug 2020)
Log Message:
-----------
Not using skybox
Modified Paths:
--------------
brlcad/branches/swrast/src/libdm/tests/rendered_image.cpp
brlcad/branches/swrast/src/libdm/tests/renderer/scene.c
brlcad/branches/swrast/src/libdm/tests/renderer/scene.h
brlcad/branches/swrast/src/libdm/tests/renderer/scenes/scene_helper.c
Modified: brlcad/branches/swrast/src/libdm/tests/rendered_image.cpp
===================================================================
--- brlcad/branches/swrast/src/libdm/tests/rendered_image.cpp 2020-08-28
12:59:44 UTC (rev 76984)
+++ brlcad/branches/swrast/src/libdm/tests/rendered_image.cpp 2020-08-28
13:06:52 UTC (rev 76985)
@@ -39,9 +39,6 @@
framebuffer_t *framebuffer;
camera_t *camera;
vec3_t light_dir;
- vec2_t click_pos;
- int single_click;
- int double_click;
float frame_time;
float delta_time;
} context_t;
@@ -112,7 +109,6 @@
perframe.camera_proj_matrix = camera_get_proj_matrix(camera);
perframe.ambient_intensity = scene->ambient_intensity;
perframe.punctual_intensity = scene->punctual_intensity;
- //perframe.shadow_map = scene->shadow_map;
perframe.layer_view = -1;
return perframe;
Modified: brlcad/branches/swrast/src/libdm/tests/renderer/scene.c
===================================================================
--- brlcad/branches/swrast/src/libdm/tests/renderer/scene.c 2020-08-28
12:59:44 UTC (rev 76984)
+++ brlcad/branches/swrast/src/libdm/tests/renderer/scene.c 2020-08-28
13:06:52 UTC (rev 76985)
@@ -6,11 +6,10 @@
#include "scene.h"
#include "texture.h"
-scene_t *scene_create(vec3_t background, model_t *skybox, model_t **models,
+scene_t *scene_create(vec3_t background, model_t **models,
float ambient_intensity, float punctual_intensity) {
scene_t *scene = (scene_t*)malloc(sizeof(scene_t));
scene->background = vec4_from_vec3(background, 1);
- scene->skybox = skybox;
scene->models = models;
scene->ambient_intensity = ambient_intensity;
scene->punctual_intensity = punctual_intensity;
@@ -20,10 +19,6 @@
void scene_release(scene_t *scene) {
int num_models = darray_size(scene->models);
int i;
- if (scene->skybox) {
- model_t *skybox = scene->skybox;
- skybox->release(skybox);
- }
for (i = 0; i < num_models; i++) {
model_t *model = scene->models[i];
model->release(model);
Modified: brlcad/branches/swrast/src/libdm/tests/renderer/scene.h
===================================================================
--- brlcad/branches/swrast/src/libdm/tests/renderer/scene.h 2020-08-28
12:59:44 UTC (rev 76984)
+++ brlcad/branches/swrast/src/libdm/tests/renderer/scene.h 2020-08-28
13:06:52 UTC (rev 76985)
@@ -36,7 +36,6 @@
typedef struct {
vec4_t background;
- model_t *skybox;
model_t **models;
/* light intensity */
float ambient_intensity;
@@ -43,7 +42,7 @@
float punctual_intensity;
} scene_t;
-scene_t *scene_create(vec3_t background, model_t *skybox, model_t **models,
+scene_t *scene_create(vec3_t background, model_t **models,
float ambient_intensity, float punctual_intensity
);
void scene_release(scene_t *scene);
Modified: brlcad/branches/swrast/src/libdm/tests/renderer/scenes/scene_helper.c
===================================================================
--- brlcad/branches/swrast/src/libdm/tests/renderer/scenes/scene_helper.c
2020-08-28 12:59:44 UTC (rev 76984)
+++ brlcad/branches/swrast/src/libdm/tests/renderer/scenes/scene_helper.c
2020-08-28 13:06:52 UTC (rev 76985)
@@ -7,7 +7,6 @@
typedef struct {
vec3_t background;
char environment[LINE_SIZE];
- char skybox[LINE_SIZE];
char shadow[LINE_SIZE];
float ambient;
float punctual;
@@ -63,6 +62,7 @@
scene_light_t light;
char header[LINE_SIZE];
int items;
+ char skybox[LINE_SIZE];
items = fscanf(file, " %s", header);
assert(equals_to(header, "lighting:"));
@@ -73,7 +73,7 @@
assert(items == 3);
items = fscanf(file, " environment: %s", light.environment);
assert(items == 1);
- items = fscanf(file, " skybox: %s", light.skybox);
+ items = fscanf(file, " skybox: %s", skybox);
assert(items == 1);
items = fscanf(file, " shadow: %s", light.shadow);
assert(items == 1);
@@ -232,8 +232,7 @@
}
}
- return scene_create(light->background, NULL, models,
- light->ambient, light->punctual);
+ return scene_create(light->background, models, light->ambient,
light->punctual);
}
static scene_t *create_blinn_scene(scene_light_t *scene_light,
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
