archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

replace overly verbose matrix creation for BGE camera, typo fix from MikeS.

Browse Source
This commit is contained in:
Campbell Barton
2010-11-29 20:57:02 +00:00
parent a5cac5434a
commit 51a66c27f3
2 changed files with 3 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/makesrna/intern/rna_sequencer.c
View File

@@ -1320,7 +1320,7 @@ static void rna_def_sound(BlenderRNA *brna)
prop= RNA_def_property(srna, "attenuation", PROP_FLOAT, PROP_NONE); prop= RNA_def_property(srna, "attenuation", PROP_FLOAT, PROP_NONE);
RNA_def_property_range(prop, -100.0f, +40.0f); RNA_def_property_range(prop, -100.0f, +40.0f);
RNA_def_property_ui_text(prop, "Attenuation/db", "Attenuation in dezibel"); RNA_def_property_ui_text(prop, "Attenuation/dB", "Attenuation in decibel");
RNA_def_property_float_funcs(prop, "rna_Sequence_attenuation_get", "rna_Sequence_attenuation_set", NULL); RNA_def_property_float_funcs(prop, "rna_Sequence_attenuation_get", "rna_Sequence_attenuation_set", NULL);
RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, "rna_Sequence_update"); RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, "rna_Sequence_update");

19
source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
View File

@@ -235,21 +235,7 @@ extern "C" void StartKetsjiShell(struct bContext *C, struct ARegion *ar, rcti *c
} }
// some blender stuff // some blender stuff
MT_CmMatrix4x4 projmat;
MT_CmMatrix4x4 viewmat;
float camzoom; float camzoom;
int i;
for (i = 0; i < 16; i++)
{
float *viewmat_linear= (float*) rv3d->viewmat;
viewmat.setElem(i, viewmat_linear[i]);
}
for (i = 0; i < 16; i++)
{
float *projmat_linear= (float*) rv3d->winmat;
projmat.setElem(i, projmat_linear[i]);
}
if(rv3d->persp==RV3D_CAMOB) { if(rv3d->persp==RV3D_CAMOB) {
if(startscene->gm.framing.type == SCE_GAMEFRAMING_BARS) { /* Letterbox */ if(startscene->gm.framing.type == SCE_GAMEFRAMING_BARS) { /* Letterbox */
@@ -265,7 +251,6 @@ extern "C" void StartKetsjiShell(struct bContext *C, struct ARegion *ar, rcti *c
camzoom = 2.0; camzoom = 2.0;
} }
ketsjiengine->SetDrawType(v3d->drawtype); ketsjiengine->SetDrawType(v3d->drawtype);
ketsjiengine->SetCameraZoom(camzoom); ketsjiengine->SetCameraZoom(camzoom);
@@ -347,8 +332,8 @@ extern "C" void StartKetsjiShell(struct bContext *C, struct ARegion *ar, rcti *c
{ {
ketsjiengine->EnableCameraOverride(startscenename); ketsjiengine->EnableCameraOverride(startscenename);
ketsjiengine->SetCameraOverrideUseOrtho((rv3d->persp == RV3D_ORTHO)); ketsjiengine->SetCameraOverrideUseOrtho((rv3d->persp == RV3D_ORTHO));
ketsjiengine->SetCameraOverrideProjectionMatrix(projmat); ketsjiengine->SetCameraOverrideProjectionMatrix(MT_CmMatrix4x4(rv3d->winmat));
ketsjiengine->SetCameraOverrideViewMatrix(viewmat); ketsjiengine->SetCameraOverrideViewMatrix(MT_CmMatrix4x4(rv3d->viewmat));
ketsjiengine->SetCameraOverrideClipping(v3d->near, v3d->far); ketsjiengine->SetCameraOverrideClipping(v3d->near, v3d->far);
ketsjiengine->SetCameraOverrideLens(v3d->lens); ketsjiengine->SetCameraOverrideLens(v3d->lens);
} }